/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-2011 Teddy Hogeborn
7
 
# Copyright © 2009-2011 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 <http://www.gnu.org/licenses/>.
21
 
# 
22
 
# Contact the authors at <mandos@fukt.bsnet.se>.
23
 
# 
24
 
 
25
 
from __future__ import division, absolute_import, print_function, unicode_literals
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
 
22
# 
 
23
# Contact the authors at <mandos@recompile.se>.
 
24
# 
 
25
 
 
26
from __future__ import (division, absolute_import, print_function,
 
27
                        unicode_literals)
 
28
 
 
29
from future_builtins import *
26
30
 
27
31
import sys
28
32
import os
48
52
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
49
53
 
50
54
# Some useful constants
51
 
domain = 'se.bsnet.fukt'
 
55
domain = 'se.recompile'
52
56
server_interface = domain + '.Mandos'
53
57
client_interface = domain + '.Mandos.Client'
54
 
version = "1.3.0"
 
58
version = "1.5.3"
55
59
 
56
60
# Always run in monochrome mode
57
61
urwid.curses_display.curses.has_colors = lambda : False
86
90
        self.proxy = proxy_object # Mandos Client proxy object
87
91
        
88
92
        self.properties = dict()
89
 
        self.proxy.connect_to_signal("PropertyChanged",
90
 
                                     self.property_changed,
91
 
                                     client_interface,
92
 
                                     byte_arrays=True)
 
93
        self.property_changed_match = (
 
94
            self.proxy.connect_to_signal("PropertyChanged",
 
95
                                         self.property_changed,
 
96
                                         client_interface,
 
97
                                         byte_arrays=True))
93
98
        
94
99
        self.properties.update(
95
100
            self.proxy.GetAll(client_interface,
96
101
                              dbus_interface = dbus.PROPERTIES_IFACE))
97
102
 
98
 
        #XXX This break good super behaviour!
 
103
        #XXX This breaks good super behaviour
99
104
#        super(MandosClientPropertyCache, self).__init__(
100
105
#            *args, **kwargs)
101
106
    
105
110
        """
106
111
        # Update properties dict with new value
107
112
        self.properties[property] = value
 
113
    
 
114
    def delete(self, *args, **kwargs):
 
115
        self.property_changed_match.remove()
 
116
        super(MandosClientPropertyCache, self).__init__(
 
117
            *args, **kwargs)
108
118
 
109
119
 
110
120
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
124
134
        
125
135
        self._update_timer_callback_tag = None
126
136
        self._update_timer_callback_lock = 0
127
 
        self.last_checker_failed = False
128
137
        
129
138
        # The widget shown normally
130
139
        self._text_widget = urwid.Text("")
138
147
        
139
148
        last_checked_ok = isoformat_to_datetime(self.properties
140
149
                                                ["LastCheckedOK"])
141
 
        if last_checked_ok is None:
142
 
            self.last_checker_failed = True
143
 
        else:
144
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
145
 
                                         - last_checked_ok)
146
 
                                        > datetime.timedelta
147
 
                                        (milliseconds=
148
 
                                         self.properties
149
 
                                         ["Interval"]))
150
150
        
151
 
        if self.last_checker_failed:
 
151
        if self.properties ["LastCheckerStatus"] != 0:
152
152
            self.using_timer(True)
153
153
        
154
154
        if self.need_approval:
155
155
            self.using_timer(True)
156
156
        
157
 
        self.proxy.connect_to_signal("CheckerCompleted",
158
 
                                     self.checker_completed,
159
 
                                     client_interface,
160
 
                                     byte_arrays=True)
161
 
        self.proxy.connect_to_signal("CheckerStarted",
162
 
                                     self.checker_started,
163
 
                                     client_interface,
164
 
                                     byte_arrays=True)
165
 
        self.proxy.connect_to_signal("GotSecret",
166
 
                                     self.got_secret,
167
 
                                     client_interface,
168
 
                                     byte_arrays=True)
169
 
        self.proxy.connect_to_signal("NeedApproval",
170
 
                                     self.need_approval,
171
 
                                     client_interface,
172
 
                                     byte_arrays=True)
173
 
        self.proxy.connect_to_signal("Rejected",
174
 
                                     self.rejected,
175
 
                                     client_interface,
176
 
                                     byte_arrays=True)
 
157
        self.match_objects = (
 
158
            self.proxy.connect_to_signal("CheckerCompleted",
 
159
                                         self.checker_completed,
 
160
                                         client_interface,
 
161
                                         byte_arrays=True),
 
162
            self.proxy.connect_to_signal("CheckerStarted",
 
163
                                         self.checker_started,
 
164
                                         client_interface,
 
165
                                         byte_arrays=True),
 
166
            self.proxy.connect_to_signal("GotSecret",
 
167
                                         self.got_secret,
 
168
                                         client_interface,
 
169
                                         byte_arrays=True),
 
170
            self.proxy.connect_to_signal("NeedApproval",
 
171
                                         self.need_approval,
 
172
                                         client_interface,
 
173
                                         byte_arrays=True),
 
174
            self.proxy.connect_to_signal("Rejected",
 
175
                                         self.rejected,
 
176
                                         client_interface,
 
177
                                         byte_arrays=True))
 
178
        #self.logger('Created client {0}'
 
179
        #            .format(self.properties["Name"]))
177
180
    
178
181
    def property_changed(self, property=None, value=None):
179
182
        super(self, MandosClientWidget).property_changed(property,
180
183
                                                         value)
181
184
        if property == "ApprovalPending":
182
185
            using_timer(bool(value))
183
 
        
 
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
    
184
192
    def using_timer(self, flag):
185
193
        """Call this method with True or False when timer should be
