/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

  • Committer: Teddy Hogeborn
  • Date: 2016-03-17 21:14:12 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 341.
  • Revision ID: teddy@recompile.se-20160317211412-yp8msw4v4ifx4i4x
Client: Remove dead code in plugin-runner

WCOREDUMP is always a subset of WTERMSIG; ignore WCOREDUMP.

* plugin-runner.c (main): Remove WCOREDUMP clause.

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-2016 Teddy Hogeborn
 
7
# Copyright © 2009-2016 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/>.
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
21
22
# 
22
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
23
# Contact the authors at <mandos@recompile.se>.
23
24
# 
24
25
 
25
26
from __future__ import (division, absolute_import, print_function,
26
27
                        unicode_literals)
 
28
try:
 
29
    from future_builtins import *
 
30
except ImportError:
 
31
    pass
27
32
 
28
33
import sys
29
34
import os
30
 
import signal
31
35
 
32
36
import datetime
33
37
 
35
39
import urwid
36
40
 
37
41
from dbus.mainloop.glib import DBusGMainLoop
38
 
import gobject
 
42
from gi.repository import GLib
39
43
 
40
44
import dbus
41
45
 
42
 
import UserList
43
 
 
44
46
import locale
45
47
 
 
48
if sys.version_info.major == 2:
 
49
    str = unicode
 
50
 
46
51
locale.setlocale(locale.LC_ALL, '')
47
52
 
48
53
import logging
49
54
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
50
55
 
51
56
# Some useful constants
52
 
domain = 'se.bsnet.fukt'
 
57
domain = 'se.recompile'
53
58
server_interface = domain + '.Mandos'
54
59
client_interface = domain + '.Mandos.Client'
55
 
version = "1.3.1"
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)
 
60
version = "1.7.6"
 
61
 
 
62
try:
 
63
    dbus.OBJECT_MANAGER_IFACE
 
64
except AttributeError:
 
65
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
64
66
 
65
67
def isoformat_to_datetime(iso):
66
68
    "Parse an ISO 8601 date string to a datetime.datetime()"
83
85
    properties and calls a hook function when any of them are
84
86
    changed.
85
87
    """
86
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
88
    def __init__(self, proxy_object=None, properties=None, **kwargs):
87
89
        self.proxy = proxy_object # Mandos Client proxy object
88
 
        
89
 
        self.properties = dict()
 
90
        self.properties = dict() if properties is None else properties
90
91
        self.property_changed_match = (
91
 
            self.proxy.connect_to_signal("PropertyChanged",
92
 
                                         self.property_changed,
93
 
                                         client_interface,
 
92
            self.proxy.connect_to_signal("PropertiesChanged",
 
93
                                         self.properties_changed,
 
94
                                         dbus.PROPERTIES_IFACE,
94
95
                                         byte_arrays=True))
95
96
        
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)
 
97
        if properties is None:
 
98
            self.properties.update(
 
99
                self.proxy.GetAll(client_interface,
 
100
                                  dbus_interface
 
101
                                  = dbus.PROPERTIES_IFACE))
 
102
        
 
103
        super(MandosClientPropertyCache, self).__init__(**kwargs)
103
104
    
104
 
    def property_changed(self, property=None, value=None):
105
 
        """This is called whenever we get a PropertyChanged signal
106
 
        It updates the changed property in the "properties" dict.
 
105
    def properties_changed(self, interface, properties, invalidated):
 
106
        """This is called whenever we get a PropertiesChanged signal
 
107
        It updates the changed properties in the "properties" dict.
107
108
        """
108
109
        # Update properties dict with new value
109
 
        self.properties[property] = value
 
110
        if interface == client_interface:
 
111
            self.properties.update(properties)
110
112
    
111
 
    def delete(self, *args, **kwargs):
 
113
    def delete(self):
112
114
        self.property_changed_match.remove()
113
 
        super(MandosClientPropertyCache, self).__init__(
114
 
            *args, **kwargs)
115
115
 
116
116
 
