/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

* initramfs-tools-script: Abort if plugin-runner is missing.  Removed
                          workaround for Debian bug #633582; the
                          workaround required getopt, which can not be
                          guaranteed.
* plugin-runner.c (main): Work around Debian bug #633582.
* plugins.d/mandos-client.c (main): - '' -

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
 
28
import os
7
29
import signal
8
30
 
 
31
import datetime
 
32
 
9
33
import urwid.curses_display
10
34
import urwid
11
35
 
16
40
 
17
41
import UserList
18
42
 
 
43
import locale
 
44
 
 
45
locale.setlocale(locale.LC_ALL, '')
 
46
 
 
47
import logging
 
48
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
49
 
19
50
# Some useful constants
20
51
domain = 'se.bsnet.fukt'
21
52
server_interface = domain + '.Mandos'
22
53
client_interface = domain + '.Mandos.Client'
23
 
version = "1.0.14"
 
54
version = "1.3.0"
24
55
 
25
56
# Always run in monochrome mode
26
57
urwid.curses_display.curses.has_colors = lambda : False
30
61
urwid.curses_display.curses.A_UNDERLINE |= (
31
62
    urwid.curses_display.curses.A_BLINK)
32
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
 
33
80
class MandosClientPropertyCache(object):
34
81
    """This wraps a Mandos Client D-Bus proxy object, caches the
35
82
    properties and calls a hook function when any of them are
36
83
    changed.
37
84
    """
38
 
    def __init__(self, proxy_object=None, properties=None, *args,
39
 
                 **kwargs):
 
85
    def __init__(self, proxy_object=None, *args, **kwargs):
40
86
        self.proxy = proxy_object # Mandos Client proxy object
41
87
        
42
 
        if properties is None:
43
 
            self.properties = dict()
44
 
        else:
45
 
            self.properties = properties
 
88
        self.properties = dict()
46
89
        self.proxy.connect_to_signal("PropertyChanged",
47
90
                                     self.property_changed,
48
91
                                     client_interface,
49
92
                                     byte_arrays=True)
50
93
        
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)
 
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)
58
101
    
59
102
    def property_changed(self, property=None, value=None):
60
103
        """This is called whenever we get a PropertyChanged signal
69
112
    """
70
113
    
71
114
    def __init__(self, server_proxy_object=None, update_hook=None,
72
 
                 delete_hook=None, *args, **kwargs):
 
115
                 delete_hook=None, logger=None, *args, **kwargs):
73
116
        # Called on update
74
117
        self.update_hook = update_hook
75
118
        # Called on delete
76
119
        self.delete_hook = delete_hook
77
120
        # Mandos Server proxy object
78
121
        self.server_proxy_object = server_proxy_object
 
122
        # Logger
 
123
        self.logger = logger
 
124
        
 
125
        self._update_timer_callback_tag = None
 
126
        self._update_timer_callback_lock = 0
 
127
        self.last_checker_failed = False
79
128
        
80
129
        # The widget shown normally
81
130
        self._text_widget = urwid.Text("")
86
135
            *args, **kwargs)
87
136
        self.update()
88
137
        self.opened = False
 
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",
 
158
                                     self.checker_completed,
 
159
                                     client_interface,
 
160
                                     byte_arrays=True)
 
161
        self.proxy.connect_to_signal("CheckerStarted",
 
162
                                     self.checker_started,
 
163
                                     client_interface,
 
164
                                     byte_arrays=True)
 
165
        self.proxy.connect_to_signal("GotSecret",
 
166
                                     self.got_secret,
 
167
                                     client_interface,
 
168
                                     byte_arrays=True)
 
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",
 
174
                                     self.rejected,
 
175
                                     client_interface,
 
176
                                     byte_arrays=True)
 
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
    
 
201
    def checker_completed(self, exitstatus, condition, command):
 
202
        if exitstatus == 0:
 
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()
 
210
            return
 
211
        # Checker failed
 
212
        if not self.last_checker_failed:
 
213
            self.last_checker_failed = True
 
214
            self.using_timer(True)
 
