/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: 2014-08-06 20:33:26 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140806203326-zar7qfqfuqmm2uji
Do not set BusName in systemd service file for Mandos server.

It was not documented what this did for non-"dbus" service types, but
apparently systemd now shows a warning about this.

* mandos.service (BusName): Commented out.

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