/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: 2016-03-19 12:10:15 UTC
  • Revision ID: teddy@recompile.se-20160319121015-ywrw6qx3srtj2dix
Server: Debian package bug fix: Include /usr/lib/tmpfiles.d dir

The Debian package for the server needs the /usr/lib/tmpfiles.d
directory in its .dirs file in order for the directory to exist when
the Makefile "install-server" rule is run, otherwise the
tmpfiles.d-mandos.conf file will not be installed.

* debian/mandos.dirs (usr/lib/tmpfiles.d): Added.

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
 
from __future__ import division, absolute_import, print_function, unicode_literals
 
26
from __future__ import (division, absolute_import, print_function,
 
27
                        unicode_literals)
 
28
try:
 
29
    from future_builtins import *
 
30
except ImportError:
 
31
    pass
26
32
 
27
33
import sys
28
34
import os
29
 
import signal
30
35
 
31
36
import datetime
32
37
 
34
39
import urwid
35
40
 
36
41
from dbus.mainloop.glib import DBusGMainLoop
37
 
import gobject
 
42
from gi.repository import GLib
38
43
 
39
44
import dbus
40
45
 
41
 
import UserList
42
 
 
43
46
import locale
44
47
 
 
48
if sys.version_info.major == 2:
 
49
    str = unicode
 
50
 
45
51
locale.setlocale(locale.LC_ALL, '')
46
52
 
47
53
import logging
48
54
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
49
55
 
50
56
# Some useful constants
51
 
domain = 'se.bsnet.fukt'
 
57
domain = 'se.recompile'
52
58
server_interface = domain + '.Mandos'
53
59
client_interface = domain + '.Mandos.Client'
54
 
version = "1.3.0"
55
 
 
56
 
# Always run in monochrome mode
57
 
urwid.curses_display.curses.has_colors = lambda : False
58
 
 
59
 
# Urwid doesn't support blinking, but we want it.  Since we have no
60
 
# use for underline on its own, we make underline also always blink.
61
 