215
        if os.WIFEXITED(condition):
 
216
            self.logger('Checker for client %s (command "%s")'
 
217
                        ' failed with exit code %s'
 
218
                        % (self.properties["Name"], command,
 
219
                           os.WEXITSTATUS(condition)))
 
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,
 
224
                           os.WTERMSIG(condition)))
 
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()
 
233
    
 
234
    def checker_started(self, command):
 
235
        #self.logger('Client %s started checker "%s"'
 
236
        #            % (self.properties["Name"], unicode(command)))
 
237
        pass
 
238
    
 
239
    def got_secret(self):
 
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))
89
256
    
90
257
    def selectable(self):
91
258
        """Make this a "selectable" widget.
92
259
        This overrides the method from urwid.FlowWidget."""
93
260
        return True
94
261
    
95
 
    def rows(self, (maxcol,), focus=False):
 
262
    def rows(self, maxcolrow, focus=False):
96
263
        """How many rows this widget will occupy might depend on
97
264
        whether we have focus or not.
98
265
        This overrides the method from urwid.FlowWidget"""
99
 
        return self.current_widget(focus).rows((maxcol,), focus=focus)
 
266
        return self.current_widget(focus).rows(maxcolrow, focus=focus)
100
267
    
101
268
    def current_widget(self, focus=False):
102
269
        if focus or self.opened:
106
273
    def update(self):
107
274
        "Called when what is visible on the screen should be updated."
108
275
        # 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",
 
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",
115
282
                          }
116
 
        
 
283
 
117
284
        # Rebuild focus and non-focus widgets using current properties
118
 
        self._text = (u'name="%(name)s", enabled=%(enabled)s'
119
 
                      % self.properties)
 
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
            
120
323
        if not urwid.supports_unicode():
121
324
            self._text = self._text.encode("ascii", "replace")
122
 
        textlist = [(u"normal", u"BLARGH: "), (u"bold", self._text)]
 
325
        textlist = [("normal", self._text)]
123
326
        self._text_widget.set_text(textlist)
