/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: 2012-05-07 20:46:51 UTC
  • Revision ID: teddy@recompile.se-20120507204651-qx5o5ztwmau54mh4
* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

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
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
 
33
import signal
35
34
 
36
35
import datetime
37
36
 
39
38
import urwid
40
39
 
41
40
from dbus.mainloop.glib import DBusGMainLoop
42
 
try:
43
 
    import gobject
44
 
except ImportError:
45
 
    from gi.repository import GObject as gobject
 
41
import gobject
46
42
 
47
43
import dbus
48
44
 
 
45
import UserList
 
46
 
49
47
import locale
50
48
 
51
 
if sys.version_info[0] == 2:
52
 
    str = unicode
53
 
 
54
49
locale.setlocale(locale.LC_ALL, '')
55
50
 
56
51
import logging
60
55
domain = 'se.recompile'
61
56
server_interface = domain + '.Mandos'
62
57
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.4"
 
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)
64
67
 
65
68
def isoformat_to_datetime(iso):
66
69
    "Parse an ISO 8601 date string to a datetime.datetime()"
131
134
        self.logger = logger
132
135
        
133
136
        self._update_timer_callback_tag = None
 
137
        self._update_timer_callback_lock = 0
134
138
        
135
139
        # The widget shown normally
136
140
        self._text_widget = urwid.Text("")
140
144
        self.update()
141
145
        self.opened = False
142
146
        
 
147
        last_checked_ok = isoformat_to_datetime(self.properties
 
148
                                                ["LastCheckedOK"])
 
149
        
 
150
        if self.properties ["LastCheckerStatus"] != 0:
 
151
            self.using_timer(True)
 
152
        
 
153
        if self.need_approval:
 
154
            self.using_timer(True)
 
155
        