117
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
119
    """
120
120
    
121
121
    def __init__(self, server_proxy_object=None, update_hook=None,
122
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
122
                 delete_hook=None, logger=None, **kwargs):
123
123
        # Called on update
124
124
        self.update_hook = update_hook
125
125
        # Called on delete
130
130
        self.logger = logger
131
131
        
132
132
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
 
        self.last_checker_failed = False
135
133
        
136
134
        # The widget shown normally
137
135
        self._text_widget = urwid.Text("")
138
136
        # The widget shown when we have focus
139
137
        self._focus_text_widget = urwid.Text("")
140
 
        super(MandosClientWidget, self).__init__(
141
 
            update_hook=update_hook, delete_hook=delete_hook,
142
 
            *args, **kwargs)
 
138
        super(MandosClientWidget, self).__init__(**kwargs)
143
139
        self.update()
144
140
        self.opened = False
145
141
        
146
 
        last_checked_ok = isoformat_to_datetime(self.properties
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"]))
157
 
        
158
 
        if self.last_checker_failed:
159
 
            self.using_timer(True)
160
 
        
161
 
        if self.need_approval:
162
 
            self.using_timer(True)
163
 
        
164
142
        self.match_objects = (
165
143
            self.proxy.connect_to_signal("CheckerCompleted",
166
144
                                         self.checker_completed,
182
160
                                         self.rejected,
183
161
                                         client_interface,
184
162
                                         byte_arrays=True))
185
 
        #self.logger('Created client %s' % (self.properties["Name"]))
 
163
        self.logger('Created client {}'
 
164
                    .format(self.properties["Name"]), level=0)
186
165
    
187
 
    def property_changed(self, property=None, value=None):
188
 
        super(self, MandosClientWidget).property_changed(property,
189
 
                                                         value)
190
 
        if property == "ApprovalPending":
191
 
            using_timer(bool(value))
192
 
        
193
166
    def using_timer(self, flag):
194
167
        """Call this method with True or False when timer should be
195
168
        activated or deactivated.
196
169
        """
197
 
        old = self._update_timer_callback_lock
198
 
        if flag:
199
 
            self._update_timer_callback_lock += 1
200
 
        else:
201
 
            self._update_timer_callback_lock -= 1
202
 
        if old == 0 and self._update_timer_callback_lock:
203
 
            self._update_timer_callback_tag = (gobject.timeout_add
 
170
        if flag and self._update_timer_callback_tag is None:
 
171
            # Will update the shown timer value every second
 
172
            self._update_timer_callback_tag = (GLib.timeout_add
204
173
                                               (1000,
205
174
                                                self.update_timer))
206
 
        elif old and self._update_timer_callback_lock == 0:
207
 
            gobject.source_remove(self._update_timer_callback_tag)
 
175
        elif not (flag or self._update_timer_callback_tag is None):
 
176
            GLib.source_remove(self._update_timer_callback_tag)
208
177
            self._update_timer_callback_tag = None
209
178
    
210
179
    def checker_completed(self, exitstatus, condition, command):
211
180
        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))
 
181
            self.logger('Checker for client {} (command "{}")'
 
182
                        ' succeeded'.format(self.properties["Name"],
 
183
                                            command), level=0)
218
184
            self.update()
219
185
            return
220
186
        # Checker failed
221
 
        if not self.last_checker_failed:
222
 
            self.last_checker_failed = True
223
 
            self.using_timer(True)
224
187
        if os.WIFEXITED(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)))
 
188
            self.logger('Checker for client {} (command "{}") failed'
 
189
                        ' with exit code {}'
 
190
                        .format(self.properties["Name"], command,
 
191
                                os.WEXITSTATUS(condition)))
229
192
        elif os.WIFSIGNALED(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)))
234
 
        elif os.WCOREDUMP(condition):
235
 
            self.logger('Checker for client %s (command "%s")'
236
 
                        ' dumped core'
237
 
                        % (self.properties["Name"], command))
238
 
        else:
239
 
            self.logger('Checker for client %s completed'
240
 
                        ' mysteriously')
 
193
            self.logger('Checker for client {} (command "{}") was'
 
194
                        ' killed by signal {}'
 
195
                        .format(self.properties["Name"], command,
 
196
                                os.WTERMSIG(condition)))
241
197
        self.update()
242
198
    
243
199
    def checker_started(self, command):
244
 
        #self.logger('Client %s started checker "%s"'
245
 
        #            % (self.properties["Name"], unicode(command)))
246
 
        pass
 
200
        """Server signals that a checker started."""
 
201
        self.logger('Client {} started checker "{}"'
 
202
                    .format(self.properties["Name"],
 
203
                            command), level=0)
247
204
    
248
205
    def got_secret(self):
249
 
        self.last_checker_failed = False
250
 
        self.logger('Client %s received its secret'
251
 
                    % self.properties["Name"])
 
206
        self.logger('Client {} received its secret'
 
207
                    .format(self.properties["Name"]))
252
208
    
253
209
    def need_approval(self, timeout, default):
254
210
        if not default:
255
 
            message = 'Client %s needs approval within %s seconds'
 
211
            message = 'Client {} needs approval within {} seconds'
256
212
        else:
257
 
            message = 'Client %s will get its secret in %s seconds'
258
 
        self.logger(message
259
 
                    % (self.properties["Name"], timeout/1000))
260
 
        self.using_timer(True)
 
213
            message = 'Client {} will get its secret in {} seconds'
 
214
        self.logger(message.format(self.properties["Name"],
 
215
                                   timeout/1000))
261
216
    
262
217
    def rejected(self, reason):
263
 
        self.logger('Client %s was rejected; reason: %s'
264
 
                    % (self.properties["Name"], reason))
 
218
        self.logger('Client {} was rejected; reason: {}'
 
219
                    .format(self.properties["Name"], reason))
265
220
    
266
221
    def selectable(self):
267
222
        """Make this a "selectable" widget.