186
194
        activated or deactivated.
191
199
        else:
192
200
            self._update_timer_callback_lock -= 1
193
201
        if old == 0 and self._update_timer_callback_lock:
 
202
            # Will update the shown timer value every second
194
203
            self._update_timer_callback_tag = (gobject.timeout_add
195
204
                                               (1000,
196
205
                                                self.update_timer))
200
209
    
201
210
    def checker_completed(self, exitstatus, condition, command):
202
211
        if exitstatus == 0:
203
 
            if self.last_checker_failed:
204
 
                self.last_checker_failed = False
205
 
                self.using_timer(False)
206
 
            #self.logger('Checker for client %s (command "%s")'
207
 
            #            ' was successful'
208
 
            #            % (self.properties["Name"], command))
209
212
            self.update()
210
213
            return
211
214
        # Checker failed
212
 
        if not self.last_checker_failed:
213
 
            self.last_checker_failed = True
214
 
            self.using_timer(True)
215
215
        if os.WIFEXITED(condition):
216
 
            self.logger('Checker for client %s (command "%s")'
217
 
                        ' failed with exit code %s'
218
 
                        % (self.properties["Name"], command,
219
 
                           os.WEXITSTATUS(condition)))
 
216
            self.logger('Checker for client {0} (command "{1}")'
 
217
                        ' failed with exit code {2}'
 
218
                        .format(self.properties["Name"], command,
 
219
                                os.WEXITSTATUS(condition)))
220
220
        elif os.WIFSIGNALED(condition):
221
 
            self.logger('Checker for client %s (command "%s")'
222
 
                        ' was killed by signal %s'
223
 
                        % (self.properties["Name"], command,
224
 
                           os.WTERMSIG(condition)))
 
221
            self.logger('Checker for client {0} (command "{1}") was'
 
222
                        ' killed by signal {2}'
 
223
                        .format(self.properties["Name"], command,
 
224
                                os.WTERMSIG(condition)))
225
225
        elif os.WCOREDUMP(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
 
226
            self.logger('Checker for client {0} (command "{1}")'
227
227
                        ' dumped core'
228
 
                        % (self.properties["Name"], command))
 
228
                        .format(self.properties["Name"], command))
229
229
        else:
230
 
            self.logger('Checker for client %s completed'
231
 
                        ' mysteriously')
 
230
            self.logger('Checker for client {0} completed'
 
231
                        ' mysteriously'
 
232
                        .format(self.properties["Name"]))
