/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

* mandos-ctl: Use the new argparse library instead of optparse.

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