/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

* Makefile (LDFLAGS): Added "-Xlinker --as-needed".

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-2011 Teddy Hogeborn
 
7
# Copyright © 2009-2011 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
 
# Contact the authors at <mandos@recompile.se>.
 
22
# Contact the authors at <mandos@fukt.bsnet.se>.
24
23
# 
25
24
 
26
25
from __future__ import (division, absolute_import, print_function,
27
26
                        unicode_literals)
28
27
 
29
 
from future_builtins import *
30
 
 
31
28
import sys
32
29
import os
33
30
import signal
52
49
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
53
50
 
54
51
# Some useful constants
55
 
domain = 'se.recompile'
 
52
domain = 'se.bsnet.fukt'
56
53
server_interface = domain + '.Mandos'
57
54
client_interface = domain + '.Mandos.Client'
58
 
version = "1.5.3"
 
55
version = "1.3.1"
59
56
 
60
57
# Always run in monochrome mode
61
58
urwid.curses_display.curses.has_colors = lambda : False
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, properties=None, **kwargs):
 
86
    def __init__(self, proxy_object=None, *args, **kwargs):
90
87
        self.proxy = proxy_object # Mandos Client proxy object
91
 
        self.properties = dict() if properties is None else properties
 
88
        
 
89
        self.properties = dict()
92
90
        self.property_changed_match = (
93
91
            self.proxy.connect_to_signal("PropertyChanged",
94
 
                                         self._property_changed,
 
92
                                         self.property_changed,
95
93
                                         client_interface,
96
94
                                         byte_arrays=True))
97
95
        
98
 
        if properties is None:
99
 
            self.properties.update(
100
 
                self.proxy.GetAll(client_interface,
101
 
                                  dbus_interface
102
 
                                  = dbus.PROPERTIES_IFACE))
103
 
        
104
 
        super(MandosClientPropertyCache, self).__init__(**kwargs)
105
 
    
106
 
    def _property_changed(self, property, value):
107
 
        """Helper which takes positional arguments"""
108
 
        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)
109
103
    
110
104
    def property_changed(self, property=None, value=None):
111
105
        """This is called whenever we get a PropertyChanged signal
114
108
        # Update properties dict with new value
115
109
        self.properties[property] = value
116
110
    
117
 
    def delete(self):
 
111
    def delete(self, *args, **kwargs):
118
112
        self.property_changed_match.remove()
 
113
        super(MandosClientPropertyCache, self).__init__(
 
114
            *args, **kwargs)
119
115
 
120
116
 
121
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
123
119
    """
124
120
    
125
121
    def __init__(self, server_proxy_object=None, update_hook=None,
126
 
                 delete_hook=None, logger=None, **kwargs):
 
122
                 delete_hook=None, logger=None, *args, **kwargs):
127
123
        # Called on update
128
124
        self.update_hook = update_hook
129
125
        # Called on delete
135
131
        
136
132
        self._update_timer_callback_tag = None
137
133
        self._update_timer_callback_lock = 0
 
134
        self.last_checker_failed = False
138
135
        
139
136
        # The widget shown normally
140
137
        self._text_widget = urwid.Text("")
141
138
        # The widget shown when we have focus
142
139
        self._focus_text_widget = urwid.Text("")
143
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
140
        super(MandosClientWidget, self).__init__(
 
141
            update_hook=update_hook, delete_hook=delete_hook,
 
142
            *args, **kwargs)
144
143
        self.update()
145
144
        self.opened = False
146
145
        
147
146
        last_checked_ok = isoformat_to_datetime(self.properties
148
147
                                                ["LastCheckedOK"])
 
148
        if last_checked_ok is None:
 
149
            self.last_checker_failed = True
 
150
        else:
 
151
            self.last_checker_failed = ((datetime.datetime.utcnow()
 
152
                                         - last_checked_ok)
 
153
                                        > datetime.timedelta
 
154
                                        (milliseconds=
 
155
                                         self.properties
 
156
                                         ["Interval"]))
149
157
        
150
 
        if self.properties ["LastCheckerStatus"] != 0:
 
158
        if self.last_checker_failed:
151
159
            self.using_timer(True)
152
160
        
153
161
        if self.need_approval:
174
182
                                         self.rejected,
175
183
                                         client_interface,
176
184
                                         byte_arrays=True))
177
 
        #self.logger('Created client {0}'
178
 
        #            .format(self.properties["Name"]))
 
185
        #self.logger('Created client %s' % (self.properties["Name"]))
179
186
    
180
187
    def property_changed(self, property=None, value=None):
181
188
        super(self, MandosClientWidget).property_changed(property,
182
189
                                                         value)
183
190
        if property == "ApprovalPending":
184
191
            using_timer(bool(value))
