/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-07-03 02:56:00 UTC
  • Revision ID: teddy@recompile.se-20160703025600-bn12vpzejr6zxx5v
mandos-client: Bug fix: flush stdout to detect write errors.

* plugins.d/mandos-client.c (start_mandos_communication): Do
                            fflush(stdout) to detect any write errors.

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
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
52
57
domain = 'se.recompile'
53
58
server_interface = domain + '.Mandos'
54
59
client_interface = domain + '.Mandos.Client'
55
 
version = "1.4.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.10"
 
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:
 
170
        if flag and self._update_timer_callback_tag is None:
203
171
            # Will update the shown timer value every second
204
 
            self._update_timer_callback_tag = (gobject.timeout_add
 
172
            self._update_timer_callback_tag = (GLib.timeout_add
205
173
                                               (1000,
206
174
                                                self.update_timer))
207
 
        elif old and self._update_timer_callback_lock == 0:
208
 
            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)
209
177
            self._update_timer_callback_tag = None
210
178
    
211
179
    def checker_completed(self, exitstatus, condition, command):
212
180
        if exitstatus == 0:
213
 
            if self.last_checker_failed:
214
 
                self.last_checker_failed = False
215
 
                self.using_timer(False)
216
 
            #self.logger('Checker for client %s (command "%s")'
217
 
            #            ' was successful'
218
 
            #            % (self.properties["Name"], command))
 
181
            self.logger('Checker for client {} (command "{}")'
 
182
                        ' succeeded'.format(self.properties["Name"],
 
183
                                            command), level=0)
219
184
            self.update()
220
185
            return
221
186
        # Checker failed
222
 
        if not self.last_checker_failed:
223
 
            self.last_checker_failed = True
224
 
            self.using_timer(True)
225
187
        if os.WIFEXITED(condition):
226
 
            self.logger('Checker for client %s (command "%s")'
227
 
                        ' failed with exit code %s'
228
 
                        % (self.properties["Name"], command,
229
 
                           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)))
230
192
        elif os.WIFSIGNALED(condition):
231
 
            self.logger('Checker for client %s (command "%s")'
232
 
                        ' was killed by signal %s'
233
 
                        % (self.properties["Name"], command,
234
 
                           os.WTERMSIG(condition)))
235
 
        elif os.WCOREDUMP(condition):
236
 
            self.logger('Checker for client %s (command "%s")'
237
 
                        ' dumped core'
238
 
                        % (self.properties["Name"], command))
239
 
        else:
240
 
            self.logger('Checker for client %s completed'
241
 
                        ' mysteriously')
 
193
            self.logger('Checker for client {} (command "{}") was'
 
194
                        ' killed by signal {}'
 
195
                        .format(self.properties["Name"], command,
 
196
                                os.WTERMSIG(condition)))
242
197
        self.update()
243
198
    
244
199
    def checker_started(self, command):
245
 
        #self.logger('Client %s started checker "%s"'
246
 
        #            % (self.properties["Name"], unicode(command)))
247
 
        pass
 
200
        """Server signals that a checker started."""
 
201
        self.logger('Client {} started checker "{}"'
 
202
                    .format(self.properties["Name"],
 
203
                            command), level=0)
248
204
    
249
205
    def got_secret(self):
250
 
        self.last_checker_failed = False
251
 
        self.logger('Client %s received its secret'
252
 
                    % self.properties["Name"])
 
206
        self.logger('Client {} received its secret'
 
207
                    .format(self.properties["Name"]))
253
208
    
254
209
    def need_approval(self, timeout, default):
255
210
        if not default:
256
 
            message = 'Client %s needs approval within %s seconds'
 
211
            message = 'Client {} needs approval within {} seconds'
257
212
        else:
258
 
            message = 'Client %s will get its secret in %s seconds'
259
 
        self.logger(message
260
 
                    % (self.properties["Name"], timeout/1000))
261
 
        self.using_timer(True)
 
213
            message = 'Client {} will get its secret in {} seconds'
 
214
        self.logger(message.format(self.properties["Name"],
 
215
                                   timeout/1000))
262
216
    
263
217
    def rejected(self, reason):
264
 
        self.logger('Client %s was rejected; reason: %s'
265
 
                    % (self.properties["Name"], reason))
 
