/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2012-06-23 00:58:49 UTC
  • Revision ID: teddy@recompile.se-20120623005849-02wj82cng433rt2k
* clients.conf: Convert all time intervals to new RFC 3339 syntax.
* mandos: All client options for time intervals now take an RFC 3339
          duration.
  (rfc3339_duration_to_delta): New function.
  (string_to_delta): Try rfc3339_duration_to_delta first.
* mandos-clients.conf.xml (OPTIONS/timeout): Document new format.
  (EXAMPLE): Update to new interval format.
  (SEE ALSO): Reference RFC 3339.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
 
#
 
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
 
#
6
 
# Copyright © 2009-2017 Teddy Hogeborn
7
 
# Copyright © 2009-2017 Björn Påhlsson
8
 
#
 
5
# 
 
6
# Copyright © 2009-2012 Teddy Hogeborn
 
7
# Copyright © 2009-2012 Björn Påhlsson
 
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
11
11
# the Free Software Foundation, either version 3 of the License, or
15
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
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
20
# along with this program.  If not, see
21
21
# <http://www.gnu.org/licenses/>.
22
 
#
 
22
# 
23
23
# Contact the authors at <mandos@recompile.se>.
24
 
#
 
24
# 
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
28
 
try:
29
 
    from future_builtins import *
30
 
except ImportError:
31
 
    pass
 
28
 
 
29
from future_builtins import *
32
30
 
33
31
import sys
34
32
import os
 
33
import signal
35
34
 
36
35
import datetime
37
36
 
39
38
import urwid
40
39
 
41
40
from dbus.mainloop.glib import DBusGMainLoop
42
 
from gi.repository import GLib
 
41
import gobject
43
42
 
44
43
import dbus
45
44
 
 
45
import UserList
 
46
 
46
47
import locale
47
48
 
 
49
locale.setlocale(locale.LC_ALL, '')
 
50
 
48
51
import logging
49
 
 
50
 
if sys.version_info.major == 2:
51
 
    str = unicode
52
 
 
53
 
locale.setlocale(locale.LC_ALL, '')
54
 
 
55
52
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
56
53
 
57
54
# Some useful constants
58
55
domain = 'se.recompile'
59
56
server_interface = domain + '.Mandos'
60
57
client_interface = domain + '.Mandos.Client'
61
 
version = "1.7.15"
62
 
 
63
 
try:
64
 
    dbus.OBJECT_MANAGER_IFACE
65
 
except AttributeError:
66
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
67
 
 
 
58
version = "1.6.0"
 
59
 
 
60
# Always run in monochrome mode
 
61
urwid.curses_display.curses.has_colors = lambda : False
 
62
 
 
63
# Urwid doesn't support blinking, but we want it.  Since we have no
 
64
# use for underline on its own, we make underline also always blink.
 
65
urwid.curses_display.curses.A_UNDERLINE |= (
 
66
    urwid.curses_display.curses.A_BLINK)
68
67
 
69
68
def isoformat_to_datetime(iso):
70
69
    "Parse an ISO 8601 date string to a datetime.datetime()"
79
78
                             int(day),
80
79
                             int(hour),
81
80
                             int(minute),
82
 
                             int(second),            # Whole seconds
83
 
                             int(fraction*1000000))  # Microseconds
84
 
 
 
81
                             int(second),           # Whole seconds
 
82
                             int(fraction*1000000)) # Microseconds
85
83
 
86
84
class MandosClientPropertyCache(object):
87
85
    """This wraps a Mandos Client D-Bus proxy object, caches the
89
87
    changed.
90
88
    """
91
89
    def __init__(self, proxy_object=None, properties=None, **kwargs):
92
 
        self.proxy = proxy_object  # Mandos Client proxy object
 
90
        self.proxy = proxy_object # Mandos Client proxy object
93
91
        self.properties = dict() if properties is None else properties
