/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

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