185
 
        if property == "LastCheckerStatus":
186
 
            using_timer(value != 0)
187
 
            #self.logger('Checker for client {0} (command "{1}") was '
188
 
            #            ' successful'.format(self.properties["Name"],
189
 
            #                                 command))
190
 
    
 
192
        
191
193
    def using_timer(self, flag):
192
194
        """Call this method with True or False when timer should be
193
195
        activated or deactivated.
198
200
        else:
199
201
            self._update_timer_callback_lock -= 1
200
202
        if old == 0 and self._update_timer_callback_lock:
201
 
            # Will update the shown timer value every second
202
203
            self._update_timer_callback_tag = (gobject.timeout_add
203
204
                                               (1000,
204
205
                                                self.update_timer))
208
209
    
209
210
    def checker_completed(self, exitstatus, condition, command):
210
211
        if exitstatus == 0:
 
212
            if self.last_checker_failed:
 
213
                self.last_checker_failed = False
 
214
                self.using_timer(False)
 
215
            #self.logger('Checker for client %s (command "%s")'
 
216
            #            ' was successful'
 
217
            #            % (self.properties["Name"], command))
211
218
            self.update()
212
219
            return
213
220
        # Checker failed
 
221
        if not self.last_checker_failed:
 
222
            self.last_checker_failed = True
 
223
            self.using_timer(True)
214
224
        if os.WIFEXITED(condition):
215
 
            self.logger('Checker for client {0} (command "{1}")'
216
 
                        ' failed with exit code {2}'
217
 
                        .format(self.properties["Name"], command,
218
 
                                os.WEXITSTATUS(condition)))
 
225
            self.logger('Checker for client %s (command "%s")'
 
226
                        ' failed with exit code %s'
 
227
                        % (self.properties["Name"], command,
 
228
                           os.WEXITSTATUS(condition)))
219
229
        elif os.WIFSIGNALED(condition):
220
 
            self.logger('Checker for client {0} (command "{1}") was'
221
 
                        ' killed by signal {2}'
222
 
                        .format(self.properties["Name"], command,
223
 
                                os.WTERMSIG(condition)))
 
230
            self.logger('Checker for client %s (command "%s")'
 
231
                        ' was killed by signal %s'
 
232
                        % (self.properties["Name"], command,
 
233
                           os.WTERMSIG(condition)))
224
234
        elif os.WCOREDUMP(condition):
225
 
            self.logger('Checker for client {0} (command "{1}")'
 
235
            self.logger('Checker for client %s (command "%s")'
226
236
                        ' dumped core'
227
 
                        .format(self.properties["Name"], command))
 
237
                        % (self.properties["Name"], command))
228
238
        else:
229
 
            self.logger('Checker for client {0} completed'
230
 
                        ' mysteriously'
231
 
                        .format(self.properties["Name"]))
 
239
            self.logger('Checker for client %s completed'
 
240
                        ' mysteriously')
232
241
        self.update()
233
242
    
234
243
    def checker_started(self, command):
235
 
        """Server signals that a checker started. This could be useful
236
 
           to log in the future. """
237
 
        #self.logger('Client {0} started checker "{1}"'
238
 
        #            .format(self.properties["Name"],
239
 
        #                    unicode(command)))
 
244
        #self.logger('Client %s started checker "%s"'
 
245
        #            % (self.properties["Name"], unicode(command)))
240
246
        pass
241
247
    
242
248
    def got_secret(self):
243
 
        self.logger('Client {0} received its secret'
244
 
                    .format(self.properties["Name"]))
 
249
        self.last_checker_failed = False
 
250
        self.logger('Client %s received its secret'
 
251
                    % self.properties["Name"])
245
252
    
246
253
    def need_approval(self, timeout, default):
247
254
        if not default:
248
 
            message = 'Client {0} needs approval within {1} seconds'
 
255
            message = 'Client %s needs approval within %s seconds'
249
256
        else:
250
 
            message = 'Client {0} will get its secret in {1} seconds'
251
 
        self.logger(message.format(self.properties["Name"],
252
 
                                   timeout/1000))
 
257
            message = 'Client %s will get its secret in %s seconds'
 
258
        self.logger(message
 
259
                    % (self.properties["Name"], timeout/1000))
253
260
        self.using_timer(True)
254
261
    
255
262
    def rejected(self, reason):
256
 
        self.logger('Client {0} was rejected; reason: {1}'
257
 
                    .format(self.properties["Name"], reason))
 
263
        self.logger('Client %s was rejected; reason: %s'
 
264
                    % (self.properties["Name"], reason))
258
265
    
259
266
    def selectable(self):
260
267
        """Make this a "selectable" widget.
286
293
        # Rebuild focus and non-focus widgets using current properties
