/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

* mandos-ctl: Use new string format method.  Bug fix: --version now
              shows the program name.

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