124
327
        self._focus_text_widget.set_text([(with_standout[text[0]],
125
328
                                           text[1])
133
336
        if self.update_hook is not None:
134
337
            self.update_hook()
135
338
    
 
339
    def update_timer(self):
 
340
        "called by gobject"
 
341
        self.update()
 
342
        return True             # Keep calling this
 
343
    
136
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
137
348
        if self.delete_hook is not None:
138
349
            self.delete_hook(self)
139
350
    
140
 
    def render(self, (maxcol,), focus=False):
 
351
    def render(self, maxcolrow, focus=False):
141
352
        """Render differently if we have focus.
142
353
        This overrides the method from urwid.FlowWidget"""
143
 
        return self.current_widget(focus).render((maxcol,),
 
354
        return self.current_widget(focus).render(maxcolrow,
144
355
                                                 focus=focus)
145
356
    
146
 
    def keypress(self, (maxcol,), key):
 
357
    def keypress(self, maxcolrow, key):
147
358
        """Handle keys.
148
359
        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"_":
 
360
        if key == "+":
 
361
            self.proxy.Enable(dbus_interface = client_interface,
 
362
                              ignore_reply=True)
 
363
        elif key == "-":
 
364
            self.proxy.Disable(dbus_interface = client_interface,
 
365
                               ignore_reply=True)
 
366
        elif key == "a":
 
367
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
368
                               dbus_interface = client_interface,
 
369
                               ignore_reply=True)
 
370
        elif key == "d":
 
371
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
372
                                  dbus_interface = client_interface,
 
373
                               ignore_reply=True)
 
374
        elif key == "R" or key == "_" or key == "ctrl k":
154
375
            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()
 
376
                                                  .object_path,
 
377
                                                  ignore_reply=True)
 
378
        elif key == "s":
 
379
            self.proxy.StartChecker(dbus_interface = client_interface,
 
380
                                    ignore_reply=True)
 
381
        elif key == "S":
 
382
            self.proxy.StopChecker(dbus_interface = client_interface,
 
383
                                   ignore_reply=True)
 
384
        elif key == "C":
 
385
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
386
                                 ignore_reply=True)
162
387
        # xxx
163
 
#         elif key == u"p" or key == "=":
 
388
#         elif key == "p" or key == "=":
164
389
#             self.proxy.pause()
165
 
#         elif key == u"u" or key == ":":
 
390
#         elif key == "u" or key == ":":
166
391
#             self.proxy.unpause()
167
 
#         elif key == u"RET":
 
392
#         elif key == "RET":
168
393
#             self.open()
169
394
        else:
170
395
            return key
186
411
    "down" key presses, thus not allowing any containing widgets to
187
412
    use them as an excuse to shift focus away from this widget.
188
413
    """
189
 
    def keypress(self, (maxcol, maxrow), key):
190
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
191
 
        if ret in (u"up", u"down"):
 
414
    def keypress(self, maxcolrow, key):
 
415
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
416
        if ret in ("up", "down"):
192
417
            return
193
418
        return ret
194
419
 
203
428
        self.screen = urwid.curses_display.Screen()
204
429
        
205
430
        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")),
 
431
                ("normal",
 
432
                 "default", "default", None),
 
433
                ("bold",
 
434
                 "default", "default", "bold"),
 
435
                ("underline-blink",
 
436
                 "default", "default", "underline"),
 
437
                ("standout",
 
438
                 "default", "default", "standout"),
 
439
                ("bold-underline-blink",
 
440
                 "default", "default", ("bold", "underline")),
 
441
                ("bold-standout",
 
442
                 "default", "default", ("bold", "standout")),
 
443
                ("underline-blink-standout",
 
444
                 "default", "default", ("underline", "standout")),
 
445
                ("bold-underline-blink-standout",
 
446
                 "default", "default", ("bold", "underline",
 
447
                                          "standout")),
223
448
                ))
224
449
        
225
450
        if urwid.supports_unicode():
226
 
            #self.divider = u"─" # \u2500
227
 
            self.divider = u"━" # \u2501
 
451
            self.divider = "─" # \u2500
 
452
            #self.divider = "━" # \u2501
228
453
        else:
229
 
            #self.divider = u"-" # \u002d
230
 
            self.divider = u"_" # \u005f
 
454
            #self.divider = "-" # \u002d
 
455
            self.divider = "_" # \u005f
231
456
        
232
457
        self.screen.start()
233
458
        
247
472
        # This keeps track of whether self.uilist currently has
248
473
        # self.logbox in it or not
249
474
        self.log_visible = True
250
 
        self.log_wrap = u"any"
 
475
        self.log_wrap = "any"
251
476
        
252
477
        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")
 
478
        self.log_message_raw(("bold",
 
479
                              "Mandos Monitor version " + version))
 
480
        self.log_message_raw(("bold",
 
481
                              "q: Quit  ?: Help"))
257
482
        
258
483
        self.busname = domain + '.Mandos'
259
484
        self.main_loop = gobject.MainLoop()
260
485
        self.bus = dbus.SystemBus()
261
486
        mandos_dbus_objc = self.bus.get_object(
262
 
            self.busname, u"/", follow_name_owner_changes=True)
 
487
            self.busname, "/", follow_name_owner_changes=True)
263
488
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
264
489
                                          dbus_interface
265
490
                                          = server_interface)
279
504
                            self.add_new_client,
280
505
                            dbus_interface=server_interface,
281
506
                            byte_arrays=True))
 
507
        (self.mandos_serv
 
508
         .connect_to_signal("ClientNotFound",
 
509
                            self.client_not_found,
 
510
                            dbus_interface=server_interface,
 
511
                            byte_arrays=True))
282
512
        for path, client in mandos_clients.iteritems():
283
513
            client_proxy_object = self.bus.get_object(self.busname,
284
514
                                                      path)
290
520
                                               update_hook
291
521
                                               =self.refresh,
292
522
                                               delete_hook
293
 
                                               =self.remove_client),
 
523
                                               =self.remove_client,
 