218
        self.logger('Client {} was rejected; reason: {}'
 
219
                    .format(self.properties["Name"], reason))
266
220
    
267
221
    def selectable(self):
268
222
        """Make this a "selectable" widget.
290
244
                          "bold-underline-blink":
291
245
                              "bold-underline-blink-standout",
292
246
                          }
293
 
 
 
247
        
294
248
        # Rebuild focus and non-focus widgets using current properties
295
 
 
 
249
        
296
250
        # Base part of a client. Name!
297
 
        base = ('%(name)s: '
298
 
                      % {"name": self.properties["Name"]})
 
251
        base = '{name}: '.format(name=self.properties["Name"])
299
252
        if not self.properties["Enabled"]:
300
253
            message = "DISABLED"
 
254
            self.using_timer(False)
301
255
        elif self.properties["ApprovalPending"]:
302
256
            timeout = datetime.timedelta(milliseconds
303
257
                                         = self.properties
305
259
            last_approval_request = isoformat_to_datetime(
306
260
                self.properties["LastApprovalRequest"])
307
261
            if last_approval_request is not None:
308
 
                timer = timeout - (datetime.datetime.utcnow()
309
 
                                   - last_approval_request)
 
262
                timer = max(timeout - (datetime.datetime.utcnow()
 
263
                                       - last_approval_request),
 
264
                            datetime.timedelta())
310
265
            else:
311
266
                timer = datetime.timedelta()
312
267
            if self.properties["ApprovedByDefault"]:
313
 
                message = "Approval in %s. (d)eny?"
 
268
                message = "Approval in {}. (d)eny?"
314
269
            else:
315
 
                message = "Denial in %s. (a)pprove?"
316
 
            message = message % unicode(timer).rsplit(".", 1)[0]
317
 
        elif self.last_checker_failed:
318
 
            # When checker has failed, print a timer until client expires
 
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
319
275
            expires = self.properties["Expires"]
320
276
            if expires == "":
321
277
                timer = datetime.timedelta(0)
322
278
            else:
323
 
                expires = datetime.datetime.strptime(expires,
324
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
325
 
                timer = expires - datetime.datetime.utcnow()
 
279
                expires = (datetime.datetime.strptime
 
280
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
281
                timer = max(expires - datetime.datetime.utcnow(),
 
282
                            datetime.timedelta())
326
283
            message = ('A checker has failed! Time until client'
327
 
                       ' gets disabled: %s'
328
 
                           % unicode(timer).rsplit(".", 1)[0])
 
284
                       ' gets disabled: {}'
 
285
                       .format(str(timer).rsplit(".", 1)[0]))
 
286
            self.using_timer(True)
329
287
        else:
330
288
            message = "enabled"
331
 
        self._text = "%s%s" % (base, message)
332
 
            
 
289
            self.using_timer(False)
 
290
        self._text = "{}{}".format(base, message)
 
291
        
333
292
        if not urwid.supports_unicode():
334
293
            self._text = self._text.encode("ascii", "replace")
335
294
        textlist = [("normal", self._text)]
347
306
            self.update_hook()
348
307
    
349
308
    def update_timer(self):
350
 
        """called by gobject. Will indefinitely loop until
351
 
        gobject.source_remove() on tag is called"""
 
309
        """called by GLib. Will indefinitely loop until
 
310
        GLib.source_remove() on tag is called
 
311
        """
352
312
        self.update()
353
313
        return True             # Keep calling this
354
314
    
355
 
    def delete(self, *args, **kwargs):
 
315
    def delete(self, **kwargs):
356
316
        if self._update_timer_callback_tag is not None:
357
 
            gobject.source_remove(self._update_timer_callback_tag)
 
317
            GLib.source_remove(self._update_timer_callback_tag)
358
318
            self._update_timer_callback_tag = None
359
319
        for match in self.match_objects:
360
320
            match.remove()
361
321
        self.match_objects = ()
362
322
        if self.delete_hook is not None:
363
323
            self.delete_hook(self)
364
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
324
        return super(MandosClientWidget, self).delete(**kwargs)
365
325
    
366
326
    def render(self, maxcolrow, focus=False):
367
327
        """Render differently if we have focus.
373
333
        """Handle keys.
374
334
        This overrides the method from urwid.FlowWidget"""
375
335
        if key == "+":