289
244
                          "bold-underline-blink":
290
245
                              "bold-underline-blink-standout",
291
246
                          }
292
 
 
 
247
        
293
248
        # Rebuild focus and non-focus widgets using current properties
294
 
 
 
249
        
295
250
        # Base part of a client. Name!
296
 
        base = ('%(name)s: '
297
 
                      % {"name": self.properties["Name"]})
 
251
        base = '{name}: '.format(name=self.properties["Name"])
298
252
        if not self.properties["Enabled"]:
299
253
            message = "DISABLED"
 
254
            self.using_timer(False)
300
255
        elif self.properties["ApprovalPending"]:
301
256
            timeout = datetime.timedelta(milliseconds
302
257
                                         = self.properties
304
259
            last_approval_request = isoformat_to_datetime(
305
260
                self.properties["LastApprovalRequest"])
306
261
            if last_approval_request is not None:
307
 
                timer = timeout - (datetime.datetime.utcnow()
308
 
                                   - last_approval_request)
 
262
                timer = max(timeout - (datetime.datetime.utcnow()
 
263
                                       - last_approval_request),
 
264
                            datetime.timedelta())
309
265
            else:
310
266
                timer = datetime.timedelta()
311
267
            if self.properties["ApprovedByDefault"]:
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)
 
268
                message = "Approval in {}. (d)eny?"
 
269
            else:
 
270
                message = "Denial in {}. (a)pprove?"
 
271
            message = message.format(str(timer).rsplit(".", 1)[0])
 
272
            self.using_timer(True)
 
273
        elif self.properties["LastCheckerStatus"] != 0:
 
274
            # When checker has failed, show timer until client expires
 
275
            expires = self.properties["Expires"]
 
276
            if expires == "":
 
277
                timer = datetime.timedelta(0)
 
278
            else:
 
279
                expires = (datetime.datetime.strptime
 
280
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
281
                timer = max(expires - datetime.datetime.utcnow(),
 
282
                            datetime.timedelta())
325
283
            message = ('A checker has failed! Time until client'
326
 
                       ' gets disabled: %s'
327
 
                           % unicode(timer).rsplit(".", 1)[0])
 
284
                       ' gets disabled: {}'
 
285
                       .format(str(timer).rsplit(".", 1)[0]))
 
