/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: White space and other misc. format fixes only.

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