287
294
 
288
295
        # Base part of a client. Name!
289
 
        base = '{name}: '.format(name=self.properties["Name"])
 
296
        base = ('%(name)s: '
 
297
                      % {"name": self.properties["Name"]})
290
298
        if not self.properties["Enabled"]:
291
299
            message = "DISABLED"
292
300
        elif self.properties["ApprovalPending"]:
301
309
            else:
302
310
                timer = datetime.timedelta()
303
311
            if self.properties["ApprovedByDefault"]:
304
 
                message = "Approval in {0}. (d)eny?"
305
 
            else:
306
 
                message = "Denial in {0}. (a)pprove?"
307
 
            message = message.format(unicode(timer).rsplit(".", 1)[0])
308
 
        elif self.properties["LastCheckerStatus"] != 0:
309
 
            # When checker has failed, show timer until client expires
310
 
            expires = self.properties["Expires"]
311
 
            if expires == "":
312
 
                timer = datetime.timedelta(0)
313
 
            else:
314
 
                expires = (datetime.datetime.strptime
315
 
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
316
 
                timer = expires - datetime.datetime.utcnow()
 
312
                message = "Approval in %s. (d)eny?"
 
313
            else:
 
314
                message = "Denial in %s. (a)pprove?"
 
315
            message = message % unicode(timer).rsplit(".", 1)[0]
 
316
        elif self.last_checker_failed:
 
317
            timeout = datetime.timedelta(milliseconds
 
318
                                         = self.properties
 
319
                                         ["Timeout"])
 
320
            last_ok = isoformat_to_datetime(
 
321
                max((self.properties["LastCheckedOK"]
 
322
                     or self.properties["Created"]),
 
323
                    self.properties["LastEnabled"]))
 
324
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
317
325
            message = ('A checker has failed! Time until client'
318
 
                       ' gets disabled: {0}'
319
 
                       .format(unicode(timer).rsplit(".", 1)[0]))
 
326
                       ' gets disabled: %s'
 
327
                           % unicode(timer).rsplit(".", 1)[0])
320
328
        else:
321
329
            message = "enabled"
322
 
        self._text = "{0}{1}".format(base, message)
 
330
        self._text = "%s%s" % (base, message)
323
331
            
324
332
        if not urwid.supports_unicode():
325
333
            self._text = self._text.encode("ascii", "replace")
338
346
            self.update_hook()
339
347
    
340
348
    def update_timer(self):
341
 
        """called by gobject. Will indefinitely loop until
342
 
        gobject.source_remove() on tag is called"""
 
349
        "called by gobject"
343
350
        self.update()
344
351
        return True             # Keep calling this
345
352
    
346
 
    def delete(self, **kwargs):
 
353
    def delete(self, *args, **kwargs):
347
354
        if self._update_timer_callback_tag is not None:
348
355
            gobject.source_remove(self._update_timer_callback_tag)
349
356
            self._update_timer_callback_tag = None
352
359
        self.match_objects = ()
353
360
        if self.delete_hook is not None:
354
361
            self.delete_hook(self)
355
 
        return super(MandosClientWidget, self).delete(**kwargs)
 
362
        return super(MandosClientWidget, self).delete(*args, **kwargs)
356
363
    
357
364
    def render(self, maxcolrow, focus=False):
358
365
        """Render differently if we have focus.
400
407
        else:
401
408
            return key
402
409
    
403
 
    def property_changed(self, property=None, **kwargs):
 
410
    def property_changed(self, property=None, value=None,
 
411
                         *args, **kwargs):
404
412
        """Call self.update() if old value is not new value.
405
413
        This overrides the method from MandosClientPropertyCache"""
406
414
        property_name = unicode(property)
407
415
        old_value = self.properties.get(property_name)
408
416
        super(MandosClientWidget, self).property_changed(
409
 
            property=property, **kwargs)
 
417
            property=property, value=value, *args, **kwargs)
410
418
        if self.properties.get(property_name) != old_value:
411
419
            self.update()
412
420
 
416
424
    "down" key presses, thus not allowing any containing widgets to
417
425
    use them as an excuse to shift focus away from this widget.
418
426
    """
419
 
    def keypress(self, *args, **kwargs):
420
 
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
 
427
    def keypress(self, maxcolrow, key):
 
428
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
421
429
        if ret in ("up", "down"):
422
430
            return
423
431
        return ret
487
495
        
488
496
        self.busname = domain + '.Mandos'
489
497
        self.main_loop = gobject.MainLoop()
 
498
        self.bus = dbus.SystemBus()
 
499
        mandos_dbus_objc = self.bus.get_object(
 
500
            self.busname, "/", follow_name_owner_changes=True)
 
501
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
502
                                          dbus_interface
 