urwid.curses_display.curses.A_UNDERLINE |= (
62
 
    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"
63
66
 
64
67
def isoformat_to_datetime(iso):
65
68
    "Parse an ISO 8601 date string to a datetime.datetime()"
82
85
    properties and calls a hook function when any of them are
83
86
    changed.
84
87
    """
85
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
88
    def __init__(self, proxy_object=None, properties=None, **kwargs):
86
89
        self.proxy = proxy_object # Mandos Client proxy object
87
 
        
88
 
        self.properties = dict()
89
 
        self.proxy.connect_to_signal("PropertyChanged",
90
 
                                     self.property_changed,
91
 
                                     client_interface,
92
 
                                     byte_arrays=True)
93
 
        
94
 
        self.properties.update(
95
 
            self.proxy.GetAll(client_interface,
96
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
97
 
 
98
 
        #XXX This break good super behaviour!
99
 
#        super(MandosClientPropertyCache, self).__init__(
100
 
#            *args, **kwargs)
 
90
        self.properties = dict() if properties is None else properties
 
91
        self.property_changed_match = (
 
92
            self.proxy.connect_to_signal("PropertiesChanged",
 
93
                                         self.properties_changed,
 
94
                                         dbus.PROPERTIES_IFACE,
 
95
                                         byte_arrays=True))
 
96
        
 
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)
101
104
    
102
 
    def property_changed(self, property=None, value=None):
103
 
        """This is called whenever we get a PropertyChanged signal
104
 
        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.
105
108
        """
106
109
        # Update properties dict with new value
107
 
        self.properties[property] = value
 
110
        if interface == client_interface:
 
111
            self.properties.update(properties)
 
112
    
 
113
    def delete(self):
 
114
        self.property_changed_match.remove()
108
115
 
109
116
 
110
117
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
112
119
    """
113
120
    
114
121
    def __init__(self, server_proxy_object=None, update_hook=None,
115
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
122
                 delete_hook=None, logger=None, **kwargs):
116
123
        # Called on update
117
124
        self.update_hook = update_hook
118
125
        # Called on delete
123
130
        self.logger = logger
124
131
        
125
132
        self._update_timer_callback_tag = None
126
 
        self._update_timer_callback_lock = 0
127
 
        self.last_checker_failed = False
128
133
        
129
134
        # The widget shown normally
130
135
        self._text_widget = urwid.Text("")
131
136
        # The widget shown when we have focus
132
137
        self._focus_text_widget = urwid.Text("")
133
 
        super(MandosClientWidget, self).__init__(
134
 
            update_hook=update_hook, delete_hook=delete_hook,
135
 
            *args, **kwargs)
 
138
        super(MandosClientWidget, self).__init__(**kwargs)
136
139
        self.update()
137
140
        self.opened = False
138
141
        
139
 
        last_checked_ok = isoformat_to_datetime(self.properties
140
 
                                                ["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
 
        
151
 
        if self.last_checker_failed:
152
 
            self.using_timer(True)
153
 
        
154
 
        if self.need_approval:
155
 
            self.using_timer(True)
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)
 
142
        self.match_objects = (
 
143
            self.proxy.connect_to_signal("CheckerCompleted",
 
144
                                         self.checker_completed,
 
145
                                         client_interface,
 
146
                                         byte_arrays=True),
 
147
            self.proxy.connect_to_signal("CheckerStarted",
 
148
                                         self.checker_started,
 
149
                                         client_interface,
 
150
                                         byte_arrays=True),
 
151
            self.proxy.connect_to_signal("GotSecret",
 
152
                                         self.got_secret,
 
153
                                         client_interface,
 
154
                                         byte_arrays=True),
 
155
            self.proxy.connect_to_signal("NeedApproval",
 
156
                                         self.need_approval,
 
157
                                         client_interface,
 
158
                                         byte_arrays=True),
 
159
            self.proxy.connect_to_signal("Rejected",
 
160
                                         self.rejected,
 
161
                                         client_interface,
 
162
                                         byte_arrays=True))
 
163
        self.logger('Created client {}'
 
164
                    .format(self.properties["Name"]), level=0)
177
165
    
178
 
    def property_changed(self, property=None, value=None):
179
 
        super(self, MandosClientWidget).property_changed(property,
180
 
                                                         value)
181
 
        if property == "ApprovalPending":
182
 
            using_timer(bool(value))
183
 
        
184
166
    def using_timer(self, flag):
185
167
        """Call this method with True or False when timer should be
186
168
        activated or deactivated.
187
169
        """
188
 
        old = self._update_timer_callback_lock
189
 
        if flag:
190
 
            self._update_timer_callback_lock += 1
191
 
        else:
192
 
            self._update_timer_callback_lock -= 1
193
 
        if old == 0 and self._update_timer_callback_lock:
194
 
            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
195
173
                                               (1000,
196
174
                                                self.update_timer))
197
 
        elif old and self._update_timer_callback_lock == 0:
198
 
            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)
199
177
            self._update_timer_callback_tag = None
200
178
    
201
179
    def checker_completed(self, exitstatus, condition, command):
202
180
        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))
 
181
            self.logger('Checker for client {} (command "{}")'
 
182
                        ' succeeded'.format(self.properties["Name"],
 
183
                                            command), level=0)
209
184
            self.update()
210
185
            return
211
186
        # Checker failed
212
 
        if not self.last_checker_failed:
213
 
            self.last_checker_failed = True
214
 
            self.using_timer(True)
215
187
        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)))
 
188
            self.logger('Checker for client {} (command "{}") failed'
 
189
                        ' with exit code {}'
 
190
                        .format(self.properties["Name"], command,
 
191
                                os.WEXITSTATUS(condition)))
220
192
        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)))
225
 
        elif os.WCOREDUMP(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' dumped core'
228
 
                        % (self.properties["Name"], command))
229
 
        else:
230
 
            self.logger('Checker for client %s completed'
231
 
                        ' mysteriously')
 