232
233
        self.update()
233
234
    
234
235
    def checker_started(self, command):
235
 
        #self.logger('Client %s started checker "%s"'
236
 
        #            % (self.properties["Name"], unicode(command)))
 
236
        """Server signals that a checker started. This could be useful
 
237
           to log in the future. """
 
238
        #self.logger('Client {0} started checker "{1}"'
 
239
        #            .format(self.properties["Name"],
 
240
        #                    unicode(command)))
237
241
        pass
238
242
    
239
243
    def got_secret(self):
240
 
        self.last_checker_failed = False
241
 
        self.logger('Client %s received its secret'
242
 
                    % self.properties["Name"])
 
244
        self.logger('Client {0} received its secret'
 
245
                    .format(self.properties["Name"]))
243
246
    
244
247
    def need_approval(self, timeout, default):
245
248
        if not default:
246
 
            message = 'Client %s needs approval within %s seconds'
 
249
            message = 'Client {0} needs approval within {1} seconds'
247
250
        else:
248
 
            message = 'Client %s will get its secret in %s seconds'
249
 
        self.logger(message
250
 
                    % (self.properties["Name"], timeout/1000))
 
251
            message = 'Client {0} will get its secret in {1} seconds'
 
252
        self.logger(message.format(self.properties["Name"],
 
253
                                   timeout/1000))
251
254
        self.using_timer(True)
252
255
    
253
256
    def rejected(self, reason):
254
 
        self.logger('Client %s was rejected; reason: %s'
255
 
                    % (self.properties["Name"], reason))
 
257
        self.logger('Client {0} was rejected; reason: {1}'
 
258
                    .format(self.properties["Name"], reason))
256
259
    
257
260
    def selectable(self):
258
261
        """Make this a "selectable" widget.
284
287
        # Rebuild focus and non-focus widgets using current properties
285
288
 
286
289
        # Base part of a client. Name!
287
 
        base = ('%(name)s: '
288
 
                      % {"name": self.properties["Name"]})
 
290
        base = '{name}: '.format(name=self.properties["Name"])
289
291
        if not self.properties["Enabled"]:
290
292
            message = "DISABLED"
291
293
        elif self.properties["ApprovalPending"]:
300
302
            else:
301
303
                timer = datetime.timedelta()
302
304
            if self.properties["ApprovedByDefault"]:
303
 
                message = "Approval in %s. (d)eny?"
304
 
            else:
305
 
                message = "Denial in %s. (a)pprove?"
306
 
            message = message % unicode(timer).rsplit(".", 1)[0]
307
 
        elif self.last_checker_failed:
308
 
            timeout = datetime.timedelta(milliseconds
309
 
                                         = self.properties
310
 
                                         ["Timeout"])
311
 
            last_ok = isoformat_to_datetime(
312
 
                max((self.properties["LastCheckedOK"]
313
 
                     or self.properties["Created"]),
314
 
                    self.properties["LastEnabled"]))
315
 
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
305
                message = "Approval in {0}. (d)eny?"
 
306
            else:
 
307
                message = "Denial in {0}. (a)pprove?"
 
308
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
309
        elif self.properties["LastCheckerStatus"] != 0:
 
310
            # When checker has failed, show timer until client expires
 
311
            expires = self.properties["Expires"]
 
312
            if expires == "":
 
313
                timer = datetime.timedelta(0)
 
314
            else:
 
315
                expires = (datetime.datetime.strptime
 
316
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
317
                timer = expires - datetime.datetime.utcnow()
316
318
            message = ('A checker has failed! Time until client'
317
 
                       ' gets disabled: %s'
318
 
                           % unicode(timer).rsplit(".", 1)[0])
 
319
                       ' gets disabled: {0}'
 
320
                       .format(unicode(timer).rsplit(".", 1)[0]))
319
321
        else:
320
322
            message = "enabled"
321
 
        self._text = "%s%s" % (base, message)
 
323
        self._text = "{0}{1}".format(base, message)
322
324
            
323
325
        if not urwid.supports_unicode():
324
326
            self._text = self._text.encode("ascii", "replace")
337
339
            self.update_hook()
338
340
    
339
341
    def update_timer(self):
340
 
        "called by gobject"
 
342
        """called by gobject. Will indefinitely loop until
 