286
            self.using_timer(True)
328
287
        else:
329
288
            message = "enabled"
330
 
        self._text = "%s%s" % (base, message)
331
 
            
 
289
            self.using_timer(False)
 
290
        self._text = "{}{}".format(base, message)
 
291
        
332
292
        if not urwid.supports_unicode():
333
293
            self._text = self._text.encode("ascii", "replace")
334
294
        textlist = [("normal", self._text)]
346
306
            self.update_hook()
347
307
    
348
308
    def update_timer(self):
349
 
        "called by gobject"
 
309
        """called by GLib. Will indefinitely loop until
 
310
        GLib.source_remove() on tag is called
 
311
        """
350
312
        self.update()
351
313
        return True             # Keep calling this
352
314
    
353
 
    def delete(self, *args, **kwargs):
 
315
    def delete(self, **kwargs):
354
316
        if self._update_timer_callback_tag is not None:
355
 
            gobject.source_remove(self._update_timer_callback_tag)
 
317
            GLib.source_remove(self._update_timer_callback_tag)
356
318
            self._update_timer_callback_tag = None
357
319
        for match in self.match_objects:
358
320
            match.remove()
359
321
        self.match_objects = ()
360
322
        if self.delete_hook is not None:
361
323
            self.delete_hook(self)
362
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
324
        return super(MandosClientWidget, self).delete(**kwargs)
363
325
    
364
326
    def render(self, maxcolrow, focus=False):
365
327
        """Render differently if we have focus.
371
333
        """Handle keys.
372
334
        This overrides the method from urwid.FlowWidget"""
373
335
        if key == "+":
374
 
            self.proxy.Enable(dbus_interface = client_interface,
375
 
                              ignore_reply=True)
 
336
            self.proxy.Set(client_interface, "Enabled",
 
337
                           dbus.Boolean(True), ignore_reply = True,
 
338
                           dbus_interface = dbus.PROPERTIES_IFACE)
376
339
        elif key == "-":
377
 
            self.proxy.Disable(dbus_interface = client_interface,
378
 
                               ignore_reply=True)
 
340
            self.proxy.Set(client_interface, "Enabled", False,
 
341
                           ignore_reply = True,
 
342
                           dbus_interface = dbus.PROPERTIES_IFACE)
379
343
        elif key == "a":
380
344
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
381
345
                               dbus_interface = client_interface,
389
353
                                                  .object_path,
390
354
                                                  ignore_reply=True)
391
355
        elif key == "s":
392
 
            self.proxy.StartChecker(dbus_interface = client_interface,
393
 
                                    ignore_reply=True)
 
356
            self.proxy.Set(client_interface, "CheckerRunning",
 
357
                           dbus.Boolean(True), ignore_reply = True,
 
358
                           dbus_interface = dbus.PROPERTIES_IFACE)
394
359
        elif key == "S":
395
 
            self.proxy.StopChecker(dbus_interface = client_interface,
396
 
                                   ignore_reply=True)
 
360
            self.proxy.Set(client_interface, "CheckerRunning",
 
361
                           dbus.Boolean(False), ignore_reply = True,
 
362
                           dbus_interface = dbus.PROPERTIES_IFACE)
397
363
        elif key == "C":
398
364
            self.proxy.CheckedOK(dbus_interface = client_interface,
399
365
                                 ignore_reply=True)
407
373
        else:
408
374
            return key
409
375
    
410
 
    def property_changed(self, property=None, value=None,
411
 
                         *args, **kwargs):
412
 
        """Call self.update() if old value is not new value.
 
376
    def properties_changed(self, interface, properties, invalidated):
 
377
        """Call self.update() if any properties changed.
413
378
        This overrides the method from MandosClientPropertyCache"""
414
 
        property_name = unicode(property)
415
 
        old_value = self.properties.get(property_name)
416
 
        super(MandosClientWidget, self).property_changed(
417
 
            property=property, value=value, *args, **kwargs)