193
            self.logger('Checker for client {} (command "{}") was'
 
194
                        ' killed by signal {}'
 
195
                        .format(self.properties["Name"], command,
 
196
                                os.WTERMSIG(condition)))
232
197
        self.update()
233
198
    
234
199
    def checker_started(self, command):
235
 
        #self.logger('Client %s started checker "%s"'
236
 
        #            % (self.properties["Name"], unicode(command)))
237
 
        pass
 
200
        """Server signals that a checker started."""
 
201
        self.logger('Client {} started checker "{}"'
 
202
                    .format(self.properties["Name"],
 
203
                            command), level=0)
238
204
    
239
205
    def got_secret(self):
240
 
        self.last_checker_failed = False
241
 
        self.logger('Client %s received its secret'
242
 
                    % self.properties["Name"])
 
206
        self.logger('Client {} received its secret'
 
207
                    .format(self.properties["Name"]))
243
208
    
244
209
    def need_approval(self, timeout, default):
245
210
        if not default:
246
 
            message = 'Client %s needs approval within %s seconds'
 
211
            message = 'Client {} needs approval within {} seconds'
247
212
        else:
248
 
            message = 'Client %s will get its secret in %s seconds'
249
 
        self.logger(message
250
 
                    % (self.properties["Name"], timeout/1000))
251
 
        self.using_timer(True)
 
213
            message = 'Client {} will get its secret in {} seconds'
 
214
        self.logger(message.format(self.properties["Name"],
 
215
                                   timeout/1000))
252
216
    
253
217
    def rejected(self, reason):
254
 
        self.logger('Client %s was rejected; reason: %s'
255
 
                    % (self.properties["Name"], reason))
 
218
        self.logger('Client {} was rejected; reason: {}'
 
219
                    .format(self.properties["Name"], reason))
256
220
    
257
221
    def selectable(self):
258
222
        """Make this a "selectable" widget.
280
244
                          "bold-underline-blink":
281
245
                              "bold-underline-blink-standout",
282
246
                          }
283
 
 
 
247
        
284
248
        # Rebuild focus and non-focus widgets using current properties
285
 
 
 
249
        
286
250
        # Base part of a client. Name!
287
 
        base = ('%(name)s: '
288
 
                      % {"name": self.properties["Name"]})
 
251
        base = '{name}: '.format(name=self.properties["Name"])
289
252
        if not self.properties["Enabled"]:
290
253
            message = "DISABLED"
 
254
            self.using_timer(False)
291
255
        elif self.properties["ApprovalPending"]:
292
256
            timeout = datetime.timedelta(milliseconds
293
257
                                         = self.properties
295
259
            last_approval_request = isoformat_to_datetime(
296
260
                self.properties["LastApprovalRequest"])
297
261
            if last_approval_request is not None:
298
 
                timer = timeout - (datetime.datetime.utcnow()
299
 
                                   - last_approval_request)
 
262
                timer = max(timeout - (datetime.datetime.utcnow()
 
263
                                       - last_approval_request),
 
264
                            datetime.timedelta())
300
265
            else:
301
266
                timer = datetime.timedelta()
302
267
            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)
 
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())
316
283
            message = ('A checker has failed! Time until client'
317
 
                       ' gets disabled: %s'
318
 
                           % unicode(timer).rsplit(".", 1)[0])
 
284
                       ' gets disabled: {}'
 
285
                       .format(str(timer).rsplit(".", 1)[0]))
 
286
            self.using_timer(True)
319
287
        else:
320
288
            message = "enabled"
321
 
        self._text = "%s%s" % (base, message)
322
 
            
 
289
            self.using_timer(False)
 
290
        self._text = "{}{}".format(base, message)
 
291
        
323
292
        if not urwid.supports_unicode():
324
293
            self._text = self._text.encode("ascii", "replace")
325
294
        textlist = [("normal", self._text)]
337
306
            self.update_hook()
338
307
    
339
308
    def update_timer(self):
340
 
        "called by gobject"
 
309
        """called by GLib. Will indefinitely loop until
 