343
        gobject.source_remove() on tag is called"""
341
344
        self.update()
342
345
        return True             # Keep calling this
343
346
    
344
 
    def delete(self):
 
347
    def delete(self, *args, **kwargs):
345
348
        if self._update_timer_callback_tag is not None:
346
349
            gobject.source_remove(self._update_timer_callback_tag)
347
350
            self._update_timer_callback_tag = None
 
351
        for match in self.match_objects:
 
352
            match.remove()
 
353
        self.match_objects = ()
348
354
        if self.delete_hook is not None:
349
355
            self.delete_hook(self)
 
356
        return super(MandosClientWidget, self).delete(*args, **kwargs)
350
357
    
351
358
    def render(self, maxcolrow, focus=False):
352
359
        """Render differently if we have focus.
358
365
        """Handle keys.
359
366
        This overrides the method from urwid.FlowWidget"""
360
367
        if key == "+":
361
 
            self.proxy.Enable(dbus_interface = client_interface)
 
368
            self.proxy.Enable(dbus_interface = client_interface,
 
369
                              ignore_reply=True)
362
370
        elif key == "-":
363
 
            self.proxy.Disable(dbus_interface = client_interface)
 
371
            self.proxy.Disable(dbus_interface = client_interface,
 
372
                               ignore_reply=True)
364
373
        elif key == "a":
365
374
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
 
                               dbus_interface = client_interface)
 
375
                               dbus_interface = client_interface,
 
376
                               ignore_reply=True)
367
377
        elif key == "d":
368
378
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
 
                                  dbus_interface = client_interface)
 
379
                                  dbus_interface = client_interface,
 
380
                               ignore_reply=True)
370
381
        elif key == "R" or key == "_" or key == "ctrl k":
371
382
            self.server_proxy_object.RemoveClient(self.proxy
372
 
                                                  .object_path)
 
383
                                                  .object_path,
 
384
                                                  ignore_reply=True)
373
385
        elif key == "s":
374
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
386
            self.proxy.StartChecker(dbus_interface = client_interface,
 
387
                                    ignore_reply=True)
375
388
        elif key == "S":
376
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
389
            self.proxy.StopChecker(dbus_interface = client_interface,
 
390
                                   ignore_reply=True)
377
391
        elif key == "C":
378
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
392
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
393
                                 ignore_reply=True)
379
394
        # xxx
380
395
#         elif key == "p" or key == "=":
381
396
#             self.proxy.pause()
474
489
        
475
490
        self.busname = domain + '.Mandos'
476
491
        self.main_loop = gobject.MainLoop()
477
 
        self.bus = dbus.SystemBus()
478
 
        mandos_dbus_objc = self.bus.get_object(
479
 
            self.busname, "/", follow_name_owner_changes=True)
480
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
481
 
                                          dbus_interface
482
 
                                          = server_interface)
483
 
        try:
484
 
            mandos_clients = (self.mandos_serv
485
 
                              .GetAllClientsWithProperties())
486
 
        except dbus.exceptions.DBusException:
487
 
            mandos_clients = dbus.Dictionary()
488
 
        
489
 
        (self.mandos_serv
490
 
         .connect_to_signal("ClientRemoved",
491
 
                            self.find_and_remove_client,
492
 
                            dbus_interface=server_interface,
493
 
                            byte_arrays=True))
494
 
        (self.mandos_serv
495
 
         .connect_to_signal("ClientAdded",
496
 
                            self.add_new_client,
497
 
                            dbus_interface=server_interface,
498
 
                            byte_arrays=True))
499
 
        (self.mandos_serv
500
 
         .connect_to_signal("ClientNotFound",
501
 
                            self.client_not_found,
502
 
                            dbus_interface=server_interface,
503
 
                            byte_arrays=True))
504
 
        for path, client in mandos_clients.iteritems():