418
 
        if self.properties.get(property_name) != old_value:
 
379
        old_values = { key: self.properties.get(key)
 
380
                       for key in properties.keys() }
 
381
        super(MandosClientWidget, self).properties_changed(
 
382
            interface, properties, invalidated)
 
383
        if any(old_values[key] != self.properties.get(key)
 
384
               for key in old_values):
419
385
            self.update()
420
386
 
421
387
 
424
390
    "down" key presses, thus not allowing any containing widgets to
425
391
    use them as an excuse to shift focus away from this widget.
426
392
    """
427
 
    def keypress(self, maxcolrow, key):
428
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
393
    def keypress(self, *args, **kwargs):
 
394
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
429
395
        if ret in ("up", "down"):
430
396
            return
431
397
        return ret
435
401
    """This is the entire user interface - the whole screen
436
402
    with boxes, lists of client widgets, etc.
437
403
    """
438
 
    def __init__(self, max_log_length=1000):
 
404
    def __init__(self, max_log_length=1000, log_level=1):
439
405
        DBusGMainLoop(set_as_default=True)
440
406
        
441
407
        self.screen = urwid.curses_display.Screen()
444
410
                ("normal",
445
411
                 "default", "default", None),
446
412
                ("bold",
447
 
                 "default", "default", "bold"),
 
413
                 "bold", "default", "bold"),
448
414
                ("underline-blink",
449
 
                 "default", "default", "underline"),
 
415
                 "underline,blink", "default", "underline,blink"),
450
416
                ("standout",
451
 
                 "default", "default", "standout"),
 
417
                 "standout", "default", "standout"),
452
418
                ("bold-underline-blink",
453
 
                 "default", "default", ("bold", "underline")),
 
419
                 "bold,underline,blink", "default", "bold,underline,blink"),
454
420
                ("bold-standout",
455
 
                 "default", "default", ("bold", "standout")),
 
421
                 "bold,standout", "default", "bold,standout"),
456
422
                ("underline-blink-standout",
457
 
                 "default", "default", ("underline", "standout")),
 
423
                 "underline,blink,standout", "default",
 
424
                 "underline,blink,standout"),
458
425
                ("bold-underline-blink-standout",
459
 
                 "default", "default", ("bold", "underline",
460
 
                                          "standout")),
 
426
                 "bold,underline,blink,standout", "default",
 
427
                 "bold,underline,blink,standout"),
461
428
                ))
462
429
        
463
430
        if urwid.supports_unicode():
478
445
        self.log = []
479
446
        self.max_log_length = max_log_length
480
447
        
 
448
        self.log_level = log_level
 
449
        
481
450
        # We keep a reference to the log widget so we can remove it
482
451
        # from the ListWalker without it getting destroyed
483
452
        self.logbox = ConstrainedListBox(self.log)
494
463
                              "q: Quit  ?: Help"))
495
464
        
496
465
        self.busname = domain + '.Mandos'
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)
 
466
        self.main_loop = GLib.MainLoop()
540
467
    
541
468
    def client_not_found(self, fingerprint, address):
542
 
        self.log_message(("Client with address %s and fingerprint %s"
543
 
                          " could not be found" % (address,
544
 
                                                    fingerprint)))
 
469
        self.log_message("Client with address {} and fingerprint {}"
 
470
                         " could not be found"
 
471
                         .format(address, fingerprint))
545
472
    
546
473
    def rebuild(self):
547
474
        """This rebuilds the User Interface.
557
484
                                                     self.divider)))
558
485
        if self.log_visible:
559
486
            self.uilist.append(self.logbox)
560
 
            pass
561
487
        self.topwidget = urwid.Pile(self.uilist)
562
488
    
563
 
    def log_message(self, message):
 
489
    def log_message(self, message, level=1):
 
490
        """Log message formatted with timestamp"""
 
491
        if level < self.log_level:
 
492
            return
564
493
        timestamp = datetime.datetime.now().isoformat()
565
 
        self.log_message_raw(timestamp + ": " + message)
 
494
        self.log_message_raw("{}: {}".format(timestamp, message),
 
495
                             level=level)
