/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2016-03-02 16:45:38 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 335.
  • Revision ID: teddy@recompile.se-20160302164538-n9ocll4izthzw1ov
http://bugs.debian.org/816513
Ignore any error from initramfs-tools' "configure_networking".

* initramfs-tools-script: Wrap call to "configure_networking" with
  "set +e" and "set -e", since configure_networking was not designed
  to run in a "set -e" environment.

Closes: 816513
Thanks: Carlos Alberto Lopez Perez <clopez@igalia.com>
Thanks: Ben Hutchings <ben@decadent.org.uk>

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