/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-05-12 13:14:57 UTC
  • mfrom: (312 release)
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 313.
  • Revision ID: teddy@recompile.se-20140512131457-yupek8sqkke2ini8
Merge from release branch.

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