/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 (main.cleanup): Use tempfile.NamedTemporaryFile() instead of
                         tempfile.mkstemp().

Show diffs side-by-side

added added

removed removed

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