/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2013-10-22 19:24:01 UTC
  • Revision ID: teddy@recompile.se-20131022192401-op6mwsb7f7gygjyh
http://bugs.debian.org/702120
* mandos (priority): Bug fix: Add even more magic to make the old
                     DSA/ELG 2048-bit keys work with GnuTLS.
* mandos-keygen (KEYCOMMENT): Changed default to "".
* mandos-keygen (OPTIONS): Document new default value of "--comment".
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2012 Teddy Hogeborn
7
 
# Copyright © 2009-2012 Björn Påhlsson
 
6
# Copyright © 2009-2013 Teddy Hogeborn
 
7
# Copyright © 2009-2013 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
 
 
29
 
from future_builtins import *
 
28
try:
 
29
    from future_builtins import *
 
30
except ImportError:
 
31
    pass
30
32
 
31
33
import sys
32
34
import os
38
40
import urwid
39
41
 
40
42
from dbus.mainloop.glib import DBusGMainLoop
41
 
import gobject
 
43
try:
 
44
    import gobject
 
45
except ImportError:
 
46
    from gi.repository import GObject as gobject
42
47
 
43
48
import dbus
44
49
 
45
 
import UserList
46
 
 
47
50
import locale
48
51
 
 
52
if sys.version_info[0] == 2:
 
53
    str = unicode
 
54
 
49
55
locale.setlocale(locale.LC_ALL, '')
50
56
 
51
57
import logging
55
61
domain = 'se.recompile'
56
62
server_interface = domain + '.Mandos'
57
63
client_interface = domain + '.Mandos.Client'
58
 
version = "1.5.3"
59
 
 
60
 
# Always run in monochrome mode
61
 
urwid.curses_display.curses.has_colors = lambda : False
62
 
 
63
 
# Urwid doesn't support blinking, but we want it.  Since we have no
64
 
# use for underline on its own, we make underline also always blink.
65
 
urwid.curses_display.curses.A_UNDERLINE |= (
66
 
    urwid.curses_display.curses.A_BLINK)
 
64
version = "1.6.1"
67
65
 
68
66
def isoformat_to_datetime(iso):
69
67
    "Parse an ISO 8601 date string to a datetime.datetime()"
86
84
    properties and calls a hook function when any of them are
87
85
    changed.
88
86
    """
89
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
87
    def __init__(self, proxy_object=None, properties=None, **kwargs):
90
88
        self.proxy = proxy_object # Mandos Client proxy object
91
 
        
92
 
        self.properties = dict()
 
89
        self.properties = dict() if properties is None else properties
93
90
        self.property_changed_match = (
94
91
            self.proxy.connect_to_signal("PropertyChanged",
95
 
                                         self.property_changed,
 
92
                                         self._property_changed,
96
93
                                         client_interface,
97
94
                                         byte_arrays=True))
98
95
        
99
 
        self.properties.update(
100
 
            self.proxy.GetAll(client_interface,
101
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
102
 
 
103
 
        #XXX This breaks good super behaviour
104
 
#        super(MandosClientPropertyCache, self).__init__(
105
 
#            *args, **kwargs)
 
96
        if properties is None:
 
97
            self.properties.update(
 
98
                self.proxy.GetAll(client_interface,
 
99
                                  dbus_interface
 
100
                                  = dbus.PROPERTIES_IFACE))
 
101
        
 
102
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
103
    
 
104
    def _property_changed(self, property, value):
 
105
        """Helper which takes positional arguments"""
 
106
        return self.property_changed(property=property, value=value)
106
107
    
107
108
    def property_changed(self, property=None, value=None):
108
109
        """This is called whenever we get a PropertyChanged signal
111
112
        # Update properties dict with new value
112
113
        self.properties[property] = value
113
114
    
114
 
    def delete(self, *args, **kwargs):
 
115
    def delete(self):
115
116
        self.property_changed_match.remove()
116
 
        super(MandosClientPropertyCache, self).__init__(
117
 
            *args, **kwargs)
118
117
 
119
118
 