94
92
        self.property_changed_match = (
95
 
            self.proxy.connect_to_signal("PropertiesChanged",
96
 
                                         self.properties_changed,
97
 
                                         dbus.PROPERTIES_IFACE,
 
93
            self.proxy.connect_to_signal("PropertyChanged",
 
94
                                         self._property_changed,
 
95
                                         client_interface,
98
96
                                         byte_arrays=True))
99
 
 
 
97
        
100
98
        if properties is None:
101
 
            self.properties.update(self.proxy.GetAll(
102
 
                client_interface,
103
 
                dbus_interface=dbus.PROPERTIES_IFACE))
104
 
 
 
99
            self.properties.update(
 
100
                self.proxy.GetAll(client_interface,
 
101
                                  dbus_interface
 
102
                                  = dbus.PROPERTIES_IFACE))
 
103
        
105
104
        super(MandosClientPropertyCache, self).__init__(**kwargs)
106
 
 
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.
 
105
    
 
106
    def _property_changed(self, property, value):
 
107
        """Helper which takes positional arguments"""
 
108
        return self.property_changed(property=property, value=value)
 
109
    
 
110
    def property_changed(self, property=None, value=None):
 
111
        """This is called whenever we get a PropertyChanged signal
 
112
        It updates the changed property in the "properties" dict.
110
113
        """
111
114
        # Update properties dict with new value
112
 
        if interface == client_interface:
113
 
            self.properties.update(properties)
114
 
 
 
115
        self.properties[property] = value
 
116
    
115
117
    def delete(self):
116
118
        self.property_changed_match.remove()
117
119
 
119
121
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
120
122
    """A Mandos Client which is visible on the screen.
121
123
    """
122
 
 
 
124
    
123
125
    def __init__(self, server_proxy_object=None, update_hook=None,
124
126
                 delete_hook=None, logger=None, **kwargs):
125
127
        # Called on update
130
132
        self.server_proxy_object = server_proxy_object
131
133
        # Logger
132
134
        self.logger = logger
133
 
 
 
135
        
134
136
        self._update_timer_callback_tag = None
135
 
 
 
137
        
136
138
        # The widget shown normally
137
139
        self._text_widget = urwid.Text("")
138
140
        # The widget shown when we have focus
140
142
        super(MandosClientWidget, self).__init__(**kwargs)
141
143
        self.update()
142
144
        self.opened = False
143
 
 
 
145
        
144
146
        self.match_objects = (
145
147
            self.proxy.connect_to_signal("CheckerCompleted",
146
148
                                         self.checker_completed,
162
164
                                         self.rejected,
163
165
                                         client_interface,
164
166
                                         byte_arrays=True))
165
 
        self.logger('Created client {}'
166
 
                    .format(self.properties["Name"]), level=0)
167
 
 
 
167
        #self.logger('Created client {0}'
 
168
        #            .format(self.properties["Name"]))
 
169
    
168
170
    def using_timer(self, flag):
169
171
        """Call this method with True or False when timer should be
170
172
        activated or deactivated.
171
173
        """
172
174
        if flag and self._update_timer_callback_tag is None:
173
175
            # Will update the shown timer value every second
174
 
            self._update_timer_callback_tag = (GLib.timeout_add
 
176
            self._update_timer_callback_tag = (gobject.timeout_add
175
177
                                               (1000,
176
178
                                                self.update_timer))
177
179
        elif not (flag or self._update_timer_callback_tag is None):
178
 
            GLib.source_remove(self._update_timer_callback_tag)
 
180
            gobject.source_remove(self._update_timer_callback_tag)
179
181
            self._update_timer_callback_tag = None
180
 
 
 
182
    
181
183
    def checker_completed(self, exitstatus, condition, command):
182
184
        if exitstatus == 0:
183
 
            self.logger('Checker for client {} (command "{}")'
184
 
                        ' succeeded'.format(self.properties["Name"],
185
 
                                            command), level=0)
186
185
            self.update()
187
186
            return
188
187
        # Checker failed
189
188
        if os.WIFEXITED(condition):
190
 
            self.logger('Checker for client {} (command "{}") failed'
191
 
                        ' with exit code {}'
 
189
            self.logger('Checker for client {0} (command "{1}")'
 
190
                        ' failed with exit code {2}'
192
191
                        .format(self.properties["Name"], command,
193
192
                                os.WEXITSTATUS(condition)))
194
193
        elif os.WIFSIGNALED(condition):
195
 
            self.logger('Checker for client {} (command "{}") was'
196
 
                        ' killed by signal {}'
 
194
            self.logger('Checker for client {0} (command "{1}") was'
 
195
                        ' killed by signal {2}'
197
196
                        .format(self.properties["Name"], command,
198
197
                                os.WTERMSIG(condition)))
 
198
        elif os.WCOREDUMP(condition):
 
199
            self.logger('Checker for client {0} (command "{1}")'
 
200
                        ' dumped core'
 
201
                        .format(self.properties["Name"], command))
 
202
        else:
 
203
            self.logger('Checker for client {0} completed'
 
204
                        ' mysteriously'
 
205
                        .format(self.properties["Name"]))
199
206
        self.update()
200
 
 
 
207
    
201
208
    def checker_started(self, command):
202
 
        """Server signals that a checker started."""
203
 
        self.logger('Client {} started checker "{}"'
204
 
                    .format(self.properties["Name"],
205
 
                            command), level=0)
206
 
 
 
209
        """Server signals that a checker started. This could be useful
 
210
           to log in the future. """
 
211
        #self.logger('Client {0} started checker "{1}"'
 
212
        #            .format(self.properties["Name"],
 
213
        #                    unicode(command)))
 
214
        pass
 
215
    
207
216
    def got_secret(self):
208
 
        self.logger('Client {} received its secret'
 
217
        self.logger('Client {0} received its secret'
209
218
                    .format(self.properties["Name"]))
210
 
 
 
219
    
211
220
    def need_approval(self, timeout, default):
212
221
        if not default:
213
 
            message = 'Client {} needs approval within {} seconds'
 
222
            message = 'Client {0} needs approval within {1} seconds'
214
223
        else:
215
 
            message = 'Client {} will get its secret in {} seconds'
 
224
            message = 'Client {0} will get its secret in {1} seconds'
216
225
        self.logger(message.format(self.properties["Name"],
217
226
                                   timeout/1000))
218
 
 
 
227
    
219
228
    def rejected(self, reason):
220
 
        self.logger('Client {} was rejected; reason: {}'
 
229
        self.logger('Client {0} was rejected; reason: {1}'
221
230
                    .format(self.properties["Name"], reason))
222
 
 
 
231
    
223
232
    def selectable(self):
224
233
        """Make this a "selectable" widget.
225
234
        This overrides the method from urwid.FlowWidget."""
226
235
        return True
227
 
 
 
236
    
228
237
    def rows(self, maxcolrow, focus=False):
229
238
        """How many rows this widget will occupy might depend on
230
239
        whether we have focus or not.
231
240
        This overrides the method from urwid.FlowWidget"""
232
241
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
233
 
 
 
242
    
234
243
    def current_widget(self, focus=False):
235
244
        if focus or self.opened:
236
245
            return self._focus_widget
237
246
        return self._widget
238
 
 
 
247
    
239
248
    def update(self):
240
249
        "Called when what is visible on the screen should be updated."
241
250
        # How to add standout mode to a style
242
 
        with_standout = {"normal": "standout",
243
 
                         "bold": "bold-standout",
244
 
                         "underline-blink":
245
 
                         "underline-blink-standout",
246
 
                         "bold-underline-blink":
247
 
                         "bold-underline-blink-standout",
248
 
                         }
249
 
 
 
251
        with_standout = { "normal": "standout",
 
252
                          "bold": "bold-standout",
 
253
                          "underline-blink":
 
254
                              "underline-blink-standout",
 
255
                          "bold-underline-blink":
 
256
                              "bold-underline-blink-standout",
 
257
                          }
 
258
        
250
259
        # Rebuild focus and non-focus widgets using current properties
251
 
 
 
260
        
252
261
        # Base part of a client. Name!
253
262
        base = '{name}: '.format(name=self.properties["Name"])
254
263
        if not self.properties["Enabled"]:
255
264
            message = "DISABLED"
256
265
            self.using_timer(False)
257
266
        elif self.properties["ApprovalPending"]:
258
 
            timeout = datetime.timedelta(
259
 
                milliseconds=self.properties["ApprovalDelay"])
 
267
            timeout = datetime.timedelta(milliseconds
 
268
                                         = self.properties
 
269
                                         ["ApprovalDelay"])
260
270
            last_approval_request = isoformat_to_datetime(
261
271
                self.properties["LastApprovalRequest"])
262
272
            if last_approval_request is not None:
266
276
            else:
267
277
                timer = datetime.timedelta()
268
278
            if self.properties["ApprovedByDefault"]:
269
 
                message = "Approval in {}. (d)eny?"
 
279
                message = "Approval in {0}. (d)eny?"
270
280
            else:
271
 
                message = "Denial in {}. (a)pprove?"
272
 
            message = message.format(str(timer).rsplit(".", 1)[0])
 
281
                message = "Denial in {0}. (a)pprove?"
 
282
            message = message.format(unicode(timer).rsplit(".", 1)[0])
273
283
            self.using_timer(True)
274
284
        elif self.properties["LastCheckerStatus"] != 0:
275
285
            # When checker has failed, show timer until client expires
282
292
                timer = max(expires - datetime.datetime.utcnow(),
283
293
                            datetime.timedelta())
284
294
            message = ('A checker has failed! Time until client'
285
 
                       ' gets disabled: {}'
286
 
                       .format(str(timer).rsplit(".", 1)[0]))
 
295
                       ' gets disabled: {0}'
 
296
                       .format(unicode(timer).rsplit(".", 1)[0]))
287
297
            self.using_timer(True)
288
298
        else:
289
299
            message = "enabled"
290
300
            self.using_timer(False)
291
 
        self._text = "{}{}".format(base, message)
292
 
 
 
301
        self._text = "{0}{1}".format(base, message)
 
302
        
293
303
        if not urwid.supports_unicode():
294
304
            self._text = self._text.encode("ascii", "replace")
295
305
        textlist = [("normal", self._text)]
305
315
        # Run update hook, if any
306
316
        if self.update_hook is not None:
307
317
            self.update_hook()
308
 
 
 
318
    
309
319
    def update_timer(self):
310
 
        """called by GLib. Will indefinitely loop until
311
 
        GLib.source_remove() on tag is called
312
 
        """
 
320
        """called by gobject. Will indefinitely loop until
 
321
        gobject.source_remove() on tag is called"""
313
322
        self.update()
314
323
        return True             # Keep calling this
315
 
 
 
324
    
316
325
    def delete(self, **kwargs):
317
326
        if self._update_timer_callback_tag is not None:
318
 
            GLib.source_remove(self._update_timer_callback_tag)
 
327
            gobject.source_remove(self._update_timer_callback_tag)
319
328
            self._update_timer_callback_tag = None
320
329
        for match in self.match_objects:
321
330
            match.remove()
323
332
        if self.delete_hook is not None:
324
333
            self.delete_hook(self)
325
334
        return super(MandosClientWidget, self).delete(**kwargs)
326
 
 
 
335
    
327
336
    def render(self, maxcolrow, focus=False):
328
337
        """Render differently if we have focus.
329
338
        This overrides the method from urwid.FlowWidget"""
330
339
        return self.current_widget(focus).render(maxcolrow,
331
340
                                                 focus=focus)
332
 
 
 
341
    
333
342
    def keypress(self, maxcolrow, key):
334
343
        """Handle keys.
335
344
        This overrides the method from urwid.FlowWidget"""
336
345
        if key == "+":
337
 
            self.proxy.Set(client_interface, "Enabled",
338
 
                           dbus.Boolean(True), ignore_reply=True,
339
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
346
            self.proxy.Enable(dbus_interface = client_interface,
 
347
                              ignore_reply=True)
340
348
        elif key == "-":
341
 
            self.proxy.Set(client_interface, "Enabled", False,
342
 
                           ignore_reply=True,
343
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
349
            self.proxy.Disable(dbus_interface = client_interface,
 
350
                               ignore_reply=True)
344
351
        elif key == "a":
345
352
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
346
 
                               dbus_interface=client_interface,
 
353
                               dbus_interface = client_interface,
347
354
                               ignore_reply=True)
348
355
        elif key == "d":
349
356
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
350
 
                               dbus_interface=client_interface,
 
357
                                  dbus_interface = client_interface,
351
358
                               ignore_reply=True)
352
359
        elif key == "R" or key == "_" or key == "ctrl k":
353
360
            self.server_proxy_object.RemoveClient(self.proxy
354
361
                                                  .object_path,
355
362
                                                  ignore_reply=True)
356
363
        elif key == "s":
357
 
            self.proxy.Set(client_interface, "CheckerRunning",
358
 
                           dbus.Boolean(True), ignore_reply=True,
359
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
364
            self.proxy.StartChecker(dbus_interface = client_interface,
 
365
                                    ignore_reply=True)
360
366
        elif key == "S":
361
 
            self.proxy.Set(client_interface, "CheckerRunning",
362
 
                           dbus.Boolean(False), ignore_reply=True,
363
 
                           dbus_interface=dbus.PROPERTIES_IFACE)
 
367
            self.proxy.StopChecker(dbus_interface = client_interface,
 
368
                                   ignore_reply=True)
364
369
        elif key == "C":
365
 
            self.proxy.CheckedOK(dbus_interface=client_interface,
 
370
            self.proxy.CheckedOK(dbus_interface = client_interface,
366
371
                                 ignore_reply=True)
367
372
        # xxx
368
373
#         elif key == "p" or key == "=":
373
378
#             self.open()
374
379
        else:
375
380
            return key
376
 
 
377
 
    def properties_changed(self, interface, properties, invalidated):
378
 
        """Call self.update() if any properties changed.
 
381
    
 
382
    def property_changed(self, property=None, **kwargs):
 
383
        """Call self.update() if old value is not new value.
379
384
        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):
 
385
        property_name = unicode(property)
 
386
        old_value = self.properties.get(property_name)
 
387
        super(MandosClientWidget, self).property_changed(
 
388
            property=property, **kwargs)
 
389
        if self.properties.get(property_name) != old_value:
386
390
            self.update()
387
391
 
388
392
 
392
396
    use them as an excuse to shift focus away from this widget.
393
397
    """
394
398
    def keypress(self, *args, **kwargs):
395
 
        ret = (super(ConstrainedListBox, self)
396
 
               .keypress(*args, **kwargs))
 
399
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
397
400
        if ret in ("up", "down"):
398
401
            return
399
402
        return ret
403
406
    """This is the entire user interface - the whole screen
404
407
    with boxes, lists of client widgets, etc.
405
408
    """
406
 
    def __init__(self, max_log_length=1000, log_level=1):
 
409
    def __init__(self, max_log_length=1000):
407
410
        DBusGMainLoop(set_as_default=True)
408
 
 
 
411
        
409
412
        self.screen = urwid.curses_display.Screen()
410
 
 
 
413
        
411
414
        self.screen.register_palette((
412
415
                ("normal",
413
416
                 "default", "default", None),
414
417
                ("bold",
415
 
                 "bold", "default", "bold"),
 
418
                 "default", "default", "bold"),
416
419
                ("underline-blink",
417
 
                 "underline,blink", "default", "underline,blink"),
 
420
                 "default", "default", "underline"),
418
421
                ("standout",
419
 
                 "standout", "default", "standout"),
 
422
                 "default", "default", "standout"),
420
423
                ("bold-underline-blink",
421
 
                 "bold,underline,blink", "default",
422
 
                 "bold,underline,blink"),
 
424
                 "default", "default", ("bold", "underline")),
423
425
                ("bold-standout",
424
 
                 "bold,standout", "default", "bold,standout"),
 
426
                 "default", "default", ("bold", "standout")),
425
427
                ("underline-blink-standout",
426
 
                 "underline,blink,standout", "default",
427
 
                 "underline,blink,standout"),
 
428
                 "default", "default", ("underline", "standout")),
428
429
                ("bold-underline-blink-standout",
429
 
                 "bold,underline,blink,standout", "default",
430
 
                 "bold,underline,blink,standout"),
 
430
                 "default", "default", ("bold", "underline",
 
431
                                          "standout")),
431
432
                ))
432
 
 
 
433
        
433
434
        if urwid.supports_unicode():
434
 
            self.divider = "─"  # \u2500
 
435
            self.divider = "─" # \u2500
 
436
            #self.divider = "━" # \u2501
435
437
        else:
436
 
            self.divider = "_"  # \u005f
437
 
 
 
438
            #self.divider = "-" # \u002d
 
439
            self.divider = "_" # \u005f
 
440
        
438
441
        self.screen.start()
439
 
 
 
442
        
440
443
        self.size = self.screen.get_cols_rows()
441
 
 
 
444
        
442
445
        self.clients = urwid.SimpleListWalker([])
443
446
        self.clients_dict = {}
444
 
 
 
447
        
445
448
        # We will add Text widgets to this list
446
449
        self.log = []
447
450
        self.max_log_length = max_log_length
448
 
 
449
 
        self.log_level = log_level
450
 
 
 
451
        
451
452
        # We keep a reference to the log widget so we can remove it
452
453
        # from the ListWalker without it getting destroyed
453
454
        self.logbox = ConstrainedListBox(self.log)
454
 
 
 
455
        
455
456
        # This keeps track of whether self.uilist currently has
456
457
        # self.logbox in it or not
457
458
        self.log_visible = True
458
459
        self.log_wrap = "any"
459
 
 
 
460
        
460
461
        self.rebuild()
461
462
        self.log_message_raw(("bold",
462
463
                              "Mandos Monitor version " + version))
463
464
        self.log_message_raw(("bold",
464
465
                              "q: Quit  ?: Help"))
465
 
 
 
466
        
466
467
        self.busname = domain + '.Mandos'
467
 
        self.main_loop = GLib.MainLoop()
468
 
 
 
468
        self.main_loop = gobject.MainLoop()
 
469
    
469
470
    def client_not_found(self, fingerprint, address):
470
 
        self.log_message("Client with address {} and fingerprint {}"
471
 
                         " could not be found"
 
471
        self.log_message("Client with address {0} and fingerprint"
 
472
                         " {1} could not be found"
472
473
                         .format(address, fingerprint))
473
 
 
 
474
    
474
475
    def rebuild(self):
475
476
        """This rebuilds the User Interface.
476
477
        Call this when the widget layout needs to change"""
477
478
        self.uilist = []
478
 
        # self.uilist.append(urwid.ListBox(self.clients))
 
479
        #self.uilist.append(urwid.ListBox(self.clients))
479
480
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
480
481
                                                          clients),
481
 
                                       # header=urwid.Divider(),
 
482
                                       #header=urwid.Divider(),
482
483
                                       header=None,
483
 
                                       footer=urwid.Divider(
484
 
                                           div_char=self.divider)))
 
484
                                       footer=
 
485
                                       urwid.Divider(div_char=
 
486
                                                     self.divider)))
485
487
        if self.log_visible:
486
488
            self.uilist.append(self.logbox)
487
489
        self.topwidget = urwid.Pile(self.uilist)
488
 
 
489
 
    def log_message(self, message, level=1):
490
 
        """Log message formatted with timestamp"""
491
 
        if level < self.log_level:
492
 
            return
 
490
    
 
491
    def log_message(self, message):
493
492
        timestamp = datetime.datetime.now().isoformat()
494
 
        self.log_message_raw("{}: {}".format(timestamp, message),
495
 
                             level=level)
496
 
 
497
 
    def log_message_raw(self, markup, level=1):
 
493
        self.log_message_raw(timestamp + ": " + message)
 
494
    
 
495
    def log_message_raw(self, markup):
498
496
        """Add a log message to the log buffer."""
499
 
        if level < self.log_level:
500
 
            return
501
497
        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]
 
498
        if (self.max_log_length
 
499
            and len(self.log) > self.max_log_length):
 
500
            del self.log[0:len(self.log)-self.max_log_length-1]
505
501
        self.logbox.set_focus(len(self.logbox.body.contents),
506
502
                              coming_from="above")
507
503
        self.refresh()
508
 
 
 
504
    
509
505
    def toggle_log_display(self):
510
506
        """Toggle visibility of the log buffer."""
511
507
        self.log_visible = not self.log_visible
512
508
        self.rebuild()
513
 
        self.log_message("Log visibility changed to: {}"
514
 
                         .format(self.log_visible), level=0)
515
 
 
 
509
        #self.log_message("Log visibility changed to: "
 
510
        #                 + unicode(self.log_visible))
 
511
    
516
512
    def change_log_display(self):
517
513
        """Change type of log display.
518
514
        Currently, this toggles wrapping of text lines."""
522
518
            self.log_wrap = "clip"
523
519
        for textwidget in self.log:
524
520
            textwidget.set_wrap_mode(self.log_wrap)
525
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
526
 
                         level=0)
527
 
 
528
 
    def find_and_remove_client(self, path, interfaces):
 
521
        #self.log_message("Wrap mode: " + self.log_wrap)
 
522
    
 
523
    def find_and_remove_client(self, path, name):
529
524
        """Find a client by its object path and remove it.
530
 
 
531
 
        This is connected to the InterfacesRemoved signal from the
 
525
        
 
526
        This is connected to the ClientRemoved signal from the
532
527
        Mandos server object."""
533
 
        if client_interface not in interfaces:
534
 
            # Not a Mandos client object; ignore
535
 
            return
536
528
        try:
537
529
            client = self.clients_dict[path]
538
530
        except KeyError:
539
531
            # not found?
540
 
            self.log_message("Unknown client {!r} removed"
541
 
                             .format(path))
 
532
            self.log_message("Unknown client {0!r} ({1!r}) removed"
 
533
                             .format(name, path))
542
534
            return
543
535
        client.delete()
544
 
 
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
 
536
    
 
537
    def add_new_client(self, path):
554
538
        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])),
 
539
        self.add_client(MandosClientWidget(server_proxy_object
 
540
                                           =self.mandos_serv,
 
541
                                           proxy_object
 
542
                                           =client_proxy_object,
 
543
                                           update_hook
 
544
                                           =self.refresh,
 
545
                                           delete_hook
 
546
                                           =self.remove_client,
 
547
                                           logger
 
548
                                           =self.log_message),
562
549
                        path=path)
563
 
 
 
550
    
564
551
    def add_client(self, client, path=None):
565
552
        self.clients.append(client)
566
553
        if path is None:
567
554
            path = client.proxy.object_path
568
555
        self.clients_dict[path] = client
569
 
        self.clients.sort(key=lambda c: c.properties["Name"])
 
556
        self.clients.sort(None, lambda c: c.properties["Name"])
570
557
        self.refresh()
571
 
 
 
558
    
572
559
    def remove_client(self, client, path=None):
573
560
        self.clients.remove(client)
574
561
        if path is None:
575
562
            path = client.proxy.object_path
576
563
        del self.clients_dict[path]
 
564
        if not self.clients_dict:
 
565
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
 
566
            # is completely emptied, we need to recreate it.
 
567
            self.clients = urwid.SimpleListWalker([])
 
568
            self.rebuild()
577
569
        self.refresh()
578
 
 
 
570
    
579
571
    def refresh(self):
580
572
        """Redraw the screen"""
581
573
        canvas = self.topwidget.render(self.size, focus=True)
582
574
        self.screen.draw_screen(self.size, canvas)
583
 
 
 
575
    
584
576
    def run(self):
585
577
        """Start the main loop and exit when it's done."""
586
578
        self.bus = dbus.SystemBus()
587
579
        mandos_dbus_objc = self.bus.get_object(
588
580
            self.busname, "/", follow_name_owner_changes=True)
589
 
        self.mandos_serv = dbus.Interface(
590
 
            mandos_dbus_objc, dbus_interface=server_interface)
 
581
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
582
                                          dbus_interface
 
583
                                          = server_interface)
591
584
        try:
592
585
            mandos_clients = (self.mandos_serv
593
586
                              .GetAllClientsWithProperties())
594
 
            if not mandos_clients:
595
 
                self.log_message_raw(("bold",
596
 
                                      "Note: Server has no clients."))
597
587
        except dbus.exceptions.DBusException:
598
 
            self.log_message_raw(("bold",
599
 
                                  "Note: No Mandos server running."))
600
588
            mandos_clients = dbus.Dictionary()
601
 
 
 
589
        
602
590
        (self.mandos_serv
603
 
         .connect_to_signal("InterfacesRemoved",
 
591
         .connect_to_signal("ClientRemoved",
604
592
                            self.find_and_remove_client,
605
 
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
593
                            dbus_interface=server_interface,
606
594
                            byte_arrays=True))
607
595
        (self.mandos_serv
608
 
         .connect_to_signal("InterfacesAdded",
 
596
         .connect_to_signal("ClientAdded",
609
597
                            self.add_new_client,
610
 
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
598
                            dbus_interface=server_interface,
611
599
                            byte_arrays=True))
612
600
        (self.mandos_serv
613
601
         .connect_to_signal("ClientNotFound",
614
602
                            self.client_not_found,
615
603
                            dbus_interface=server_interface,
616
604
                            byte_arrays=True))
617
 
        for path, client in mandos_clients.items():
 
605
        for path, client in mandos_clients.iteritems():
618
606
            client_proxy_object = self.bus.get_object(self.busname,
619
607
                                                      path)
620
 
            self.add_client(MandosClientWidget(
621
 
                server_proxy_object=self.mandos_serv,
622
 
                proxy_object=client_proxy_object,
623
 
                properties=client,
624
 
                update_hook=self.refresh,
625
 
                delete_hook=self.remove_client,
626
 
                logger=self.log_message),
 
608
            self.add_client(MandosClientWidget(server_proxy_object
 
609
                                               =self.mandos_serv,
 
610
                                               proxy_object
 
611
                                               =client_proxy_object,
 
612
                                               properties=client,
 
613
                                               update_hook
 
614
                                               =self.refresh,
 
615
                                               delete_hook
 
616
                                               =self.remove_client,
 
617
                                               logger
 
618
                                               =self.log_message),
627
619
                            path=path)
628
 
 
 
620
        
629
621
        self.refresh()
630
 
        self._input_callback_tag = (GLib.io_add_watch
 
622
        self._input_callback_tag = (gobject.io_add_watch
631
623
                                    (sys.stdin.fileno(),
632
 
                                     GLib.IO_IN,
 
624
                                     gobject.IO_IN,
633
625
                                     self.process_input))
634
626
        self.main_loop.run()
635
627
        # Main loop has finished, we should close everything now
636
 
        GLib.source_remove(self._input_callback_tag)
 
628
        gobject.source_remove(self._input_callback_tag)
637
629
        self.screen.stop()
638
 
 
 
630
    
639
631
    def stop(self):
640
632
        self.main_loop.quit()
641
 
 
 
633
    
642
634
    def process_input(self, source, condition):
643
635
        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
651
 
                        "j": "down",            # vi
652
 
                        "k": "up",              # vi
653
 
                        }
 
636
        translations = { "ctrl n": "down",      # Emacs
 
637
                         "ctrl p": "up",        # Emacs
 
638
                         "ctrl v": "page down", # Emacs
 
639
                         "meta v": "page up",   # Emacs
 
640
                         " ": "page down",      # less
 
641
                         "f": "page down",      # less
 
642
                         "b": "page up",        # less
 
643
                         "j": "down",           # vi
 
644
                         "k": "up",             # vi
 
645
                         }
654
646
        for key in keys:
655
647
            try:
656
648
                key = translations[key]
657
649
            except KeyError:    # :-)
658
650
                pass
659
 
 
 
651
            
660
652
            if key == "q" or key == "Q":
661
653
                self.stop()
662
654
                break
663
655
            elif key == "window resize":
664
656
                self.size = self.screen.get_cols_rows()
665
657
                self.refresh()
666
 
            elif key == "ctrl l":
667
 
                self.screen.clear()
 
658
            elif key == "\f":  # Ctrl-L
668
659
                self.refresh()
669
660
            elif key == "l" or key == "D":
670
661
                self.toggle_log_display()
682
673
                                            "?: Help",
683
674
                                            "l: Log window toggle",
684
675
                                            "TAB: Switch window",
685
 
                                            "w: Wrap (log lines)",
686
 
                                            "v: Toggle verbose log",
687
 
                                            ))))
 
676
                                            "w: Wrap (log)"))))