524
                                               logger
 
525
                                               =self.log_message),
294
526
                            path=path)
295
527
    
 
528
    def client_not_found(self, fingerprint, address):
 
529
        self.log_message(("Client with address %s and fingerprint %s"
 
530
                          " could not be found" % (address,
 
531
                                                    fingerprint)))
 
532
    
296
533
    def rebuild(self):
297
534
        """This rebuilds the User Interface.
298
535
        Call this when the widget layout needs to change"""
299
536
        self.uilist = []
300
537
        #self.uilist.append(urwid.ListBox(self.clients))
301
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
538
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
539
                                                          clients),
302
540
                                       #header=urwid.Divider(),
303
541
                                       header=None,
304
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
542
                                       footer=
 
543
                                       urwid.Divider(div_char=
 
544
                                                     self.divider)))
305
545
        if self.log_visible:
306
546
            self.uilist.append(self.logbox)
307
547
            pass
308
548
        self.topwidget = urwid.Pile(self.uilist)
309
549
    
310
 
    def log_message(self, markup):
 
550
    def log_message(self, message):
 
551
        timestamp = datetime.datetime.now().isoformat()
 
552
        self.log_message_raw(timestamp + ": " + message)
 
553
    
 
554
    def log_message_raw(self, markup):
311
555
        """Add a log message to the log buffer."""
312
556
        self.log.append(urwid.Text(markup, wrap=self.log_wrap))
313
557
        if (self.max_log_length
314
558
            and len(self.log) > self.max_log_length):
315
559
            del self.log[0:len(self.log)-self.max_log_length-1]
 
560
        self.logbox.set_focus(len(self.logbox.body.contents),
 
561
                              coming_from="above")
 
562
        self.refresh()
316
563
    
317
564
    def toggle_log_display(self):
318
565
        """Toggle visibility of the log buffer."""
319
566
        self.log_visible = not self.log_visible
320
567
        self.rebuild()
321
 
        self.log_message(u"Log visibility changed to: "
322
 
                         + unicode(self.log_visible))
 
568
        #self.log_message("Log visibility changed to: "
 
569
        #                 + unicode(self.log_visible))
323
570
    
324
571
    def change_log_display(self):
325
572
        """Change type of log display.
326
573
        Currently, this toggles wrapping of text lines."""
327
 
        if self.log_wrap == u"clip":
328
 
            self.log_wrap = u"any"
 
574
        if self.log_wrap == "clip":
 
575
            self.log_wrap = "any"
329
576
        else:
330
 
            self.log_wrap = u"clip"
 
577
            self.log_wrap = "clip"
331
578
        for textwidget in self.log:
332
579
            textwidget.set_wrap_mode(self.log_wrap)
333
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
580
        #self.log_message("Wrap mode: " + self.log_wrap)
334
581
    
335
582
    def find_and_remove_client(self, path, name):