120
119
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
122
121
    """
123
122
    
124
123
    def __init__(self, server_proxy_object=None, update_hook=None,
125
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
124
                 delete_hook=None, logger=None, **kwargs):
126
125
        # Called on update
127
126
        self.update_hook = update_hook
128
127
        # Called on delete
133
132
        self.logger = logger
134
133
        
135
134
        self._update_timer_callback_tag = None
136
 
        self._update_timer_callback_lock = 0
137
135
        
138
136
        # The widget shown normally
139
137
        self._text_widget = urwid.Text("")
140
138
        # The widget shown when we have focus
141
139
        self._focus_text_widget = urwid.Text("")
142
 
        super(MandosClientWidget, self).__init__(
143
 
            update_hook=update_hook, delete_hook=delete_hook,
144
 
            *args, **kwargs)
 
140
        super(MandosClientWidget, self).__init__(**kwargs)
145
141
        self.update()
146
142
        self.opened = False
147
143
        
148
 
        last_checked_ok = isoformat_to_datetime(self.properties
149
 
                                                ["LastCheckedOK"])
150
 
        
151
 
        if self.properties ["LastCheckerStatus"] != 0:
152
 
            self.using_timer(True)
153
 
        
154
 
        if self.need_approval:
155
 
            self.using_timer(True)
156
 
        
157
144
        self.match_objects = (
158
145
            self.proxy.connect_to_signal("CheckerCompleted",
159
146
                                         self.checker_completed,
178
165
        #self.logger('Created client {0}'
179
166
        #            .format(self.properties["Name"]))
180
167
    
181
 
    def property_changed(self, property=None, value=None):
182
 
        super(self, MandosClientWidget).property_changed(property,
183
 
                                                         value)
184
 
        if property == "ApprovalPending":
185
 
            using_timer(bool(value))
186
 
        if property == "LastCheckerStatus":
187
 
            using_timer(value != 0)
188
 
            #self.logger('Checker for client {0} (command "{1}") was '
189
 
            #            ' successful'.format(self.properties["Name"],
190
 
            #                                 command))
191
 
    
192
168
    def using_timer(self, flag):
193
169
        """Call this method with True or False when timer should be
194
170
        activated or deactivated.
195
171
        """
196
 
        old = self._update_timer_callback_lock
197
 
        if flag:
198
 
            self._update_timer_callback_lock += 1
199
 
        else:
200
 
            self._update_timer_callback_lock -= 1
201
 
        if old == 0 and self._update_timer_callback_lock:
 
172
        if flag and self._update_timer_callback_tag is None:
202
173
            # Will update the shown timer value every second
203
174
            self._update_timer_callback_tag = (gobject.timeout_add
204
175
                                               (1000,
205
176
                                                self.update_timer))
206
 
        elif old and self._update_timer_callback_lock == 0:
 
177
        elif not (flag or self._update_timer_callback_tag is None):
207
178
            gobject.source_remove(self._update_timer_callback_tag)
208
179
            self._update_timer_callback_tag = None
209
180
    
237
208
           to log in the future. """
238
209
        #self.logger('Client {0} started checker "{1}"'
239
210
        #            .format(self.properties["Name"],
240
 
        #                    unicode(command)))
 
211
        #                    str(command)))
241
212
        pass
242
213
    
243
214
    def got_secret(self):
251
222
            message = 'Client {0} will get its secret in {1} seconds'
252
223
        self.logger(message.format(self.properties["Name"],
253
224
                                   timeout/1000))
254
 
        self.using_timer(True)
255
225
    
256
226
    def rejected(self, reason):
257
227
        self.logger('Client {0} was rejected; reason: {1}'
283
253
                          "bold-underline-blink":
284
254
                              "bold-underline-blink-standout",
285
255
                          }
286
 
 
 
256
        
287
257
        # Rebuild focus and non-focus widgets using current properties
288
 
 
 
258
        
289
259
        # Base part of a client. Name!
290
260
        base = '{name}: '.format(name=self.properties["Name"])
