41
15
from dbus.mainloop.glib import DBusGMainLoop
 
42
 
from gi.repository import GLib
 
 
24
locale.setlocale(locale.LC_ALL, u'')
 
50
 
if sys.version_info.major == 2:
 
53
 
locale.setlocale(locale.LC_ALL, '')
 
55
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
57
29
# Some useful constants
 
58
 
domain = 'se.recompile'
 
 
30
domain = 'se.bsnet.fukt'
 
59
31
server_interface = domain + '.Mandos'
 
60
32
client_interface = domain + '.Mandos.Client'
 
64
 
    dbus.OBJECT_MANAGER_IFACE
 
65
 
except AttributeError:
 
66
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
 
69
 
def isoformat_to_datetime(iso):
 
70
 
    "Parse an ISO 8601 date string to a datetime.datetime()"
 
73
 
    d, t = iso.split("T", 1)
 
74
 
    year, month, day = d.split("-", 2)
 
75
 
    hour, minute, second = t.split(":", 2)
 
76
 
    second, fraction = divmod(float(second), 1)
 
77
 
    return datetime.datetime(int(year),
 
82
 
                             int(second),            # Whole seconds
 
83
 
                             int(fraction*1000000))  # Microseconds
 
 
35
# Always run in monochrome mode
 
 
36
urwid.curses_display.curses.has_colors = lambda : False
 
 
38
# Urwid doesn't support blinking, but we want it.  Since we have no
 
 
39
# use for underline on its own, we make underline also always blink.
 
 
40
urwid.curses_display.curses.A_UNDERLINE |= (
 
 
41
    urwid.curses_display.curses.A_BLINK)
 
86
43
class MandosClientPropertyCache(object):
 
87
44
    """This wraps a Mandos Client D-Bus proxy object, caches the
 
88
45
    properties and calls a hook function when any of them are
 
91
 
    def __init__(self, proxy_object=None, properties=None, **kwargs):
 
92
 
        self.proxy = proxy_object  # Mandos Client proxy object
 
93
 
        self.properties = dict() if properties is None else properties
 
94
 
        self.property_changed_match = (
 
95
 
            self.proxy.connect_to_signal("PropertiesChanged",
 
96
 
                                         self.properties_changed,
 
97
 
                                         dbus.PROPERTIES_IFACE,
 
100
 
        if properties is None:
 
101
 
            self.properties.update(self.proxy.GetAll(
 
103
 
                dbus_interface=dbus.PROPERTIES_IFACE))
 
105
 
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
107
 
    def properties_changed(self, interface, properties, invalidated):
 
108
 
        """This is called whenever we get a PropertiesChanged signal
 
109
 
        It updates the changed properties in the "properties" dict.
 
 
48
    def __init__(self, proxy_object=None, *args, **kwargs):
 
 
49
        self.proxy = proxy_object # Mandos Client proxy object
 
 
51
        self.properties = dict()
 
 