566
496
    
567
 
    def log_message_raw(self, markup):
 
497
    def log_message_raw(self, markup, level=1):
568
498
        """Add a log message to the log buffer."""
 
499
        if level < self.log_level:
 
500
            return
569
501
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
570
502
        if (self.max_log_length
571
503
            and len(self.log) > self.max_log_length):
578
510
        """Toggle visibility of the log buffer."""
579
511
        self.log_visible = not self.log_visible
580
512
        self.rebuild()
581
 
        #self.log_message("Log visibility changed to: "
582
 
        #                 + unicode(self.log_visible))
 
513
        self.log_message("Log visibility changed to: {}"
 
514
                         .format(self.log_visible), level=0)
583
515
    
584
516
    def change_log_display(self):
585
517
        """Change type of log display.
590
522
            self.log_wrap = "clip"
591
523
        for textwidget in self.log:
592
524
            textwidget.set_wrap_mode(self.log_wrap)
593
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
525
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
526
                         level=0)
594
527
    
595
 
    def find_and_remove_client(self, path, name):
 
528
    def find_and_remove_client(self, path, interfaces):
596
529
        """Find a client by its object path and remove it.
597
530
        
598
 
        This is connected to the ClientRemoved signal from the
 
531
        This is connected to the InterfacesRemoved signal from the
599
532
        Mandos server object."""
 
533
        if client_interface not in interfaces:
 
534
            # Not a Mandos client object; ignore
 
535
            return
600
536
        try:
601
537
            client = self.clients_dict[path]
602
538
        except KeyError:
603
539
            # not found?
604
 
            self.log_message("Unknown client %r (%r) removed", name,
605
 
                             path)
 
540
            self.log_message("Unknown client {!r} removed"
 
541
                             .format(path))
606
542
            return
607
543
        client.delete()
608
544
    
609
 
    def add_new_client(self, path):
 
545
    def add_new_client(self, path, ifs_and_props):
 
546
        """Find a client by its object path and remove it.
 
547
        
 
548
        This is connected to the InterfacesAdded signal from the
 
549
        Mandos server object.
 
550
        """
 
551
        if client_interface not in ifs_and_props:
 
552
            # Not a Mandos client object; ignore
 
553
            return
610
554
        client_proxy_object = self.bus.get_object(self.busname, path)
611
555
        self.add_client(MandosClientWidget(server_proxy_object
612
556
                                           =self.mandos_serv,
617
561
                                           delete_hook
618
562
                                           =self.remove_client,
619
563
                                           logger
620
 
                                           =self.log_message),
 
564
                                           =self.log_message,
 
565
                                           properties
 
566
                                           = dict(ifs_and_props[
 
567
                                               client_interface])),
621
568
                        path=path)
622
569
    
623
570
    def add_client(self, client, path=None):
625
572
        if path is None:
626
573
            path = client.proxy.object_path
627
574
        self.clients_dict[path] = client
628
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
575
        self.clients.sort(key=lambda c: c.properties["Name"])
629
576
        self.refresh()
630
577
    
631
578
    def remove_client(self, client, path=None):
633
580
        if path is None:
634
581
            path = client.proxy.object_path
635
582
        del self.clients_dict[path]
636
 
        if not self.clients_dict:
637
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
638
 
            # is completely emptied, we need to recreate it.
639
 
            self.clients = urwid.SimpleListWalker([])
640
 
            self.rebuild()
641
583
        self.refresh()
642
584
    
643
585
    def refresh(self):
647
589
    
648
590
    def run(self):
649
591
        """Start the main loop and exit when it's done."""
 
592
        self.bus = dbus.SystemBus()
 
593
        mandos_dbus_objc = self.bus.get_object(
 
594
            self.busname, "/", follow_name_owner_changes=True)
 
595
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
596
                                          dbus_interface
 
597
                                          = server_interface)
 
598
        try:
 
599
            mandos_clients = (self.mandos_serv
 
600
                              .GetAllClientsWithProperties())
 
601
            if not mandos_clients:
 