505
 
            client_proxy_object = self.bus.get_object(self.busname,
506
 
                                                      path)
507
 
            self.add_client(MandosClientWidget(server_proxy_object
508
 
                                               =self.mandos_serv,
509
 
                                               proxy_object
510
 
                                               =client_proxy_object,
511
 
                                               properties=client,
512
 
                                               update_hook
513
 
                                               =self.refresh,
514
 
                                               delete_hook
515
 
                                               =self.remove_client,
516
 
                                               logger
517
 
                                               =self.log_message),
518
 
                            path=path)
519
492
    
520
493
    def client_not_found(self, fingerprint, address):
521
 
        self.log_message(("Client with address %s and fingerprint %s"
522
 
                          " could not be found" % (address,
523
 
                                                    fingerprint)))
 
494
        self.log_message("Client with address {0} and fingerprint"
 
495
                         " {1} could not be found"
 
496
                         .format(address, fingerprint))
524
497
    
525
498
    def rebuild(self):
526
499
        """This rebuilds the User Interface.
536
509
                                                     self.divider)))
537
510
        if self.log_visible:
538
511
            self.uilist.append(self.logbox)
539
 
            pass
540
512
        self.topwidget = urwid.Pile(self.uilist)
541
513
    
542
514
    def log_message(self, message):
572
544
        #self.log_message("Wrap mode: " + self.log_wrap)
573
545
    
574
546
    def find_and_remove_client(self, path, name):
575
 
        """Find an client from its object path and remove it.
 
547
        """Find a client by its object path and remove it.
576
548
        
577
549
        This is connected to the ClientRemoved signal from the
578
550
        Mandos server object."""
580
552
            client = self.clients_dict[path]
581
553
        except KeyError:
582
554
            # not found?
 
555
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
556
                             .format(name, path))
583
557
            return
584
 
        self.remove_client(client, path)
 
558
        client.delete()
585
559
    
586
560
    def add_new_client(self, path):
587
561
        client_proxy_object = self.bus.get_object(self.busname, path)
624
598
    
625
599
    def run(self):
626
600
        """Start the main loop and exit when it's done."""
 
601
        self.bus = dbus.SystemBus()
 
602
        mandos_dbus_objc = self.bus.get_object(
 
603
            self.busname, "/", follow_name_owner_changes=True)
 
604
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
605
                                          dbus_interface
 
606
                                          = server_interface)
 
607
        try:
 
608
            mandos_clients = (self.mandos_serv
 
609
                              .GetAllClientsWithProperties())
 
610
        except dbus.exceptions.DBusException:
 
611
            mandos_clients = dbus.Dictionary()
 
612
        
 
613
        (self.mandos_serv
 
614
         .connect_to_signal("ClientRemoved",
 
615
                            self.find_and_remove_client,
 
616
                            dbus_interface=server_interface,
 
617
                            byte_arrays=True))
 
618
        (self.mandos_serv
 
619
         .connect_to_signal("ClientAdded",
 
620
                            self.add_new_client,
 
621
                            dbus_interface=server_interface,
 
622
                            byte_arrays=True))
 
623
        (self.mandos_serv
 
624
         .connect_to_signal("ClientNotFound",
 
625
                            self.client_not_found,
 
626
                            dbus_interface=server_interface,
 
627
                            byte_arrays=True))
 
628
        for path, client in mandos_clients.iteritems():
 
629
            client_proxy_object = self.bus.get_object(self.busname,
 
630
                                                      path)
 
631
            self.add_client(MandosClientWidget(server_proxy_object
 
632
                                               =self.mandos_serv,
 
633
                                               proxy_object
 
634
                                               =client_proxy_object,
 
635
                                               properties=client,
 
636
                                               update_hook
 
637
                                               =self.refresh,
 
638
                                               delete_hook
 
639
                                               =self.remove_client,
 
640
                                               logger
 
641
                                               =self.log_message),
 
642
                            path=path)
 
643
 
627
644
        self.refresh()
628
645
        self._input_callback_tag = (gobject.io_add_watch
629
646
                                    (sys.stdin.fileno(),