/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2013-08-27 21:47:35 UTC
  • Revision ID: teddy@recompile.se-20130827214735-8r7bsaqjvkx2h97c
* plugin-runner.c (main): Bug fix; do not ignore return value of
                          setgid().
* plugins.d/mandos-client.c (main): Bug fix: sleep() takes an unsigned
                                    int, not an int.
* plugins.d/plymouth.c (exec_and_wait, getargv, main/plymouthd_argv):
                       Add more const-ness to the argv pointer.

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