/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: 2009-11-09 07:35:16 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091109073516-v1vem352uz0vuwrd
* dbus-mandos.conf: New; to be copied to
                    "/etc/dbus-1/system.d/mandos.conf".

Show diffs side-by-side

added added

removed removed

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