143
156
        self.match_objects = (
144
157
            self.proxy.connect_to_signal("CheckerCompleted",
145
158
                                         self.checker_completed,
164
177
        #self.logger('Created client {0}'
165
178
        #            .format(self.properties["Name"]))
166
179
    
 
180
    def property_changed(self, property=None, value=None):
 
181
        super(self, MandosClientWidget).property_changed(property,
 
182
                                                         value)
 
183
        if property == "ApprovalPending":
 
184
            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
    
167
191
    def using_timer(self, flag):
168
192
        """Call this method with True or False when timer should be
169
193
        activated or deactivated.
170
194
        """
171
 
        if flag and self._update_timer_callback_tag is None:
 
195
        old = self._update_timer_callback_lock
 
196
        if flag:
 
197
            self._update_timer_callback_lock += 1
 
198
        else:
 
199
            self._update_timer_callback_lock -= 1
 
200
        if old == 0 and self._update_timer_callback_lock:
172
201
            # Will update the shown timer value every second
173
202
            self._update_timer_callback_tag = (gobject.timeout_add
174
203
                                               (1000,
175
204
                                                self.update_timer))
176
 
        elif not (flag or self._update_timer_callback_tag is None):
 
205
        elif old and self._update_timer_callback_lock == 0:
177
206
            gobject.source_remove(self._update_timer_callback_tag)
178
207
            self._update_timer_callback_tag = None
179
208
    
207
236
           to log in the future. """
208
237
        #self.logger('Client {0} started checker "{1}"'
209
238
        #            .format(self.properties["Name"],
210
 
        #                    str(command)))
 
239
        #                    unicode(command)))
211
240
        pass
212
241
    
213
242
    def got_secret(self):
221
250
            message = 'Client {0} will get its secret in {1} seconds'
222
251
        self.logger(message.format(self.properties["Name"],
223
252
                                   timeout/1000))
 
253
        self.using_timer(True)
224
254
    
225
255
    def rejected(self, reason):
226
256
        self.logger('Client {0} was rejected; reason: {1}'
252
282
                          "bold-underline-blink":
253
283
                              "bold-underline-blink-standout",
254
284
                          }
255
 
        
 
285
 
256
286
        # Rebuild focus and non-focus widgets using current properties
257
 
        
 
287
 
258
288
        # Base part of a client. Name!
259
289
        base = '{name}: '.format(name=self.properties["Name"])
260
290
        if not self.properties["Enabled"]:
261
291
            message = "DISABLED"
262
 
            self.using_timer(False)
263
292
        elif self.properties["ApprovalPending"]:
264
293
            timeout = datetime.timedelta(milliseconds
265
294
                                         = self.properties
267
296
            last_approval_request = isoformat_to_datetime(
268
297
                self.properties["LastApprovalRequest"])
269
298
            if last_approval_request is not None:
270
 
                timer = max(timeout - (datetime.datetime.utcnow()
271
 
                                       - last_approval_request),
272
 
                            datetime.timedelta())
 
299
                timer = timeout - (datetime.datetime.utcnow()
 
300
                                   - last_approval_request)
273
301
            else:
274
302
                timer = datetime.timedelta()
275
303
            if self.properties["ApprovedByDefault"]:
276
304
                message = "Approval in {0}. (d)eny?"
277
305
            else:
278
306
                message = "Denial in {0}. (a)pprove?"
279
 
            message = message.format(str(timer).rsplit(".", 1)[0])
280
 
            self.using_timer(True)
 
307
            message = message.format(unicode(timer).rsplit(".", 1)[0])
281
308
        elif self.properties["LastCheckerStatus"] != 0:
282
309
            # When checker has failed, show timer until client expires
283
310
            expires = self.properties["Expires"]
286
313
            else:
287
314
                expires = (datetime.datetime.strptime
288
315
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
289
 
                timer = max(expires - datetime.datetime.utcnow(),
290
 
                            datetime.timedelta())
 
316
                timer = expires - datetime.datetime.utcnow()
291
317
            message = ('A checker has failed! Time until client'
292
318
                       ' gets disabled: {0}'
293
 
                       .format(str(timer).rsplit(".", 1)[0]))
294
 
            self.using_timer(True)
 
319
                       .format(unicode(timer).rsplit(".", 1)[0]))
295
320
        else:
296
321
            message = "enabled"
297
 
            self.using_timer(False)
298
322
        self._text = "{0}{1}".format(base, message)
299
 
        
 
323
            
300
324
        if not urwid.supports_unicode():
301
325
            self._text = self._text.encode("ascii", "replace")
302
326
        textlist = [("normal", self._text)]
379
403
    def property_changed(self, property=None, **kwargs):
380
404
        """Call self.update() if old value is not new value.
381
405
        This overrides the method from MandosClientPropertyCache"""
382
 
        property_name = str(property)
 
406
        property_name = unicode(property)
383
407
        old_value = self.properties.get(property_name)
384
408
        super(MandosClientWidget, self).property_changed(
385
409
            property=property, **kwargs)
412
436
                ("normal",
413
437
                 "default", "default", None),
414
438
                ("bold",
415
 
                 "bold", "default", "bold"),
 
439
                 "default", "default", "bold"),
416
440
                ("underline-blink",
417
 
                 "underline,blink", "default", "underline,blink"),
 
441
                 "default", "default", "underline"),
418
442
                ("standout",
419
 
                 "standout", "default", "standout"),
 
443
                 "default", "default", "standout"),
420
444
                ("bold-underline-blink",
421
 
                 "bold,underline,blink", "default", "bold,underline,blink"),
 
445
                 "default", "default", ("bold", "underline")),
422
446
                ("bold-standout",
423
 
                 "bold,standout", "default", "bold,standout"),
 
447
                 "default", "default", ("bold", "standout")),
424
448
                ("underline-blink-standout",
425
 
                 "underline,blink,standout", "default",
426
 
                 "underline,blink,standout"),
 
449
                 "default", "default", ("underline", "standout")),
427
450
                ("bold-underline-blink-standout",
428
 
                 "bold,underline,blink,standout", "default",
429
 
                 "bold,underline,blink,standout"),
 
451
                 "default", "default", ("bold", "underline",
 
452
                                          "standout")),
430
453
                ))
431
454
        
432
455
        if urwid.supports_unicode():
487
510
        self.topwidget = urwid.Pile(self.uilist)
488
511
    
489
512
    def log_message(self, message):
490
 
        """Log message formatted with timestamp"""
491
513
        timestamp = datetime.datetime.now().isoformat()
492
514
        self.log_message_raw(timestamp + ": " + message)
493
515
    
506
528
        self.log_visible = not self.log_visible
507
529
        self.rebuild()
508
530
        #self.log_message("Log visibility changed to: "
509
 
        #                 + str(self.log_visible))
 
531
        #                 + unicode(self.log_visible))
510
532
    
511
533
    def change_log_display(self):
512
534
        """Change type of log display.
552
574
        if path is None:
553
575
            path = client.proxy.object_path
554
576
        self.clients_dict[path] = client
555
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
577
        self.clients.sort(None, lambda c: c.properties["Name"])
556
578
        self.refresh()
557
579
    
558
580
    def remove_client(self, client, path=None):
560
582
        if path is None:
561
583
            path = client.proxy.object_path
562
584
        del self.clients_dict[path]
 
585
        if not self.clients_dict:
 
586
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
587
            # is completely emptied, we need to recreate it.
 
588
            self.clients = urwid.SimpleListWalker([])
 
589
            self.rebuild()
563
590
        self.refresh()
564
591
    
565
592
    def refresh(self):
578
605
        try:
579
606
            mandos_clients = (self.mandos_serv
580
607
                              .GetAllClientsWithProperties())
581
 
            if not mandos_clients:
582
 
                self.log_message_raw(("bold", "Note: Server has no clients."))
583
608
        except dbus.exceptions.DBusException:
584
 
            self.log_message_raw(("bold", "Note: No Mandos server running."))
585
609
            mandos_clients = dbus.Dictionary()
586
610
        
587
611
        (self.mandos_serv
599
623
                            self.client_not_found,
600
624
                            dbus_interface=server_interface,
601
625
                            byte_arrays=True))
602
 
        for path, client in mandos_clients.items():
 
626
        for path, client in mandos_clients.iteritems():
603
627
            client_proxy_object = self.bus.get_object(self.busname,
604
628
                                                      path)
605
629
            self.add_client(MandosClientWidget(server_proxy_object
717
741
    ui.run()
718
742
except KeyboardInterrupt:
719
743
    ui.screen.stop()
720
 
except Exception as e:
721
 
    ui.log_message(str(e))
 
744
except Exception, e:
 
745
    ui.log_message(unicode(e))
722
746
    ui.screen.stop()
723
747
    raise