/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: 2013-10-26 19:05:21 UTC
  • Revision ID: teddy@recompile.se-20131026190521-giagilisbyciox2h
Fall back to /var/run for pidfile if /run is not a directory.

This is for old (possibly non-Debian) systems which have not migrated
from /var/run to /run yet.

* init.d-mandos (PIDFILE): Fall back to /var/run/mandos.pid if /run is
                           not a directory.
* mandos (pidfilename): - '' -
* mandos.xml (FILES): Document fallback to /var/run/mandos.pid if /run
                      is not a directory.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

Show diffs side-by-side

added added

removed removed

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