52
        self.proxy.connect_to_signal(u"PropertyChanged",
 
 
53
                                     self.property_changed,
 
 
57
        self.properties.update(
 
 
58
            self.proxy.GetAll(client_interface,
 
 
59
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
 
61
        #XXX This break good super behaviour!
 
 
62
#        super(MandosClientPropertyCache, self).__init__(
 
 
65
    def property_changed(self, property=None, value=None):
 
 
66
        """This is called whenever we get a PropertyChanged signal
 
 
67
        It updates the changed property in the "properties" dict.
 
111
69
        # Update properties dict with new value
 
112
 
        if interface == client_interface:
 
113
 
            self.properties.update(properties)
 
116
 
        self.property_changed_match.remove()
 
 
70
        self.properties[property] = value
 
119
73
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
 
120
74
    """A Mandos Client which is visible on the screen.
 
123
77
    def __init__(self, server_proxy_object=None, update_hook=None,
 
124
 
                 delete_hook=None, logger=None, **kwargs):
 
 
78
                 delete_hook=None, logger=None, *args, **kwargs):
 
125
79
        # Called on update
 
126
80
        self.update_hook = update_hook
 
127
81
        # Called on delete
 
 
130
84
        self.server_proxy_object = server_proxy_object
 
132
86
        self.logger = logger
 
134
 
        self._update_timer_callback_tag = None
 
136
88
        # The widget shown normally
 
137
 
        self._text_widget = urwid.Text("")
 
 
89
        self._text_widget = urwid.Text(u"")
 
138
90
        # The widget shown when we have focus
 
139
 
        self._focus_text_widget = urwid.Text("")
 
140
 
        super(MandosClientWidget, self).__init__(**kwargs)
 
 
91
        self._focus_text_widget = urwid.Text(u"")
 
 
92
        super(MandosClientWidget, self).__init__(
 
 
93
            update_hook=update_hook, delete_hook=delete_hook,
 
142
96
        self.opened = False
 
144
 
        self.match_objects = (
 
145
 
            self.proxy.connect_to_signal("CheckerCompleted",
 
146
 
                                         self.checker_completed,
 
149
 
            self.proxy.connect_to_signal("CheckerStarted",
 
150
 
                                         self.checker_started,
 
153
 
            self.proxy.connect_to_signal("GotSecret",
 
157
 
            self.proxy.connect_to_signal("NeedApproval",
 
161
 
            self.proxy.connect_to_signal("Rejected",
 
165
 
        self.logger('Created client {}'
 
166
 
                    .format(self.properties["Name"]), level=0)
 
168
 
    def using_timer(self, flag):
 
169
 
        """Call this method with True or False when timer should be
 
170
 
        activated or deactivated.
 
172
 
        if flag and self._update_timer_callback_tag is None:
 
173
 
            # Will update the shown timer value every second
 
174
 
            self._update_timer_callback_tag = (GLib.timeout_add
 
177
 
        elif not (flag or self._update_timer_callback_tag is None):
 
178
 
            GLib.source_remove(self._update_timer_callback_tag)
 
179
 
            self._update_timer_callback_tag = None
 
 
97
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
 
98
                                     self.checker_completed,
 
 
101
        self.proxy.connect_to_signal(u"CheckerStarted",
 
 
102
                                     self.checker_started,
 
 
105
        self.proxy.connect_to_signal(u"GotSecret",
 
 
109
        self.proxy.connect_to_signal(u"NeedApproval",
 
 
113
        self.proxy.connect_to_signal(u"Rejected",
 
181
118
    def checker_completed(self, exitstatus, condition, command):
 
182
119
        if exitstatus == 0:
 
183
 
            self.logger('Checker for client {} (command "{}")'
 
184
 
                        ' succeeded'.format(self.properties["Name"],
 
 
120
            #self.logger(u'Checker for client %s (command "%s")'
 
 
122
            #            % (self.properties[u"name"], command))
 
189
124
        if os.WIFEXITED(condition):
 
190
 
            self.logger('Checker for client {} (command "{}") failed'
 
192
 
                        .format(self.properties["Name"], command,
 
193
 
                                os.WEXITSTATUS(condition)))
 
194
 
        elif os.WIFSIGNALED(condition):
 
195
 
            self.logger('Checker for client {} (command "{}") was'
 
196
 
                        ' killed by signal {}'
 
197
 
                        .format(self.properties["Name"], command,
 
198
 
                                os.WTERMSIG(condition)))
 
 
125
            self.logger(u'Checker for client %s (command "%s")'
 
 
126
                        u' failed with exit code %s'
 
 
127
                        % (self.properties[u"name"], command,
 
 
128
                           os.WEXITSTATUS(condition)))
 
 
130
        if os.WIFSIGNALED(condition):
 
 
131
            self.logger(u'Checker for client %s (command "%s")'
 
 
132
                        u' was killed by signal %s'
 
 
133
                        % (self.properties[u"name"], command,
 
 
134
                           os.WTERMSIG(condition)))
 
 
136
        if os.WCOREDUMP(condition):
 
 
137
            self.logger(u'Checker for client %s (command "%s")'
 
 
139
                        % (self.properties[u"name"], command))
 
 
140
        self.logger(u'Checker for client %s completed mysteriously')
 
201
142
    def checker_started(self, command):
 
202
 
        """Server signals that a checker started."""
 
203
 
        self.logger('Client {} started checker "{}"'
 
204
 
                    .format(self.properties["Name"],
 
 
143
        #self.logger(u'Client %s started checker "%s"'
 
 
144
        #            % (self.properties[u"name"], unicode(command)))
 
207
147
    def got_secret(self):
 
208
 
        self.logger('Client {} received its secret'
 
209
 
                    .format(self.properties["Name"]))
 
 
148
        self.logger(u'Client %s received its secret'
 
 
149
                    % self.properties[u"name"])
 
211
151
    def need_approval(self, timeout, default):
 
213
 
            message = 'Client {} needs approval within {} seconds'
 
 
153
            message = u'Client %s needs approval within %s seconds'
 
215
 
            message = 'Client {} will get its secret in {} seconds'
 
216
 
        self.logger(message.format(self.properties["Name"],
 
 
155
            message = u'Client %s will get its secret in %s seconds'
 
 
157
                    % (self.properties[u"name"], timeout/1000))
 
219
159
    def rejected(self, reason):
 
220
 
        self.logger('Client {} was rejected; reason: {}'
 
221
 
                    .format(self.properties["Name"], reason))
 
 
160
        self.logger(u'Client %s was rejected; reason: %s'
 
 
161
                    % (self.properties[u"name"], reason))
 
223
163
    def selectable(self):
 
224
164
        """Make this a "selectable" widget.
 
225
165
        This overrides the method from urwid.FlowWidget."""
 
228
 
    def rows(self, maxcolrow, focus=False):
 
 
168
    def rows(self, (maxcol,), focus=False):
 
229
169
        """How many rows this widget will occupy might depend on
 
230
170
        whether we have focus or not.
 
231
171
        This overrides the method from urwid.FlowWidget"""
 
232
 
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
 
 
172
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
234
174
    def current_widget(self, focus=False):
 
235
175
        if focus or self.opened:
 
236
176
            return self._focus_widget
 
237
177
        return self._widget
 
239
179
    def update(self):
 
240
180
        "Called when what is visible on the screen should be updated."
 
241
181
        # How to add standout mode to a style
 
242
 
        with_standout = {"normal": "standout",
 
243
 
                         "bold": "bold-standout",
 
245
 
                         "underline-blink-standout",
 
246
 
                         "bold-underline-blink":
 
247
 
                         "bold-underline-blink-standout",
 
 
182
        with_standout = { u"normal": u"standout",
 
 
183
                          u"bold": u"bold-standout",
 
 
185
                              u"underline-blink-standout",
 
 
186
                          u"bold-underline-blink":
 
 
187
                              u"bold-underline-blink-standout",
 
250
190
        # Rebuild focus and non-focus widgets using current properties
 
252
192
        # Base part of a client. Name!
 
253
 
        base = '{name}: '.format(name=self.properties["Name"])
 
254
 
        if not self.properties["Enabled"]:
 
256
 
            self.using_timer(False)
 
257
 
        elif self.properties["ApprovalPending"]:
 
258
 
            timeout = datetime.timedelta(
 
259
 
                milliseconds=self.properties["ApprovalDelay"])
 
260
 
            last_approval_request = isoformat_to_datetime(
 
261
 
                self.properties["LastApprovalRequest"])
 
262
 
            if last_approval_request is not None:
 
263
 
                timer = max(timeout - (datetime.datetime.utcnow()
 
264
 
                                       - last_approval_request),
 
265
 
                            datetime.timedelta())
 
267
 
                timer = datetime.timedelta()
 
268
 
            if self.properties["ApprovedByDefault"]:
 
269
 
                message = "Approval in {}. (d)eny?"
 
271
 
                message = "Denial in {}. (a)pprove?"
 
272
 
            message = message.format(str(timer).rsplit(".", 1)[0])
 
273
 
            self.using_timer(True)
 
274
 
        elif self.properties["LastCheckerStatus"] != 0:
 
275
 
            # When checker has failed, show timer until client expires
 
276
 
            expires = self.properties["Expires"]
 
278
 
                timer = datetime.timedelta(0)
 
280
 
                expires = (datetime.datetime.strptime
 
281
 
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
282
 
                timer = max(expires - datetime.datetime.utcnow(),
 
283
 
                            datetime.timedelta())
 
284
 
            message = ('A checker has failed! Time until client'
 
286
 
                       .format(str(timer).rsplit(".", 1)[0]))
 
287
 
            self.using_timer(True)
 
 
193
        self._text = (u'%(name)s: '
 
 
194
                      % {u"name": self.properties[u"name"]})
 
 
196
        if self.properties[u"approved_pending"]:
 
 
197
            if self.properties[u"approved_by_default"]:
 
 
198
                self._text += u"Connection established to client. (d)eny?"
 
 
200
                self._text += u"Seeks approval to send secret. (a)pprove?"
 
290
 
            self.using_timer(False)
 
291
 
        self._text = "{}{}".format(base, message)
 
 
202
            self._text += (u'%(enabled)s'
 
 
205
                                if self.properties[u"enabled"]
 
293
207
        if not urwid.supports_unicode():
 
294
208
            self._text = self._text.encode("ascii", "replace")
 
295
 
        textlist = [("normal", self._text)]
 
 
209
        textlist = [(u"normal", self._text)]
 
296
210
        self._text_widget.set_text(textlist)
 
297
211
        self._focus_text_widget.set_text([(with_standout[text[0]],
 
 
305
219
        # Run update hook, if any
 
306
220
        if self.update_hook is not None:
 
307
221
            self.update_hook()
 
309
 
    def update_timer(self):
 
310
 
        """called by GLib. Will indefinitely loop until
 
311
 
        GLib.source_remove() on tag is called
 
314
 
        return True             # Keep calling this
 
316
 
    def delete(self, **kwargs):
 
317
 
        if self._update_timer_callback_tag is not None:
 
318
 
            GLib.source_remove(self._update_timer_callback_tag)
 
319
 
            self._update_timer_callback_tag = None
 
320
 
        for match in self.match_objects:
 
322
 
        self.match_objects = ()
 
323
224
        if self.delete_hook is not None:
 
324
225
            self.delete_hook(self)
 
325
 
        return super(MandosClientWidget, self).delete(**kwargs)
 
327
 
    def render(self, maxcolrow, focus=False):
 
 
227
    def render(self, (maxcol,), focus=False):
 
328
228
        """Render differently if we have focus.
 
329
229
        This overrides the method from urwid.FlowWidget"""
 
330
 
        return self.current_widget(focus).render(maxcolrow,
 
 
230
        return self.current_widget(focus).render((maxcol,),
 
333
 
    def keypress(self, maxcolrow, key):
 
 
233
    def keypress(self, (maxcol,), key):
 
335
235
        This overrides the method from urwid.FlowWidget"""
 
337
 
            self.proxy.Set(client_interface, "Enabled",
 
338
 
                           dbus.Boolean(True), ignore_reply=True,
 
339
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
341
 
            self.proxy.Set(client_interface, "Enabled", False,
 
343
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
 
237
            self.proxy.Enable(dbus_interface = client_interface)
 
 
239
            self.proxy.Disable(dbus_interface = client_interface)
 
345
241
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
346
 
                               dbus_interface=client_interface,
 
 
242
                               dbus_interface = client_interface)
 
349
244
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
350
 
                               dbus_interface=client_interface,
 
352
 
        elif key == "R" or key == "_" or key == "ctrl k":
 
 
245
                                  dbus_interface = client_interface)
 
 
246
        elif key == u"r" or key == u"_" or key == u"ctrl k":
 
353
247
            self.server_proxy_object.RemoveClient(self.proxy
 
357
 
            self.proxy.Set(client_interface, "CheckerRunning",
 
358
 
                           dbus.Boolean(True), ignore_reply=True,
 
359
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
361
 
            self.proxy.Set(client_interface, "CheckerRunning",
 
362
 
                           dbus.Boolean(False), ignore_reply=True,
 
363
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
365
 
            self.proxy.CheckedOK(dbus_interface=client_interface,
 
 
250
            self.proxy.StartChecker(dbus_interface = client_interface)
 
 
252
            self.proxy.StopChecker(dbus_interface = client_interface)
 
 
254
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
368
 
#         elif key == "p" or key == "=":
 
 
256
#         elif key == u"p" or key == "=":
 
369
257
#             self.proxy.pause()
 
370
 
#         elif key == "u" or key == ":":
 
 
258
#         elif key == u"u" or key == ":":
 
371
259
#             self.proxy.unpause()
 
 
260
#         elif key == u"RET":
 
 
263
#            self.proxy.Approve(True)
 
 
265
#            self.proxy.Approve(False)
 
377
 
    def properties_changed(self, interface, properties, invalidated):
 
378
 
        """Call self.update() if any properties changed.
 
 
269
    def property_changed(self, property=None, value=None,
 
 
271
        """Call self.update() if old value is not new value.
 
379
272
        This overrides the method from MandosClientPropertyCache"""
 
380
 
        old_values = {key: self.properties.get(key)
 
381
 
                      for key in properties.keys()}
 
382
 
        super(MandosClientWidget, self).properties_changed(
 
383
 
            interface, properties, invalidated)
 
384
 
        if any(old_values[key] != self.properties.get(key)
 
385
 
               for key in old_values):
 
 
273
        property_name = unicode(property)
 
 
274
        old_value = self.properties.get(property_name)
 
 
275
        super(MandosClientWidget, self).property_changed(
 
 
276
            property=property, value=value, *args, **kwargs)
 
 
277
        if self.properties.get(property_name) != old_value:
 
 
403
294
    """This is the entire user interface - the whole screen
 
404
295
    with boxes, lists of client widgets, etc.
 
406
 
    def __init__(self, max_log_length=1000, log_level=1):
 
 
297
    def __init__(self, max_log_length=1000):
 
407
298
        DBusGMainLoop(set_as_default=True)
 
409
300
        self.screen = urwid.curses_display.Screen()
 
411
302
        self.screen.register_palette((
 
413
 
                 "default", "default", None),
 
415
 
                 "bold", "default", "bold"),
 
417
 
                 "underline,blink", "default", "underline,blink"),
 
419
 
                 "standout", "default", "standout"),
 
420
 
                ("bold-underline-blink",
 
421
 
                 "bold,underline,blink", "default",
 
422
 
                 "bold,underline,blink"),
 
424
 
                 "bold,standout", "default", "bold,standout"),
 
425
 
                ("underline-blink-standout",
 
426
 
                 "underline,blink,standout", "default",
 
427
 
                 "underline,blink,standout"),
 
428
 
                ("bold-underline-blink-standout",
 
429
 
                 "bold,underline,blink,standout", "default",
 
430
 
                 "bold,underline,blink,standout"),
 
 
304
                 u"default", u"default", None),
 
 
306
                 u"default", u"default", u"bold"),
 
 
308
                 u"default", u"default", u"underline"),
 
 
310
                 u"default", u"default", u"standout"),
 
 
311
                (u"bold-underline-blink",
 
 
312
                 u"default", u"default", (u"bold", u"underline")),
 
 
314
                 u"default", u"default", (u"bold", u"standout")),
 
 
315
                (u"underline-blink-standout",
 
 
316
                 u"default", u"default", (u"underline", u"standout")),
 
 
317
                (u"bold-underline-blink-standout",
 
 
318
                 u"default", u"default", (u"bold", u"underline",
 
433
322
        if urwid.supports_unicode():
 
434
 
            self.divider = "─"  # \u2500
 
 
323
            self.divider = u"─" # \u2500
 
 
324
            #self.divider = u"━" # \u2501
 
436
 
            self.divider = "_"  # \u005f
 
 
326
            #self.divider = u"-" # \u002d
 
 
327
            self.divider = u"_" # \u005f
 
438
329
        self.screen.start()
 
440
331
        self.size = self.screen.get_cols_rows()
 
442
333
        self.clients = urwid.SimpleListWalker([])
 
443
334
        self.clients_dict = {}
 
445
336
        # We will add Text widgets to this list
 
447
338
        self.max_log_length = max_log_length
 
449
 
        self.log_level = log_level
 
451
340
        # We keep a reference to the log widget so we can remove it
 
452
341
        # from the ListWalker without it getting destroyed
 
453
342
        self.logbox = ConstrainedListBox(self.log)
 
455
344
        # This keeps track of whether self.uilist currently has
 
456
345
        # self.logbox in it or not
 
457
346
        self.log_visible = True
 
458
 
        self.log_wrap = "any"
 
 
347
        self.log_wrap = u"any"
 
461
 
        self.log_message_raw(("bold",
 
462
 
                              "Mandos Monitor version " + version))
 
463
 
        self.log_message_raw(("bold",
 
 
350
        self.log_message_raw((u"bold",
 
 
351
                              u"Mandos Monitor version " + version))
 
 
352
        self.log_message_raw((u"bold",
 
466
355
        self.busname = domain + '.Mandos'
 
467
 
        self.main_loop = GLib.MainLoop()
 
 
356
        self.main_loop = gobject.MainLoop()
 
 
357
        self.bus = dbus.SystemBus()
 
 
358
        mandos_dbus_objc = self.bus.get_object(
 
 
359
            self.busname, u"/", follow_name_owner_changes=True)
 
 
360
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
 
364
            mandos_clients = (self.mandos_serv
 
 
365
                              .GetAllClientsWithProperties())
 
 
366
        except dbus.exceptions.DBusException:
 
 
367
            mandos_clients = dbus.Dictionary()
 
 
370
         .connect_to_signal(u"ClientRemoved",
 
 
371
                            self.find_and_remove_client,
 
 
372
                            dbus_interface=server_interface,
 
 
375
         .connect_to_signal(u"ClientAdded",
 
 
377
                            dbus_interface=server_interface,
 
 
380
         .connect_to_signal(u"ClientNotFound",
 
 
381
                            self.client_not_found,
 
 
382
                            dbus_interface=server_interface,
 
 
384
        for path, client in mandos_clients.iteritems():
 
 
385
            client_proxy_object = self.bus.get_object(self.busname,
 
 
387
            self.add_client(MandosClientWidget(server_proxy_object
 
 
390
                                               =client_proxy_object,
 
469
400
    def client_not_found(self, fingerprint, address):
 
470
 
        self.log_message("Client with address {} and fingerprint {}"
 
471
 
                         " could not be found"
 
472
 
                         .format(address, fingerprint))
 
 
401
        self.log_message((u"Client with address %s and fingerprint %s"
 
 
402
                          u" could not be found" % (address,
 
474
405
    def rebuild(self):
 
475
406
        """This rebuilds the User Interface.
 
476
407
        Call this when the widget layout needs to change"""
 
478
 
        # self.uilist.append(urwid.ListBox(self.clients))
 
479
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
481
 
                                       # header=urwid.Divider(),
 
 
409
        #self.uilist.append(urwid.ListBox(self.clients))
 
 
410
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
 
411
                                       #header=urwid.Divider(),
 
483
 
                                       footer=urwid.Divider(
 
484
 
                                           div_char=self.divider)))
 
 
413
                                       footer=urwid.Divider(div_char=self.divider)))
 
485
414
        if self.log_visible:
 
486
415
            self.uilist.append(self.logbox)
 
487
417
        self.topwidget = urwid.Pile(self.uilist)
 
489
 
    def log_message(self, message, level=1):
 
490
 
        """Log message formatted with timestamp"""
 
491
 
        if level < self.log_level:
 
 
419
    def log_message(self, message):
 
493
420
        timestamp = datetime.datetime.now().isoformat()
 
494
 
        self.log_message_raw("{}: {}".format(timestamp, message),
 
497
 
    def log_message_raw(self, markup, level=1):
 
 
421
        self.log_message_raw(timestamp + u": " + message)
 
 
423
    def log_message_raw(self, markup):
 
498
424
        """Add a log message to the log buffer."""
 
499
 
        if level < self.log_level:
 
501
425
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
 
502
 
        if self.max_log_length:
 
503
 
            if len(self.log) > self.max_log_length:
 
504
 
                del self.log[0:len(self.log)-self.max_log_length-1]
 
 
426
        if (self.max_log_length
 
 
427
            and len(self.log) > self.max_log_length):
 
 
428
            del self.log[0:len(self.log)-self.max_log_length-1]
 
505
429
        self.logbox.set_focus(len(self.logbox.body.contents),
 
 
430
                              coming_from=u"above")
 
509
433
    def toggle_log_display(self):
 
510
434
        """Toggle visibility of the log buffer."""
 
511
435
        self.log_visible = not self.log_visible
 
513
 
        self.log_message("Log visibility changed to: {}"
 
514
 
                         .format(self.log_visible), level=0)
 
 
437
        self.log_message(u"Log visibility changed to: "
 
 
438
                         + unicode(self.log_visible))
 
516
440
    def change_log_display(self):
 
517
441
        """Change type of log display.
 
518
442
        Currently, this toggles wrapping of text lines."""
 
519
 
        if self.log_wrap == "clip":
 
520
 
            self.log_wrap = "any"
 
 
443
        if self.log_wrap == u"clip":
 
 
444
            self.log_wrap = u"any"
 
522
 
            self.log_wrap = "clip"
 
 
446
            self.log_wrap = u"clip"
 
523
447
        for textwidget in self.log:
 
524
448
            textwidget.set_wrap_mode(self.log_wrap)
 
525
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
528
 
    def find_and_remove_client(self, path, interfaces):
 
529
 
        """Find a client by its object path and remove it.
 
531
 
        This is connected to the InterfacesRemoved signal from the
 
 
449
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
 
451
    def find_and_remove_client(self, path, name):
 
 
452
        """Find an client from its object path and remove it.
 
 
454
        This is connected to the ClientRemoved signal from the
 
532
455
        Mandos server object."""
 
533
 
        if client_interface not in interfaces:
 
534
 
            # Not a Mandos client object; ignore
 
537
457
            client = self.clients_dict[path]
 
540
 
            self.log_message("Unknown client {!r} removed"
 
545
 
    def add_new_client(self, path, ifs_and_props):
 
546
 
        """Find a client by its object path and remove it.
 
548
 
        This is connected to the InterfacesAdded signal from the
 
549
 
        Mandos server object.
 
551
 
        if client_interface not in ifs_and_props:
 
552
 
            # Not a Mandos client object; ignore
 
 
461
        self.remove_client(client, path)
 
 
463
    def add_new_client(self, path):
 
554
464
        client_proxy_object = self.bus.get_object(self.busname, path)
 
555
 
        self.add_client(MandosClientWidget(
 
556
 
            server_proxy_object=self.mandos_serv,
 
557
 
            proxy_object=client_proxy_object,
 
558
 
            update_hook=self.refresh,
 
559
 
            delete_hook=self.remove_client,
 
560
 
            logger=self.log_message,
 
561
 
            properties=dict(ifs_and_props[client_interface])),
 
 
465
        self.add_client(MandosClientWidget(server_proxy_object
 
 
468
                                           =client_proxy_object,
 
564
477
    def add_client(self, client, path=None):
 
565
478
        self.clients.append(client)
 
567
480
            path = client.proxy.object_path
 
568
481
        self.clients_dict[path] = client
 
569
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
 
482
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
572
485
    def remove_client(self, client, path=None):
 
573
486
        self.clients.remove(client)
 
575
488
            path = client.proxy.object_path
 
576
489
        del self.clients_dict[path]
 
 
490
        if not self.clients_dict:
 
 
491
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
 
492
            # is completely emptied, we need to recreate it.
 
 
493
            self.clients = urwid.SimpleListWalker([])
 
579
497
    def refresh(self):
 
580
498
        """Redraw the screen"""
 
581
499
        canvas = self.topwidget.render(self.size, focus=True)
 
582
500
        self.screen.draw_screen(self.size, canvas)
 
585
503
        """Start the main loop and exit when it's done."""
 
586
 
        self.bus = dbus.SystemBus()
 
587
 
        mandos_dbus_objc = self.bus.get_object(
 
588
 
            self.busname, "/", follow_name_owner_changes=True)
 
589
 
        self.mandos_serv = dbus.Interface(
 
590
 
            mandos_dbus_objc, dbus_interface=server_interface)
 
592
 
            mandos_clients = (self.mandos_serv
 
593
 
                              .GetAllClientsWithProperties())
 
594
 
            if not mandos_clients:
 
595
 
                self.log_message_raw(("bold",
 
596
 
                                      "Note: Server has no clients."))
 
597
 
        except dbus.exceptions.DBusException:
 
598
 
            self.log_message_raw(("bold",
 
599
 
                                  "Note: No Mandos server running."))
 
600
 
            mandos_clients = dbus.Dictionary()
 
603
 
         .connect_to_signal("InterfacesRemoved",
 
604
 
                            self.find_and_remove_client,
 
605
 
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
608
 
         .connect_to_signal("InterfacesAdded",
 
610
 
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
613
 
         .connect_to_signal("ClientNotFound",
 
614
 
                            self.client_not_found,
 
615
 
                            dbus_interface=server_interface,
 
617
 
        for path, client in mandos_clients.items():
 
618
 
            client_proxy_object = self.bus.get_object(self.busname,
 
620
 
            self.add_client(MandosClientWidget(
 
621
 
                server_proxy_object=self.mandos_serv,
 
622
 
                proxy_object=client_proxy_object,
 
624
 
                update_hook=self.refresh,
 
625
 
                delete_hook=self.remove_client,
 
626
 
                logger=self.log_message),
 
630
 
        self._input_callback_tag = (GLib.io_add_watch
 
 
505
        self._input_callback_tag = (gobject.io_add_watch
 
631
506
                                    (sys.stdin.fileno(),
 
633
508
                                     self.process_input))
 
634
509
        self.main_loop.run()
 
635
510
        # Main loop has finished, we should close everything now
 
636
 
        GLib.source_remove(self._input_callback_tag)
 
 
511
        gobject.source_remove(self._input_callback_tag)
 
637
512
        self.screen.stop()
 
640
515
        self.main_loop.quit()
 
642
517
    def process_input(self, source, condition):
 
643
518
        keys = self.screen.get_input()
 
644
 
        translations = {"ctrl n": "down",       # Emacs
 
645
 
                        "ctrl p": "up",         # Emacs
 
646
 
                        "ctrl v": "page down",  # Emacs
 
647
 
                        "meta v": "page up",    # Emacs
 
648
 
                        " ": "page down",       # less
 
649
 
                        "f": "page down",       # less
 
650
 
                        "b": "page up",         # less
 
 
519
        translations = { u"ctrl n": u"down",      # Emacs
 
 
520
                         u"ctrl p": u"up",        # Emacs
 
 
521
                         u"ctrl v": u"page down", # Emacs
 
 
522
                         u"meta v": u"page up",   # Emacs
 
 
523
                         u" ": u"page down",      # less
 
 
524
                         u"f": u"page down",      # less
 
 
525
                         u"b": u"page up",        # less
 
656
531
                key = translations[key]
 
657
532
            except KeyError:    # :-)
 
660
 
            if key == "q" or key == "Q":
 
 
535
            if key == u"q" or key == u"Q":
 
663
 
            elif key == "window resize":
 
 
538
            elif key == u"window resize":
 
664
539
                self.size = self.screen.get_cols_rows()
 
666
 
            elif key == "ctrl l":
 
 
541
            elif key == u"\f":  # Ctrl-L
 
669
 
            elif key == "l" or key == "D":
 
 
543
            elif key == u"l" or key == u"D":
 
670
544
                self.toggle_log_display()
 
672
 
            elif key == "w" or key == "i":
 
 
546
            elif key == u"w" or key == u"i":
 
673
547
                self.change_log_display()
 
675
 
            elif key == "?" or key == "f1" or key == "esc":
 
 
549
            elif key == u"?" or key == u"f1" or key == u"esc":
 
676
550
                if not self.log_visible:
 
677
551
                    self.log_visible = True
 
679
 
                self.log_message_raw(("bold",
 
683
 
                                            "l: Log window toggle",
 
684
 
                                            "TAB: Switch window",
 
685
 
                                            "w: Wrap (log lines)",
 
686
 
                                            "v: Toggle verbose log",
 
688
 
                self.log_message_raw(("bold",
 
694
 
                                             "s: Start new checker",
 
 
553
                self.log_message_raw((u"bold",
 
 
557
                                            u"l: Log window toggle",
 
 
558
                                            u"TAB: Switch window",
 
 
560
                self.log_message_raw((u"bold",
 
 
566
                                             u"s: Start new checker",
 
701
573
                if self.topwidget.get_focus() is self.logbox:
 
702
574
                    self.topwidget.set_focus(0)
 
704
576
                    self.topwidget.set_focus(self.logbox)
 
707
 
                if self.log_level == 0:
 
709
 
                    self.log_message("Verbose mode: Off")
 
712
 
                    self.log_message("Verbose mode: On")
 
713
 
            # elif (key == "end" or key == "meta >" or key == "G"
 
715
 
            #     pass            # xxx end-of-buffer
 
716
 
            # elif (key == "home" or key == "meta <" or key == "g"
 
718
 
            #     pass            # xxx beginning-of-buffer
 
719
 
            # elif key == "ctrl e" or key == "$":
 
720
 
            #     pass            # xxx move-end-of-line
 
721
 
            # elif key == "ctrl a" or key == "^":
 
722
 
            #     pass            # xxx move-beginning-of-line
 
723
 
            # elif key == "ctrl b" or key == "meta (" or key == "h":
 
725
 
            # elif key == "ctrl f" or key == "meta )" or key == "l":
 
728
 
            #     pass            # scroll up log
 
730
 
            #     pass            # scroll down log
 
 
578
            #elif (key == u"end" or key == u"meta >" or key == u"G"
 
 
580
            #    pass            # xxx end-of-buffer
 
 
581
            #elif (key == u"home" or key == u"meta <" or key == u"g"
 
 
583
            #    pass            # xxx beginning-of-buffer
 
 
584
            #elif key == u"ctrl e" or key == u"$":
 
 
585
            #    pass            # xxx move-end-of-line
 
 
586
            #elif key == u"ctrl a" or key == u"^":
 
 
587
            #    pass            # xxx move-beginning-of-line
 
 
588
            #elif key == u"ctrl b" or key == u"meta (" or key == u"h":
 
 
590
            #elif key == u"ctrl f" or key == u"meta )" or key == u"l":
 
 
593
            #    pass            # scroll up log
 
 
595
            #    pass            # scroll down log
 
731
596
            elif self.topwidget.selectable():
 
732
597
                self.topwidget.keypress(self.size, key)