310
        GLib.source_remove() on tag is called
 
311
        """
341
312
        self.update()
342
313
        return True             # Keep calling this
343
314
    
344
 
    def delete(self):
 
315
    def delete(self, **kwargs):
345
316
        if self._update_timer_callback_tag is not None:
346
 
            gobject.source_remove(self._update_timer_callback_tag)
 
317
            GLib.source_remove(self._update_timer_callback_tag)
347
318
            self._update_timer_callback_tag = None
 
319
        for match in self.match_objects:
 
320
            match.remove()
 
321
        self.match_objects = ()
348
322
        if self.delete_hook is not None:
349
323
            self.delete_hook(self)
 
324
        return super(MandosClientWidget, self).delete(**kwargs)
350
325
    
351
326
    def render(self, maxcolrow, focus=False):
352
327
        """Render differently if we have focus.
358
333
        """Handle keys.
359
334
        This overrides the method from urwid.FlowWidget"""
360
335
        if key == "+":
361
 
            self.proxy.Enable(dbus_interface = client_interface)
 
336
            self.proxy.Set(client_interface, "Enabled",
 
337
                           dbus.Boolean(True), ignore_reply = True,
 
338
                           dbus_interface = dbus.PROPERTIES_IFACE)
362
339
        elif key == "-":
363
 
            self.proxy.Disable(dbus_interface = client_interface)
 
340
            self.proxy.Set(client_interface, "Enabled", False,
 
341
                           ignore_reply = True,
 
342
                           dbus_interface = dbus.PROPERTIES_IFACE)
364
343
        elif key == "a":
365
344
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
 
                               dbus_interface = client_interface)
 
345
                               dbus_interface = client_interface,
 
346
                               ignore_reply=True)
367
347
        elif key == "d":
368
348
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
 
                                  dbus_interface = client_interface)
 
349
                                  dbus_interface = client_interface,
 
350
                               ignore_reply=True)
370
351
        elif key == "R" or key == "_" or key == "ctrl k":
371
352
            self.server_proxy_object.RemoveClient(self.proxy
372
 
                                                  .object_path)
 
353
                                                  .object_path,
 
354
                                                  ignore_reply=True)
373
355
        elif key == "s":
374
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
356
            self.proxy.Set(client_interface, "CheckerRunning",
 
357
                           dbus.Boolean(True), ignore_reply = True,
 
358
                           dbus_interface = dbus.PROPERTIES_IFACE)
375
359
        elif key == "S":
376
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
360
            self.proxy.Set(client_interface, "CheckerRunning",
 
361
                           dbus.Boolean(False), ignore_reply = True,
 
362
                           dbus_interface = dbus.PROPERTIES_IFACE)
377
363
        elif key == "C":
378
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
364
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
365
                                 ignore_reply=True)
379
366
        # xxx
380
367
#         elif key == "p" or key == "=":
381
368
#             self.proxy.pause()
386
373
        else:
387
374
            return key
388
375
    
389
 
    def property_changed(self, property=None, value=None,
390
 
                         *args, **kwargs):
391
 
        """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.
392
378
        This overrides the method from MandosClientPropertyCache"""
393
 
        property_name = unicode(property)
394
 
        old_value = self.properties.get(property_name)
395
 
        super(MandosClientWidget, self).property_changed(
396
 
            property=property, value=value, *args, **kwargs)
397
 
        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):
398
385
            self.update()
399
386
 
400
387
 
403
390
    "down" key presses, thus not allowing any containing widgets to
404
391
    use them as an excuse to shift focus away from this widget.
405
392
    """
406
 
    def keypress(self, maxcolrow, key):
407
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
393
    def keypress(self, *args, **kwargs):
 
394
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
408
395
        if ret in ("up", "down"):
409
396
            return
410
397
        return ret
414
401
    """This is the entire user interface - the whole screen
415
402
    with boxes, lists of client widgets, etc.