376
 
            self.proxy.Enable(dbus_interface = client_interface,
377
 
                              ignore_reply=True)
 
336
            self.proxy.Set(client_interface, "Enabled",
 
337
                           dbus.Boolean(True), ignore_reply = True,
 
338
                           dbus_interface = dbus.PROPERTIES_IFACE)
378
339
        elif key == "-":
379
 
            self.proxy.Disable(dbus_interface = client_interface,
380
 
                               ignore_reply=True)
 
340
            self.proxy.Set(client_interface, "Enabled", False,
 
341
                           ignore_reply = True,
 
342
                           dbus_interface = dbus.PROPERTIES_IFACE)
381
343
        elif key == "a":
382
344
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
383
345
                               dbus_interface = client_interface,
391
353
                                                  .object_path,
392
354
                                                  ignore_reply=True)
393
355
        elif key == "s":
394
 
            self.proxy.StartChecker(dbus_interface = client_interface,
395
 
                                    ignore_reply=True)
 
356
            self.proxy.Set(client_interface, "CheckerRunning",
 
357
                           dbus.Boolean(True), ignore_reply = True,
 
358
                           dbus_interface = dbus.PROPERTIES_IFACE)
396
359
        elif key == "S":
397
 
            self.proxy.StopChecker(dbus_interface = client_interface,
398
 
                                   ignore_reply=True)
 
360
            self.proxy.Set(client_interface, "CheckerRunning",
 
361
                           dbus.Boolean(False), ignore_reply = True,
 
362
                           dbus_interface = dbus.PROPERTIES_IFACE)
399
363
        elif key == "C":
400
364
            self.proxy.CheckedOK(dbus_interface = client_interface,
401
365
                                 ignore_reply=True)
409
373
        else:
410
374
            return key
411
375
    
412
 
    def property_changed(self, property=None, value=None,
413
 
                         *args, **kwargs):
414
 
        """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.
415
378
        This overrides the method from MandosClientPropertyCache"""
416
 
        property_name = unicode(property)
417
 
        old_value = self.properties.get(property_name)
418
 
        super(MandosClientWidget, self).property_changed(
419
 
            property=property, value=value, *args, **kwargs)
420
 
        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):
421
385
            self.update()
422
386
 
423
387
 
426
390
    "down" key presses, thus not allowing any containing widgets to
427
391
    use them as an excuse to shift focus away from this widget.
428
392
    """
429
 
    def keypress(self, maxcolrow, key):
430
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
393
    def keypress(self, *args, **kwargs):
 
394
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
431
395
        if ret in ("up", "down"):
432
396
            return
433
397
        return ret
437
401
    """This is the entire user interface - the whole screen
438
402
    with boxes, lists of client widgets, etc.