503
                                          = server_interface)
 
504
        try:
 
505
            mandos_clients = (self.mandos_serv
 
506
                              .GetAllClientsWithProperties())
 
507
        except dbus.exceptions.DBusException:
 
508
            mandos_clients = dbus.Dictionary()
 
509
        
 
510
        (self.mandos_serv
 
511
         .connect_to_signal("ClientRemoved",
 
512
                            self.find_and_remove_client,
 
513
                            dbus_interface=server_interface,
 
514
                            byte_arrays=True))
 
515
        (self.mandos_serv
 
516
         .connect_to_signal("ClientAdded",
 
517
                            self.add_new_client,
 
518
                            dbus_interface=server_interface,
 
519
                            byte_arrays=True))
 
520
        (self.mandos_serv
 
521
         .connect_to_signal("ClientNotFound",
 
522
                            self.client_not_found,
 
523
                            dbus_interface=server_interface,
 
524
                            byte_arrays=True))
 
525
        for path, client in mandos_clients.iteritems():
 
526
            client_proxy_object = self.bus.get_object(self.busname,
 
527
                                                      path)
 
528
            self.add_client(MandosClientWidget(server_proxy_object
 
529
                                               =self.mandos_serv,
 
530
                                               proxy_object
 
531
                                               =client_proxy_object,
 
532
                                               properties=client,
 
533
                                               update_hook
 
534
                                               =self.refresh,
 
535
                                               delete_hook
 
536
                                               =self.remove_client,
 
537
                                               logger
 
538
                                               =self.log_message),
 
539
                            path=path)
490
540
    
491
541
    def client_not_found(self, fingerprint, address):
492
 
        self.log_message("Client with address {0} and fingerprint"
493
 
                         " {1} could not be found"
494
 
                         .format(address, fingerprint))
 
542
        self.log_message(("Client with address %s and fingerprint %s"
 
543
                          " could not be found" % (address,
 
544
                                                    fingerprint)))
495
545
    
496
546
    def rebuild(self):
497
547
        """This rebuilds the User Interface.
507
557
                                                     self.divider)))
508
558
        if self.log_visible:
509
559
            self.uilist.append(self.logbox)
 
560
            pass
510
561
        self.topwidget = urwid.Pile(self.uilist)
511
562
    
512
563
    def log_message(self, message):
550
601
            client = self.clients_dict[path]
551
602
        except KeyError:
552
603
            # not found?
553
 
            self.log_message("Unknown client {0!r} ({1!r}) removed"
554
 
                             .format(name, path))
 
604
            self.log_message("Unknown client %r (%r) removed", name,
 
605
                             path)
555
606
            return
556
607
        client.delete()
557
608
    
596
647
    
597
648
    def run(self):
598
649
        """Start the main loop and exit when it's done."""
599
 
        self.bus = dbus.SystemBus()
600
 
        mandos_dbus_objc = self.bus.get_object(
601
 
            self.busname, "/", follow_name_owner_changes=True)
602
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
603
 
                                          dbus_interface
604
 
                                          = server_interface)
605
 
        try:
606
 
            mandos_clients = (self.mandos_serv
607
 
                              .GetAllClientsWithProperties())
608
 
        except dbus.exceptions.DBusException:
609
 
            mandos_clients = dbus.Dictionary()
610
 
        
611
 
        (self.mandos_serv
612
 
         .connect_to_signal("ClientRemoved",
613
 
                            self.find_and_remove_client,
614
 
                            dbus_interface=server_interface,
615
 
                            byte_arrays=True))
616
 
        (self.mandos_serv
617
 
         .connect_to_signal("ClientAdded",
618
 
                            self.add_new_client,
619
 
                            dbus_interface=server_interface,
620
 
                            byte_arrays=True))
621
 
        (self.mandos_serv
622
 
         .connect_to_signal("ClientNotFound",
623
 
                            self.client_not_found,
624
 
                            dbus_interface=server_interface,
625
 
                            byte_arrays=True))
626
 
        for path, client in mandos_clients.iteritems():
627
 
            client_proxy_object = self.bus.get_object(self.busname,
628
 
                                                      path)
629
 
            self.add_client(MandosClientWidget(server_proxy_object
630
 
                                               =self.mandos_serv,
631
 
                                               proxy_object
632
 
                                               =client_proxy_object,
633
 
                                               properties=client,
634
 
                                               update_hook
635
 
                                               =self.refresh,
636
 
                                               delete_hook
637
 
                                               =self.remove_client,
638
 
                                               logger
639
 
                                               =self.log_message),
640
 
                            path=path)
641
 
        
642
650
        self.refresh()
643
651
        self._input_callback_tag = (gobject.io_add_watch
644
652
                                    (sys.stdin.fileno(),