416
403
    """
417
 
    def __init__(self, max_log_length=1000):
 
404
    def __init__(self, max_log_length=1000, log_level=1):
418
405
        DBusGMainLoop(set_as_default=True)
419
406
        
420
407
        self.screen = urwid.curses_display.Screen()
423
410
                ("normal",
424
411
                 "default", "default", None),
425
412
                ("bold",
426
 
                 "default", "default", "bold"),
 
413
                 "bold", "default", "bold"),
427
414
                ("underline-blink",
428
 
                 "default", "default", "underline"),
 
415
                 "underline,blink", "default", "underline,blink"),
429
416
                ("standout",
430
 
                 "default", "default", "standout"),
 
417
                 "standout", "default", "standout"),
431
418
                ("bold-underline-blink",
432
 
                 "default", "default", ("bold", "underline")),
 
419
                 "bold,underline,blink", "default", "bold,underline,blink"),
433
420
                ("bold-standout",
434
 
                 "default", "default", ("bold", "standout")),
 
421
                 "bold,standout", "default", "bold,standout"),
435
422
                ("underline-blink-standout",
436
 
                 "default", "default", ("underline", "standout")),
 
423
                 "underline,blink,standout", "default",
 
424
                 "underline,blink,standout"),
437
425
                ("bold-underline-blink-standout",
438
 
                 "default", "default", ("bold", "underline",
439
 
                                          "standout")),
 
426
                 "bold,underline,blink,standout", "default",
 
427
                 "bold,underline,blink,standout"),
440
428
                ))
441
429
        
442
430
        if urwid.supports_unicode():
457
445
        self.log = []
458
446
        self.max_log_length = max_log_length
459
447
        
 
448
        self.log_level = log_level
 
449
        
460
450
        # We keep a reference to the log widget so we can remove it
461
451
        # from the ListWalker without it getting destroyed
462
452
        self.logbox = ConstrainedListBox(self.log)
473
463
                              "q: Quit  ?: Help"))
474
464
        
475
465
        self.busname = domain + '.Mandos'
476
 
        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)
 
466
        self.main_loop = GLib.MainLoop()
519
467
    
520
468
    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)))
 
469
        self.log_message("Client with address {} and fingerprint {}"
 
470
                         " could not be found"
 
471
                         .format(address, fingerprint))
524
472
    
525
473
    def rebuild(self):
526
474
        """This rebuilds the User Interface.
536
484
                                                     self.divider)))
537
485
        if self.log_visible:
538
486
            self.uilist.append(self.logbox)
539
 
            pass
540
487
        self.topwidget = urwid.Pile(self.uilist)
541
488
    
542
 
    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
543
493
        timestamp = datetime.datetime.now().isoformat()
544
 
        self.log_message_raw(timestamp + ": " + message)
 
494
        self.log_message_raw("{}: {}".format(timestamp, message),
 
495
                             level=level)
545
496
    
546
 
    def log_message_raw(self, markup):
 
497
    def log_message_raw(self, markup, level=1):
547
498
        """Add a log message to the log buffer."""
 
499
        if level < self.log_level:
 
500
            return
548
501
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
549
502
        if (self.max_log_length
550
503
            and len(self.log) > self.max_log_length):
557
510
        """Toggle visibility of the log buffer."""
558
511
        self.log_visible = not self.log_visible
559
512
        self.rebuild()
560
 
        #self.log_message("Log visibility changed to: "
561
 
        #                 + unicode(self.log_visible))
 
513
        self.log_message("Log visibility changed to: {}"
 
514
                         .format(self.log_visible), level=0)
562
515
    
563
516
    def change_log_display(self):
564
517
        """Change type of log display.
569
522
            self.log_wrap = "clip"
570
523
        for textwidget in self.log:
571
524
            textwidget.set_wrap_mode(self.log_wrap)
572
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
525
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
526
                         level=0)
573
527
    
574
 
    def find_and_remove_client(self, path, name):
575
 
        """Find an client from its object path and remove it.
 
528
    def find_and_remove_client(self, path, interfaces):
 