439
403
    """
440
 
    def __init__(self, max_log_length=1000):
 
404
    def __init__(self, max_log_length=1000, log_level=1):
441
405
        DBusGMainLoop(set_as_default=True)
442
406
        
443
407
        self.screen = urwid.curses_display.Screen()
446
410
                ("normal",
447
411
                 "default", "default", None),
448
412
                ("bold",
449
 
                 "default", "default", "bold"),
 
413
                 "bold", "default", "bold"),
450
414
                ("underline-blink",
451
 
                 "default", "default", "underline"),
 
415
                 "underline,blink", "default", "underline,blink"),
452
416
                ("standout",
453
 
                 "default", "default", "standout"),
 
417
                 "standout", "default", "standout"),
454
418
                ("bold-underline-blink",
455
 
                 "default", "default", ("bold", "underline")),
 
419
                 "bold,underline,blink", "default", "bold,underline,blink"),
456
420
                ("bold-standout",
457
 
                 "default", "default", ("bold", "standout")),
 
421
                 "bold,standout", "default", "bold,standout"),
458
422
                ("underline-blink-standout",
459
 
                 "default", "default", ("underline", "standout")),
 
423
                 "underline,blink,standout", "default",
 
424
                 "underline,blink,standout"),
460
425
                ("bold-underline-blink-standout",
461
 
                 "default", "default", ("bold", "underline",
462
 
                                          "standout")),
 
426
                 "bold,underline,blink,standout", "default",
 
427
                 "bold,underline,blink,standout"),
463
428
                ))
464
429
        
465
430
        if urwid.supports_unicode():
480
445
        self.log = []
481
446
        self.max_log_length = max_log_length
482
447
        
 
448
        self.log_level = log_level
 
449
        
483
450
        # We keep a reference to the log widget so we can remove it
484
451
        # from the ListWalker without it getting destroyed
485
452
        self.logbox = ConstrainedListBox(self.log)
496
463
                              "q: Quit  ?: Help"))
497
464
        
498
465
        self.busname = domain + '.Mandos'
499
 
        self.main_loop = gobject.MainLoop()
500
 
        self.bus = dbus.SystemBus()
501
 
        mandos_dbus_objc = self.bus.get_object(
502
 
            self.busname, "/", follow_name_owner_changes=True)
503
 
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
504
 
                                          dbus_interface
505
 
                                          = server_interface)
506
 
        try:
507
 
            mandos_clients = (self.mandos_serv
508
 
                              .GetAllClientsWithProperties())
509
 
        except dbus.exceptions.DBusException:
510
 
            mandos_clients = dbus.Dictionary()
511
 
        
512
 
        (self.mandos_serv
513
 
         .connect_to_signal("ClientRemoved",
514
 
                            self.find_and_remove_client,
515
 
                            dbus_interface=server_interface,
516
 
                            byte_arrays=True))
517
 
        (self.mandos_serv
518
 
         .connect_to_signal("ClientAdded",
519
 
                            self.add_new_client,
520
 
                            dbus_interface=server_interface,
521
 
                            byte_arrays=True))
522
 
        (self.mandos_serv
523
 
         .connect_to_signal("ClientNotFound",
524
 
                            self.client_not_found,
525
 
                            dbus_interface=server_interface,
526
 
                            byte_arrays=True))
527
 
        for path, client in mandos_clients.iteritems():
528
 
            client_proxy_object = self.bus.get_object(self.busname,
529
 
                                                      path)
530
 
            self.add_client(MandosClientWidget(server_proxy_object
531
 
                                               =self.mandos_serv,
532
 
                                               proxy_object
533
 
                                               =client_proxy_object,
534
 
                                               properties=client,
535
 
                                               update_hook
536
 
                                               =self.refresh,
537
 
                                               delete_hook
538
 
                                               =self.remove_client,
539
 
                                               logger
540
 
                                               =self.log_message),
541
 
                            path=path)
 
466
        self.main_loop = GLib.MainLoop()
542
467
    
543
468
    def client_not_found(self, fingerprint, address):
544
 
        self.log_message(("Client with address %s and fingerprint %s"
545
 
                          " could not be found" % (address,
546
 
                                                    fingerprint)))
 
469
        self.log_message("Client with address {} and fingerprint {}"
 
470
                         " could not be found"
 
471
                         .format(address, fingerprint))
547
472
    
548
473
    def rebuild(self):
549
474
        """This rebuilds the User Interface.
559
484
                                                     self.divider)))
560
485
        if self.log_visible:
561
486
            self.uilist.append(self.logbox)
562
 
            pass
563
487
        self.topwidget = urwid.Pile(self.uilist)
564
488
    
565
 
    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
566
493
        timestamp = datetime.datetime.now().isoformat()
567
 
        self.log_message_raw(timestamp + ": " + message)
 
494
        self.log_message_raw("{}: {}".format(timestamp, message),
 
495
                             level=level)
568
496
    
569
 
    def log_message_raw(self, markup):
 
497
    def log_message_raw(self, markup, level=1):
570
498
        """Add a log message to the log buffer."""
 
499
        if level < self.log_level:
 
500
            return
571
501
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
572
502
        if (self.max_log_length
573
503
            and len(self.log) > self.max_log_length):
580
510
        """Toggle visibility of the log buffer."""
581
511
        self.log_visible = not self.log_visible
582
512
        self.rebuild()
583
 
        #self.log_message("Log visibility changed to: "
584
 
        #                 + unicode(self.log_visible))
 
513
        self.log_message("Log visibility changed to: {}"
 
514
                         .format(self.log_visible), level=0)
585
515
    
586
516
    def change_log_display(self):
