/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: 2012-05-05 09:33:27 UTC
  • Revision ID: teddy@recompile.se-20120505093327-kzn0kkia6rhpciwd
* mandos-ctl: Break long lines.
* mandos-monitor: - '' -

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