/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: 2014-03-10 10:11:37 UTC
  • Revision ID: teddy@recompile.se-20140310101137-3khoc3qrntp13l08
White space fix: change "if (" to "if(" in C code.

* plugins.d/mandos-client.c (start_mandos_communication): White space
                                                          fix.
  (avahi_loop_with_timeout, main): - '' -

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