/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos-monitor

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