/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-monitor: Use new string format method.

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