/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: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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