688
677
                self.log_message_raw(("bold",
689
678
                                      "  "
690
679
                                      .join(("Clients:",
703
692
                else:
704
693
                    self.topwidget.set_focus(self.logbox)
705
694
                self.refresh()
706
 
            elif key == "v":
707
 
                if self.log_level == 0:
708
 
                    self.log_level = 1
709
 
                    self.log_message("Verbose mode: Off")
710
 
                else:
711
 
                    self.log_level = 0
712
 
                    self.log_message("Verbose mode: On")
713
 
            # elif (key == "end" or key == "meta >" or key == "G"
714
 
            #       or key == ">"):
715
 
            #     pass            # xxx end-of-buffer
716
 
            # elif (key == "home" or key == "meta <" or key == "g"
717
 
            #       or key == "<"):
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":
724
 
            #     pass            # xxx left
725
 
            # elif key == "ctrl f" or key == "meta )" or key == "l":
726
 
            #     pass            # xxx right
727
 
            # elif key == "a":
728
 
            #     pass            # scroll up log
729
 
            # elif key == "z":
730
 
            #     pass            # scroll down log
 
695
            #elif (key == "end" or key == "meta >" or key == "G"
 
696
            #      or key == ">"):
 
697
            #    pass            # xxx end-of-buffer
 
698
            #elif (key == "home" or key == "meta <" or key == "g"
 
699
            #      or key == "<"):
 
700
            #    pass            # xxx beginning-of-buffer
 
701
            #elif key == "ctrl e" or key == "$":
 
702
            #    pass            # xxx move-end-of-line
 
703
            #elif key == "ctrl a" or key == "^":
 
704
            #    pass            # xxx move-beginning-of-line
 
705
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
706
            #    pass            # xxx left
 
707
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
708
            #    pass            # xxx right
 
709
            #elif key == "a":
 
710
            #    pass            # scroll up log
 
711
            #elif key == "z":
 
712
            #    pass            # scroll down log
731
713
            elif self.topwidget.selectable():
732
714
                self.topwidget.keypress(self.size, key)
733
715
                self.refresh()
734
716
        return True
735
717
 
736
 
 
737
718
ui = UserInterface()
738
719
try:
739
720
    ui.run()
740
721
except KeyboardInterrupt:
741
722
    ui.screen.stop()
742
 
except Exception as e:
743
 
    ui.log_message(str(e))
 
723
except Exception, e:
 
724
    ui.log_message(unicode(e))
744
725
    ui.screen.stop()
745
726
    raise