602
                self.log_message_raw(("bold", "Note: Server has no clients."))
 
603
        except dbus.exceptions.DBusException:
 
604
            self.log_message_raw(("bold", "Note: No Mandos server running."))
 
605
            mandos_clients = dbus.Dictionary()
 
606
        
 
607
        (self.mandos_serv
 
608
         .connect_to_signal("InterfacesRemoved",
 
609
                            self.find_and_remove_client,
 
610
                            dbus_interface
 
611
                            = dbus.OBJECT_MANAGER_IFACE,
 
612
                            byte_arrays=True))
 
613
        (self.mandos_serv
 
614
         .connect_to_signal("InterfacesAdded",
 
615
                            self.add_new_client,
 
616
                            dbus_interface
 
617
                            = dbus.OBJECT_MANAGER_IFACE,
 
618
                            byte_arrays=True))
 
619
        (self.mandos_serv
 
620
         .connect_to_signal("ClientNotFound",
 
621
                            self.client_not_found,
 
622
                            dbus_interface=server_interface,
 
623
                            byte_arrays=True))
 
624
        for path, client in mandos_clients.items():
 
625
            client_proxy_object = self.bus.get_object(self.busname,
 
626
                                                      path)
 
627
            self.add_client(MandosClientWidget(server_proxy_object
 
628
                                               =self.mandos_serv,
 
629
                                               proxy_object
 
630
                                               =client_proxy_object,
 
631
                                               properties=client,
 
632
                                               update_hook
 
633
                                               =self.refresh,
 
634
                                               delete_hook
 
635
                                               =self.remove_client,
 
636
                                               logger
 
637
                                               =self.log_message),
 
638
                            path=path)
 
639
        
650
640
        self.refresh()
651
 
        self._input_callback_tag = (gobject.io_add_watch
 
641
        self._input_callback_tag = (GLib.io_add_watch
652
642
                                    (sys.stdin.fileno(),
653
 
                                     gobject.IO_IN,
 
643
                                     GLib.IO_IN,
654
644
                                     self.process_input))
655
645
        self.main_loop.run()
656
646
        # Main loop has finished, we should close everything now
657
 
        gobject.source_remove(self._input_callback_tag)
 
647
        GLib.source_remove(self._input_callback_tag)
658
648
        self.screen.stop()
659
649
    
660
650
    def stop(self):
684
674
            elif key == "window resize":
685
675
                self.size = self.screen.get_cols_rows()
686
676
                self.refresh()
687
 
            elif key == "\f":  # Ctrl-L
 
677
            elif key == "ctrl l":
 
678
                self.screen.clear()
688
679
                self.refresh()
689
680
            elif key == "l" or key == "D":
690
681
                self.toggle_log_display()
702
693
                                            "?: Help",
703
694
                                            "l: Log window toggle",
704
695
                                            "TAB: Switch window",
705
 
                                            "w: Wrap (log)"))))
 
696
                                            "w: Wrap (log lines)",
 
697
                                            "v: Toggle verbose log",
 
698
                                            ))))
706
699
                self.log_message_raw(("bold",
707
700
                                      "  "
708
701
                                      .join(("Clients:",
721
714
                else:
722
715
                    self.topwidget.set_focus(self.logbox)
723
716
                self.refresh()
 
717
            elif key == "v":
 
718
                if self.log_level == 0:
 
719
                    self.log_level = 1
 
720
                    self.log_message("Verbose mode: Off")
 
721
                else:
 
722
                    self.log_level = 0
 
723
                    self.log_message("Verbose mode: On")
724
724
            #elif (key == "end" or key == "meta >" or key == "G"
725
725
            #      or key == ">"):
726
726
            #    pass            # xxx end-of-buffer
749
749
    ui.run()
750
750
except KeyboardInterrupt:
751
751
    ui.screen.stop()
752
 
except Exception, e:
753
 
    ui.log_message(unicode(e))
 
752
except Exception as e:
 
753
    ui.log_message(str(e))
754
754
    ui.screen.stop()
755
755
    raise