587
517
        """Change type of log display.
592
522
            self.log_wrap = "clip"
593
523
        for textwidget in self.log:
594
524
            textwidget.set_wrap_mode(self.log_wrap)
595
 
        #self.log_message("Wrap mode: " + self.log_wrap)
 
525
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
526
                         level=0)
596
527
    
597
 
    def find_and_remove_client(self, path, name):
 
528
    def find_and_remove_client(self, path, interfaces):
598
529
        """Find a client by its object path and remove it.
599
530
        
600
 
        This is connected to the ClientRemoved signal from the
 
531
        This is connected to the InterfacesRemoved signal from the
601
532
        Mandos server object."""
 
533
        if client_interface not in interfaces:
 
534
            # Not a Mandos client object; ignore
 
535
            return
602
536
        try:
603
537
            client = self.clients_dict[path]
604
538
        except KeyError:
605
539
            # not found?
606
 
            self.log_message("Unknown client %r (%r) removed", name,
607
 
                             path)
 
540
            self.log_message("Unknown client {!r} removed"
 
541
                             .format(path))
608
542
            return
609
543
        client.delete()
610
544
    
611
 
    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
612
554
        client_proxy_object = self.bus.get_object(self.busname, path)
613
555
        self.add_client(MandosClientWidget(server_proxy_object
614
556
                                           =self.mandos_serv,
619
561
                                           delete_hook
620
562
                                           =self.remove_client,
621
563
                                           logger
622
 
                                           =self.log_message),
 
564
                                           =self.log_message,
 
565
                                           properties
 
566
                                           = dict(ifs_and_props[
 
567
                                               client_interface])),
623
568
                        path=path)
624
569
    
625
570
    def add_client(self, client, path=None):
627
572
        if path is None:
628
573
            path = client.proxy.object_path
629
574
        self.clients_dict[path] = client
630
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
575
        self.clients.sort(key=lambda c: c.properties["Name"])
631
576
        self.refresh()
632
577
    
633
578
    def remove_client(self, client, path=None):
635
580
        if path is None:
636
581
            path = client.proxy.object_path
637
582
        del self.clients_dict[path]
638
 
        if not self.clients_dict:
639
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
640
 
            # is completely emptied, we need to recreate it.
641
 
            self.clients = urwid.SimpleListWalker([])
642
 
            self.rebuild()
643
583
        self.refresh()
644
584
    
645
585
    def refresh(self):
649
589
    
650
590
    def run(self):
651
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
        
652
640
        self.refresh()
653
 
        self._input_callback_tag = (gobject.io_add_watch
 
641
        self._input_callback_tag = (GLib.io_add_watch
654
642
                                    (sys.stdin.fileno(),
655
 
                                     gobject.IO_IN,
 
643
                                     GLib.IO_IN,
656
644
                                     self.process_input))
657
645
        self.main_loop.run()
658
646
        # Main loop has finished, we should close everything now
659
 
        gobject.source_remove(self._input_callback_tag)
 
647
        GLib.source_remove(self._input_callback_tag)
660
648
        self.screen.stop()
661
649
    
662
650
    def stop(self):
686
674
            elif key == "window resize":
687
675
                self.size = self.screen.get_cols_rows()
688
676
                self.refresh()
689
 
            elif key == "\f":  # Ctrl-L
 
677
            elif key == "ctrl l":
 
678
                self.screen.clear()
690
679
                self.refresh()
691
680
            elif key == "l" or key == "D":
692
681
                self.toggle_log_display()
704
693
                                            "?: Help",
705
694
                                            "l: Log window toggle",
706
695
                                            "TAB: Switch window",
707
 
                                            "w: Wrap (log)"))))
 
696
                                            "w: Wrap (log lines)",
 
697
                                            "v: Toggle verbose log",
 
698
                                            ))))
708
699
                self.log_message_raw(("bold",
709
700
                                      "  "
710
701
                                      .join(("Clients:",
723
714
                else:
724
715
                    self.topwidget.set_focus(self.logbox)
725
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")
726
724
            #elif (key == "end" or key == "meta >" or key == "G"
727
725
            #      or key == ">"):
728
726
            #    pass            # xxx end-of-buffer
751
749
    ui.run()
752
750
except KeyboardInterrupt:
753
751
    ui.screen.stop()
754
 
except Exception, e:
755
 
    ui.log_message(unicode(e))
 
752
except Exception as e:
 
753
    ui.log_message(str(e))
756
754
    ui.screen.stop()
757
755
    raise