/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2016-06-03 18:24:51 UTC
  • Revision ID: teddy@recompile.se-20160603182451-l1hfhvi0wdf6sde1
mandos: Minor bug fix for Python 3

* mandos (ClientHandler.handle): The GnuTLS priority string needs to
                                 be encoded to a byte string

Reported-by: Valerio Bellizzomi <valerio@selnet.org>

Show diffs side-by-side

added added

removed removed

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