291
261
        if not self.properties["Enabled"]:
292
262
            message = "DISABLED"
 
263
            self.using_timer(False)
293
264
        elif self.properties["ApprovalPending"]:
294
265
            timeout = datetime.timedelta(milliseconds
295
266
                                         = self.properties
297
268
            last_approval_request = isoformat_to_datetime(
298
269
                self.properties["LastApprovalRequest"])
299
270
            if last_approval_request is not None:
300
 
                timer = timeout - (datetime.datetime.utcnow()
301
 
                                   - last_approval_request)
 
271
                timer = max(timeout - (datetime.datetime.utcnow()
 
272
                                       - last_approval_request),
 
273
                            datetime.timedelta())
302
274
            else:
303
275
                timer = datetime.timedelta()
304
276
            if self.properties["ApprovedByDefault"]:
305
277
                message = "Approval in {0}. (d)eny?"
306
278
            else:
307
279
                message = "Denial in {0}. (a)pprove?"
308
 
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
280
            message = message.format(str(timer).rsplit(".", 1)[0])
 
281
            self.using_timer(True)
309
282
        elif self.properties["LastCheckerStatus"] != 0:
310
283
            # When checker has failed, show timer until client expires
311
284
            expires = self.properties["Expires"]
314
287
            else:
315
288
                expires = (datetime.datetime.strptime
316
289
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
317
 
                timer = expires - datetime.datetime.utcnow()
 
290
                timer = max(expires - datetime.datetime.utcnow(),
 
291
                            datetime.timedelta())
318
292
            message = ('A checker has failed! Time until client'
319
293
                       ' gets disabled: {0}'
320
 
                       .format(unicode(timer).rsplit(".", 1)[0]))
 
294
                       .format(str(timer).rsplit(".", 1)[0]))
 
295
            self.using_timer(True)
321
296
        else:
322
297
            message = "enabled"
 
298
            self.using_timer(False)
323
299
        self._text = "{0}{1}".format(base, message)
324
 
            
 
300
        
325
301
        if not urwid.supports_unicode():
326
302
            self._text = self._text.encode("ascii", "replace")
327
303
        textlist = [("normal", self._text)]
344
320
        self.update()
345
321
        return True             # Keep calling this
346
322
    
347
 
    def delete(self, *args, **kwargs):
 
323
    def delete(self, **kwargs):
348
324
        if self._update_timer_callback_tag is not None:
349
325
            gobject.source_remove(self._update_timer_callback_tag)
350
326
            self._update_timer_callback_tag = None
353
329
        self.match_objects = ()
354
330
        if self.delete_hook is not None:
355
331
            self.delete_hook(self)
356
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
332
        return super(MandosClientWidget, self).delete(**kwargs)
357
333
    
358
334
    def render(self, maxcolrow, focus=False):
359
335
        """Render differently if we have focus.
401
377
        else:
402
378
            return key
403
379
    
404
 
    def property_changed(self, property=None, value=None,
405
 
                         *args, **kwargs):
 
380
    def property_changed(self, property=None, **kwargs):
406
381
        """Call self.update() if old value is not new value.
407
382
        This overrides the method from MandosClientPropertyCache"""
408
 
        property_name = unicode(property)
 
383
        property_name = str(property)
409
384
        old_value = self.properties.get(property_name)
410
385
        super(MandosClientWidget, self).property_changed(
411
 
            property=property, value=value, *args, **kwargs)
 
386
            property=property, **kwargs)
412
387
        if self.properties.get(property_name) != old_value:
413
388
            self.update()
414
389
 
418
393
    "down" key presses, thus not allowing any containing widgets to
419
394
    use them as an excuse to shift focus away from this widget.
420
395
    """
421
 
    def keypress(self, maxcolrow, key):
422
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
396
    def keypress(self, *args, **kwargs):
 
397
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
423
398
        if ret in ("up", "down"):
424
399
            return
425
400
        return ret
438
413
                ("normal",
439
414
                 "default", "default", None),
440
415
                ("bold",
441
 
                 "default", "default", "bold"),
 
416
                 "bold", "default", "bold"),
