/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: 2016-10-09 22:35:41 UTC
  • Revision ID: teddy@recompile.se-20161009223541-2g2xrvfii5m5ibjw
Stop the GnuPG agent after Debian package installation

* debian/mandos-client.postinst (create_key): Stop GPG agent after
                                              running mandos-keygen.

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