336
583
        """Find an client from its object path and remove it.
344
591
            return
345
592
        self.remove_client(client, path)
346
593
    
347
 
    def add_new_client(self, path, properties):
 
594
    def add_new_client(self, path):
348
595
        client_proxy_object = self.bus.get_object(self.busname, path)
349
596
        self.add_client(MandosClientWidget(server_proxy_object
350
597
                                           =self.mandos_serv,
351
598
                                           proxy_object
352
599
                                           =client_proxy_object,
353
 
                                           properties=properties,
354
600
                                           update_hook
355
601
                                           =self.refresh,
356
602
                                           delete_hook
357
 
                                           =self.remove_client),
 
603
                                           =self.remove_client,
 
604
                                           logger
 
605
                                           =self.log_message),
358
606
                        path=path)
359
607
    
360
608
    def add_client(self, client, path=None):
362
610
        if path is None:
363
611
            path = client.proxy.object_path
364
612
        self.clients_dict[path] = client
365
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
613
        self.clients.sort(None, lambda c: c.properties["Name"])
366
614
        self.refresh()
367
615
    
368
616
    def remove_client(self, client, path=None):
399
647
    
400
648
    def process_input(self, source, condition):
401
649
        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
 
650
        translations = { "ctrl n": "down",      # Emacs
 
651
                         "ctrl p": "up",        # Emacs
 
652
                         "ctrl v": "page down", # Emacs
 
653
                         "meta v": "page up",   # Emacs
 
654
                         " ": "page down",      # less
 
655
                         "f": "page down",      # less
 
656
                         "b": "page up",        # less
 
657
                         "j": "down",           # vi
 
658
                         "k": "up",             # vi
411
659
                         }
412
660
        for key in keys:
413
661
            try:
415
663
            except KeyError:    # :-)
416
664
                pass
417
665
            
418
 
            if key == u"q" or key == u"Q":
 
666
            if key == "q" or key == "Q":
419
667
                self.stop()
420
668
                break
421
 
            elif key == u"window resize":
 
669
            elif key == "window resize":
422
670
                self.size = self.screen.get_cols_rows()
423
671
                self.refresh()
424
 
            elif key == u"\f":  # Ctrl-L
 
672
            elif key == "\f":  # Ctrl-L
425
673
                self.refresh()
426
 
            elif key == u"l" or key == u"D":
 
674
            elif key == "l" or key == "D":
427
675
                self.toggle_log_display()
428
676
                self.refresh()
429
 
            elif key == u"w" or key == u"i":
 
677
            elif key == "w" or key == "i":
430
678
                self.change_log_display()
431
679
                self.refresh()
432
 
            elif key == u"?" or key == u"f1":
433
 
                self.log_message(u"Help!")
 
680
            elif key == "?" or key == "f1" or key == "esc":
 
681
                if not self.log_visible:
 
682
                    self.log_visible = True
 
683
                    self.rebuild()
 
684
                self.log_message_raw(("bold",
 
685
                                      "  ".
 
686
                                      join(("q: Quit",
 
687
                                            "?: Help",
 
688
                                            "l: Log window toggle",
 
689
                                            "TAB: Switch window",
 
690
                                            "w: Wrap (log)"))))
 
691
                self.log_message_raw(("bold",
 
692
                                      "  "
 
693
                                      .join(("Clients:",
 
694
                                             "+: Enable",
 
695
                                             "-: Disable",
 
696
                                             "R: Remove",
 
697
                                             "s: Start new checker",
 
698
                                             "S: Stop checker",
 
699
                                             "C: Checker OK",
 
700
                                             "a: Approve",
 
701
                                             "d: Deny"))))
434
702
                self.refresh()
435
 
            elif key == u"tab":
 
703
            elif key == "tab":
436
704
                if self.topwidget.get_focus() is self.logbox:
437
705
                    self.topwidget.set_focus(0)
438
706
                else:
439
707
                    self.topwidget.set_focus(self.logbox)
440
708
                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
 
709
            #elif (key == "end" or key == "meta >" or key == "G"
 
710
            #      or key == ">"):
 
711
            #    pass            # xxx end-of-buffer
 
712
            #elif (key == "home" or key == "meta <" or key == "g"
 
713
            #      or key == "<"):
 
714
            #    pass            # xxx beginning-of-buffer
 
715
            #elif key == "ctrl e" or key == "$":
 
716
            #    pass            # xxx move-end-of-line
 
717
            #elif key == "ctrl a" or key == "^":
 
718
            #    pass            # xxx move-beginning-of-line
 
719
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
720
            #    pass            # xxx left
 
721
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
722
            #    pass            # xxx right
 
723
            #elif key == "a":
 
724
            #    pass            # scroll up log
 
725
            #elif key == "z":
 
726
            #    pass            # scroll down log
459
727
            elif self.topwidget.selectable():
460
728
                self.topwidget.keypress(self.size, key)
461
729
                self.refresh()
464
732
ui = UserInterface()
465
733
try:
466
734
    ui.run()
467
 
except:
 
735
except KeyboardInterrupt:
 
736
    ui.screen.stop()
 
737
except Exception, e:
 
738
    ui.log_message(unicode(e))
468
739
    ui.screen.stop()
469
740
    raise