/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2015-06-28 16:35:27 UTC
  • mto: (237.7.307 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150628163527-cky0ec59zew7teua
Add a plugin helper directory, available to all plugins.

* Makefile (PLUGIN_HELPERS): New; list of plugin helpers.
  (CPROGS): Appended "$(PLUGIN_HELPERS)".
* initramfs-tools-hook: Create new plugin helper directory, and copy
                        plugin helpers provided by the system and/or
                        by the local administrator.
  (PLUGINHELPERDIR): New.
* plugin-runner.c: Take new --plugin-helper-dir option and provide
                   environment variable to all plugins.
  (PHDIR): New; set to "/lib/mandos/plugin-helpers".
  (main/pluginhelperdir): New.
  (main/options): New option "--plugin-helper-dir".
  (main/parse_opt, main/parse_opt_config_file): Accept new option.
  (main): Use new option to set MANDOSPLUGINHELPERDIR environment
          variable as if using --global-env MANDOSPLUGINHELPERDIR=...
* plugin-runner.xml: Document new --plugin-helper-dir option.
  (SYNOPSIS, OPTIONS): Add "--plugin-helper-dir" option.
  (PLUGINS/WRITING PLUGINS): Document new environment variable
                             available to plugins.
  (ENVIRONMENT): Document new environment variable
                 "MANDOSPLUGINHELPERDIR" affected by the new
                 --plugin-helper-dir option.

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