529
        """Find a client by its object path and remove it.
576
530
        
577
 
        This is connected to the ClientRemoved signal from the
 
531
        This is connected to the InterfacesRemoved signal from the
578
532
        Mandos server object."""
 
533
        if client_interface not in interfaces:
 
534
            # Not a Mandos client object; ignore
 
535
            return
579
536
        try:
580
537
            client = self.clients_dict[path]
581
538
        except KeyError:
582
539
            # not found?
 
540
            self.log_message("Unknown client {!r} removed"
 
541
                             .format(path))
583
542
            return
584
 
        self.remove_client(client, path)
 
543
        client.delete()
585
544
    
586
 
    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
587
554
        client_proxy_object = self.bus.get_object(self.busname, path)
588
555
        self.add_client(MandosClientWidget(server_proxy_object
589
556
                                           =self.mandos_serv,
594
561
                                           delete_hook
595
562
                                           =self.remove_client,
596
563
                                           logger
597
 
                                           =self.log_message),
 
564
                                           =self.log_message,
 
565
                                           properties
 
566
                                           = dict(ifs_and_props[
 
567
                                               client_interface])),
598
568
                        path=path)
599
569
    
600
570
    def add_client(self, client, path=None):
602
572
        if path is None:
603
573
            path = client.proxy.object_path
604
574
        self.clients_dict[path] = client
605
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
575
        self.clients.sort(key=lambda c: c.properties["Name"])
606
576
        self.refresh()
607
577
    
608
578
    def remove_client(self, client, path=None):
610
580
        if path is None:
611
581
            path = client.proxy.object_path
612
582
        del self.clients_dict[path]
613
 
        if not self.clients_dict:
614
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
615
 
            # is completely emptied, we need to recreate it.
616
 
            self.clients = urwid.SimpleListWalker([])
617
 
            self.rebuild()
618
583
        self.refresh()
619
584
    
620
585
    def refresh(self):
624
589
    
625
590
    def run(self):
626
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
        
627
640
        self.refresh()
628
 
        self._input_callback_tag = (gobject.io_add_watch
 
641
        self._input_callback_tag = (GLib.io_add_watch
629
642
                                    (sys.stdin.fileno(),
630
 
                                     gobject.IO_IN,
 
643
                                     GLib.IO_IN,
631
644
                                     self.process_input))
632
645
        self.main_loop.run()
633
646
        # Main loop has finished, we should close everything now
634
 
        gobject.source_remove(self._input_callback_tag)
 
647
        GLib.source_remove(self._input_callback_tag)
635
648
        self.screen.stop()
636
649
    
637
650
    def stop(self):
661
674
            elif key == "window resize":
662
675
                self.size = self.screen.get_cols_rows()
663
676
                self.refresh()
664
 
            elif key == "\f":  # Ctrl-L
 
677
            elif key == "ctrl l":
 
678
                self.screen.clear()
665
679
                self.refresh()
666
680
            elif key == "l" or key == "D":
667
681
                self.toggle_log_display()
679
693
                                            "?: Help",
680
694
                                            "l: Log window toggle",
681
695
                                            "TAB: Switch window",
682
 
                                            "w: Wrap (log)"))))
 
696
                                            "w: Wrap (log lines)",
 
697
                                            "v: Toggle verbose log",
 
698
                                            ))))
683
699
                self.log_message_raw(("bold",
684
700
                                      "  "
685
701
                                      .join(("Clients:",
698
714
                else:
699
715
                    self.topwidget.set_focus(self.logbox)
700
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")
701
724
            #elif (key == "end" or key == "meta >" or key == "G"
702
725
            #      or key == ">"):
703
726
            #    pass            # xxx end-of-buffer
726
749
    ui.run()
727
750
except KeyboardInterrupt:
728
751
    ui.screen.stop()
729
 
except Exception, e:
730
 
    ui.log_message(unicode(e))
 
752
except Exception as e:
 
753
    ui.log_message(str(e))
731
754
    ui.screen.stop()
732
755
    raise