/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: 2012-06-09 23:41:07 UTC
  • mto: This revision was merged to the branch mainline in revision 596.
  • Revision ID: teddy@recompile.se-20120609234107-vm6zilzz0y6aihsm
* plugins.d/mandos-client.c (raise_privileges,
  raise_privileges_permanently, lower_privileges): Return error_t and
                                                   save old errno
                                                   before calling any
                                                   other function.

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