/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: 2017-08-20 14:14:14 UTC
  • Revision ID: teddy@recompile.se-20170820141414-m034xuebg7ccaeui
Add some more restrictions to the systemd service file.

* mandos.service ([Service]/ProtectKernelTunables): New; set to "yes".
  ([Service]/ProtectControlGroups): - '' -

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