442
417
                ("underline-blink",
443
 
                 "default", "default", "underline"),
 
418
                 "underline,blink", "default", "underline,blink"),
444
419
                ("standout",
445
 
                 "default", "default", "standout"),
 
420
                 "standout", "default", "standout"),
446
421
                ("bold-underline-blink",
447
 
                 "default", "default", ("bold", "underline")),
 
422
                 "bold,underline,blink", "default", "bold,underline,blink"),
448
423
                ("bold-standout",
449
 
                 "default", "default", ("bold", "standout")),
 
424
                 "bold,standout", "default", "bold,standout"),
450
425
                ("underline-blink-standout",
451
 
                 "default", "default", ("underline", "standout")),
 
426
                 "underline,blink,standout", "default",
 
427
                 "underline,blink,standout"),
452
428
                ("bold-underline-blink-standout",
453
 
                 "default", "default", ("bold", "underline",
454
 
                                          "standout")),
 
429
                 "bold,underline,blink,standout", "default",
 
430
                 "bold,underline,blink,standout"),
455
431
                ))
456
432
        
457
433
        if urwid.supports_unicode():
512
488
        self.topwidget = urwid.Pile(self.uilist)
513
489
    
514
490
    def log_message(self, message):
 
491
        """Log message formatted with timestamp"""
515
492
        timestamp = datetime.datetime.now().isoformat()
516
493
        self.log_message_raw(timestamp + ": " + message)
517
494
    
530
507
        self.log_visible = not self.log_visible
531
508
        self.rebuild()
532
509
        #self.log_message("Log visibility changed to: "
533
 
        #                 + unicode(self.log_visible))
 
510
        #                 + str(self.log_visible))
534
511
    
535
512
    def change_log_display(self):
536
513
        """Change type of log display.
576
553
        if path is None:
577
554
            path = client.proxy.object_path
578
555
        self.clients_dict[path] = client
579
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
556
        self.clients.sort(key=lambda c: c.properties["Name"])
580
557
        self.refresh()
581
558
    
582
559
    def remove_client(self, client, path=None):
584
561
        if path is None:
585
562
            path = client.proxy.object_path
586
563
        del self.clients_dict[path]
587
 
        if not self.clients_dict:
588
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
589
 
            # is completely emptied, we need to recreate it.
590
 
            self.clients = urwid.SimpleListWalker([])
591
 
            self.rebuild()
592
564
        self.refresh()
593
565
    
594
566
    def refresh(self):
607
579
        try:
608
580
            mandos_clients = (self.mandos_serv
609
581
                              .GetAllClientsWithProperties())
 
582
            if not mandos_clients:
 
583
                self.log_message_raw(("bold", "Note: Server has no clients."))
610
584
        except dbus.exceptions.DBusException:
 
585
            self.log_message_raw(("bold", "Note: No Mandos server running."))
611
586
            mandos_clients = dbus.Dictionary()
612
587
        
613
588
        (self.mandos_serv
625
600
                            self.client_not_found,
626
601
                            dbus_interface=server_interface,
627
602
                            byte_arrays=True))
628
 
        for path, client in mandos_clients.iteritems():
 
603
        for path, client in mandos_clients.items():
629
604
            client_proxy_object = self.bus.get_object(self.busname,
630
605
                                                      path)
631
606
            self.add_client(MandosClientWidget(server_proxy_object
640
615
                                               logger
641
616
                                               =self.log_message),
642
617
                            path=path)
643
 
 
 
618
        
644
619
        self.refresh()
645
620
        self._input_callback_tag = (gobject.io_add_watch
646
621
                                    (sys.stdin.fileno(),
743
718
    ui.run()
744
719
except KeyboardInterrupt:
745
720
    ui.screen.stop()
746
 
except Exception, e:
747
 
    ui.log_message(unicode(e))
 
721
except Exception as e:
 
722
    ui.log_message(str(e))
748
723
    ui.screen.stop()
749
724
    raise