/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: 2014-08-09 23:37:07 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: teddy@recompile.se-20140809233707-6c5qyievp78lnzf1
askpass-fifo: Lower privileges after opening FIFO.

* plugins.d/askpass-fifo.c (main): Lower privileges after opening FIFO.

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
 
#
 
5
# 
 
6
# Copyright © 2009-2014 Teddy Hogeborn
 
7
# Copyright © 2009-2014 Björn Påhlsson
 
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
11
11
# the Free Software Foundation, either version 3 of the License, or
15
15
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
16
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
17
#     GNU General Public License for more details.
18
 
#
 
18
# 
19
19
# You should have received a copy of the GNU General Public License
20
20
# along with this program.  If not, see
21
21
# <http://www.gnu.org/licenses/>.
22
 
#
 
22
# 
23
23
# Contact the authors at <mandos@recompile.se>.
24
 
#
 
24
# 
25
25
 
26
26
from __future__ import (division, absolute_import, print_function,
27
27
                        unicode_literals)
39
39
import urwid
40
40
 
41
41
from dbus.mainloop.glib import DBusGMainLoop
42
 
from gi.repository import GLib
 
42
try:
 
43
    import gobject
 
44
except ImportError:
 
45
    from gi.repository import GObject as gobject
43
46
 
44
47
import dbus
45
48
 
46
49
import locale
47
50
 
48
 
import logging
49
 
 
50
51
if sys.version_info.major == 2:
51
52
    str = unicode
52
53
 
53
54
locale.setlocale(locale.LC_ALL, '')
54
55
 
 
56
import logging
55
57
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
56
58
 
57
59
# Some useful constants
58
60
domain = 'se.recompile'
59
61
server_interface = domain + '.Mandos'
60
62
client_interface = domain + '.Mandos.Client'
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
 
 
 
63
version = "1.6.8"
68
64
 
69
65
def isoformat_to_datetime(iso):
70
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
79
75
                             int(day),
80
76
                             int(hour),
81
77
                             int(minute),
82
 
                             int(second),            # Whole seconds
83
 
                             int(fraction*1000000))  # Microseconds
84
 
 
 
78
                             int(second),           # Whole seconds
 
79
                             int(fraction*1000000)) # Microseconds
85
80
 
86
81
class MandosClientPropertyCache(object):
87
82
    """This wraps a Mandos Client D-Bus proxy object, caches the
89
84
    changed.
90
85
    """
91
86
    def __init__(self, proxy_object=None, properties=None, **kwargs):
92
 
        self.proxy = proxy_object  # Mandos Client proxy object
 
87
        self.proxy = proxy_object # Mandos Client proxy object
93
88
        self.properties = dict() if properties is None else properties
94
89
        self.property_changed_match = (
95
 
            self.proxy.connect_to_signal("PropertiesChanged",
96
 
                                         self.properties_changed,
97
 
                                         dbus.PROPERTIES_IFACE,
 
90
            self.proxy.connect_to_signal("PropertyChanged",
 
91
                                         self._property_changed,
 
92
                                         client_interface,
98
93
                                         byte_arrays=True))
99
 
 
 
94
        
100
95
        if properties is None:
101
 
            self.properties.update(self.proxy.GetAll(
102
 
                client_interface,
103
 
                dbus_interface=dbus.PROPERTIES_IFACE))
104
 
 
 
96
            self.properties.update(
 
97
                self.proxy.GetAll(client_interface,
 
98
                                  dbus_interface
 
99
                                  = dbus.PROPERTIES_IFACE))
 
100
        
105
101
        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.
 
102
    
 
103
    def _property_changed(self, property, value):
 
104
        """Helper which takes positional arguments"""
 
105
        return self.property_changed(property=property, value=value)
 
106
    
 
107
    def property_changed(self, property=None, value=None):
 
108
        """This is called whenever we get a PropertyChanged signal
 
109
        It updates the changed property in the "properties" dict.
110
110
        """
111
111
        # Update properties dict with new value
112
 
        if interface == client_interface:
113
 
            self.properties.update(properties)
114
 
 
 
112
        self.properties[property] = value
 
113
    
115
114
    def delete(self):
116
115
        self.property_changed_match.remove()
117
116
 
119
118
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
120
119
    """A Mandos Client which is visible on the screen.
121
120
    """
122
 
 
 
121
    
123
122
    def __init__(self, server_proxy_object=None, update_hook=None,
124
123
                 delete_hook=None, logger=None, **kwargs):
125
124
        # Called on update
130
129
        self.server_proxy_object = server_proxy_object
131
130
        # Logger
132
131
        self.logger = logger
133
 
 
 
132
        
134
133
        self._update_timer_callback_tag = None
135
 
 
 
134
        
136
135
        # The widget shown normally
137
136
        self._text_widget = urwid.Text("")
138
137
        # The widget shown when we have focus
140
139
        super(MandosClientWidget, self).__init__(**kwargs)
141
140
        self.update()
142
141
        self.opened = False
143
 
 
 
142
        
144
143
        self.match_objects = (
145
144
            self.proxy.connect_to_signal("CheckerCompleted",
146
145
                                         self.checker_completed,
164
163
                                         byte_arrays=True))
165
164
        self.logger('Created client {}'
166
165
                    .format(self.properties["Name"]), level=0)
167
 
 
 
166
    
168
167
    def using_timer(self, flag):
169
168
        """Call this method with True or False when timer should be
170
169
        activated or deactivated.
171
170
        """
172
171
        if flag and self._update_timer_callback_tag is None:
173
172
            # Will update the shown timer value every second
174
 
            self._update_timer_callback_tag = (GLib.timeout_add
 
173
            self._update_timer_callback_tag = (gobject.timeout_add
175
174
                                               (1000,
176
175
                                                self.update_timer))
177
176
        elif not (flag or self._update_timer_callback_tag is None):
178
 
            GLib.source_remove(self._update_timer_callback_tag)
 
177
            gobject.source_remove(self._update_timer_callback_tag)
179
178
            self._update_timer_callback_tag = None
180
 
 
 
179
    
181
180
    def checker_completed(self, exitstatus, condition, command):
182
181
        if exitstatus == 0:
183
182
            self.logger('Checker for client {} (command "{}")'
196
195
                        ' killed by signal {}'
197
196
                        .format(self.properties["Name"], command,
198
197
                                os.WTERMSIG(condition)))
 
198
        elif os.WCOREDUMP(condition):
 
199
            self.logger('Checker for client {} (command "{}") dumped'
 
200
                        ' core'.format(self.properties["Name"],
 
201
                                       command))
 
202
        else:
 
203
            self.logger('Checker for client {} completed'
 
204
                        ' mysteriously'
 
205
                        .format(self.properties["Name"]))
199
206
        self.update()
200
 
 
 
207
    
201
208
    def checker_started(self, command):
202
209
        """Server signals that a checker started."""
203
210
        self.logger('Client {} started checker "{}"'
204
211
                    .format(self.properties["Name"],
205
212
                            command), level=0)
206
 
 
 
213
    
207
214
    def got_secret(self):
208
215
        self.logger('Client {} 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
220
            message = 'Client {} needs approval within {} seconds'
215
222
            message = 'Client {} will get its secret in {} seconds'
216
223
        self.logger(message.format(self.properties["Name"],
217
224
                                   timeout/1000))
218
 
 
 
225
    
219
226
    def rejected(self, reason):
220
227
        self.logger('Client {} was rejected; reason: {}'
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:
289
297
            message = "enabled"
290
298
            self.using_timer(False)
291
299
        self._text = "{}{}".format(base, message)
292
 
 
 
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
405
406
    """
406
407
    def __init__(self, max_log_length=1000, log_level=1):
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
 
 
 
450
        
449
451
        self.log_level = log_level
450
 
 
 
452
        
451
453
        # We keep a reference to the log widget so we can remove it
452
454
        # from the ListWalker without it getting destroyed
453
455
        self.logbox = ConstrainedListBox(self.log)
454
 
 
 
456
        
455
457
        # This keeps track of whether self.uilist currently has
456
458
        # self.logbox in it or not
457
459
        self.log_visible = True
458
460
        self.log_wrap = "any"
459
 
 
 
461
        
460
462
        self.rebuild()
461
463
        self.log_message_raw(("bold",
462
464
                              "Mandos Monitor version " + version))
463
465
        self.log_message_raw(("bold",
464
466
                              "q: Quit  ?: Help"))
465
 
 
 
467
        
466
468
        self.busname = domain + '.Mandos'
467
 
        self.main_loop = GLib.MainLoop()
468
 
 
 
469
        self.main_loop = gobject.MainLoop()
 
470
    
469
471
    def client_not_found(self, fingerprint, address):
470
472
        self.log_message("Client with address {} and fingerprint {}"
471
473
                         " could not be found"
472
474
                         .format(address, fingerprint))
473
 
 
 
475
    
474
476
    def rebuild(self):
475
477
        """This rebuilds the User Interface.
476
478
        Call this when the widget layout needs to change"""
477
479
        self.uilist = []
478
 
        # self.uilist.append(urwid.ListBox(self.clients))
 
480
        #self.uilist.append(urwid.ListBox(self.clients))
479
481
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
480
482
                                                          clients),
481
 
                                       # header=urwid.Divider(),
 
483
                                       #header=urwid.Divider(),
482
484
                                       header=None,
483
 
                                       footer=urwid.Divider(
484
 
                                           div_char=self.divider)))
 
485
                                       footer=
 
486
                                       urwid.Divider(div_char=
 
487
                                                     self.divider)))
485
488
        if self.log_visible:
486
489
            self.uilist.append(self.logbox)
487
490
        self.topwidget = urwid.Pile(self.uilist)
488
 
 
 
491
    
489
492
    def log_message(self, message, level=1):
490
493
        """Log message formatted with timestamp"""
491
494
        if level < self.log_level:
493
496
        timestamp = datetime.datetime.now().isoformat()
494
497
        self.log_message_raw("{}: {}".format(timestamp, message),
495
498
                             level=level)
496
 
 
 
499
    
497
500
    def log_message_raw(self, markup, level=1):
498
501
        """Add a log message to the log buffer."""
499
502
        if level < self.log_level:
500
503
            return
501
504
        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]
 
505
        if (self.max_log_length
 
506
            and len(self.log) > self.max_log_length):
 
507
            del self.log[0:len(self.log)-self.max_log_length-1]
505
508
        self.logbox.set_focus(len(self.logbox.body.contents),
506
509
                              coming_from="above")
507
510
        self.refresh()
508
 
 
 
511
    
509
512
    def toggle_log_display(self):
510
513
        """Toggle visibility of the log buffer."""
511
514
        self.log_visible = not self.log_visible
512
515
        self.rebuild()
513
516
        self.log_message("Log visibility changed to: {}"
514
517
                         .format(self.log_visible), level=0)
515
 
 
 
518
    
516
519
    def change_log_display(self):
517
520
        """Change type of log display.
518
521
        Currently, this toggles wrapping of text lines."""
524
527
            textwidget.set_wrap_mode(self.log_wrap)
525
528
        self.log_message("Wrap mode: {}".format(self.log_wrap),
526
529
                         level=0)
527
 
 
528
 
    def find_and_remove_client(self, path, interfaces):
 
530
    
 
531
    def find_and_remove_client(self, path, name):
529
532
        """Find a client by its object path and remove it.
530
 
 
531
 
        This is connected to the InterfacesRemoved signal from the
 
533
        
 
534
        This is connected to the ClientRemoved signal from the
532
535
        Mandos server object."""
533
 
        if client_interface not in interfaces:
534
 
            # Not a Mandos client object; ignore
535
 
            return
536
536
        try:
537
537
            client = self.clients_dict[path]
538
538
        except KeyError:
539
539
            # not found?
540
 
            self.log_message("Unknown client {!r} removed"
541
 
                             .format(path))
 
540
            self.log_message("Unknown client {!r} ({!r}) removed"
 
541
                             .format(name, path))
542
542
            return
543
543
        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
 
544
    
 
545
    def add_new_client(self, path):
554
546
        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])),
 
547
        self.add_client(MandosClientWidget(server_proxy_object
 
548
                                           =self.mandos_serv,
 
549
                                           proxy_object
 
550
                                           =client_proxy_object,
 
551
                                           update_hook
 
552
                                           =self.refresh,
 
553
                                           delete_hook
 
554
                                           =self.remove_client,
 
555
                                           logger
 
556
                                           =self.log_message),
562
557
                        path=path)
563
 
 
 
558
    
564
559
    def add_client(self, client, path=None):
565
560
        self.clients.append(client)
566
561
        if path is None:
568
563
        self.clients_dict[path] = client
569
564
        self.clients.sort(key=lambda c: c.properties["Name"])
570
565
        self.refresh()
571
 
 
 
566
    
572
567
    def remove_client(self, client, path=None):
573
568
        self.clients.remove(client)
574
569
        if path is None:
575
570
            path = client.proxy.object_path
576
571
        del self.clients_dict[path]
577
572
        self.refresh()
578
 
 
 
573
    
579
574
    def refresh(self):
580
575
        """Redraw the screen"""
581
576
        canvas = self.topwidget.render(self.size, focus=True)
582
577
        self.screen.draw_screen(self.size, canvas)
583
 
 
 
578
    
584
579
    def run(self):
585
580
        """Start the main loop and exit when it's done."""
586
581
        self.bus = dbus.SystemBus()
587
582
        mandos_dbus_objc = self.bus.get_object(
588
583
            self.busname, "/", follow_name_owner_changes=True)
589
 
        self.mandos_serv = dbus.Interface(
590
 
            mandos_dbus_objc, dbus_interface=server_interface)
 
584
        self.mandos_serv = dbus.Interface(mandos_dbus_objc,
 
585
                                          dbus_interface
 
586
                                          = server_interface)
591
587
        try:
592
588
            mandos_clients = (self.mandos_serv
593
589
                              .GetAllClientsWithProperties())
594
590
            if not mandos_clients:
595
 
                self.log_message_raw(("bold",
596
 
                                      "Note: Server has no clients."))
 
591
                self.log_message_raw(("bold", "Note: Server has no clients."))
597
592
        except dbus.exceptions.DBusException:
598
 
            self.log_message_raw(("bold",
599
 
                                  "Note: No Mandos server running."))
 
593
            self.log_message_raw(("bold", "Note: No Mandos server running."))
600
594
            mandos_clients = dbus.Dictionary()
601
 
 
 
595
        
602
596
        (self.mandos_serv
603
 
         .connect_to_signal("InterfacesRemoved",
 
597
         .connect_to_signal("ClientRemoved",
604
598
                            self.find_and_remove_client,
605
 
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
599
                            dbus_interface=server_interface,
606
600
                            byte_arrays=True))
607
601
        (self.mandos_serv
608
 
         .connect_to_signal("InterfacesAdded",
 
602
         .connect_to_signal("ClientAdded",
609
603
                            self.add_new_client,
610
 
                            dbus_interface=dbus.OBJECT_MANAGER_IFACE,
 
604
                            dbus_interface=server_interface,
611
605
                            byte_arrays=True))
612
606
        (self.mandos_serv
613
607
         .connect_to_signal("ClientNotFound",
617
611
        for path, client in mandos_clients.items():
618
612
            client_proxy_object = self.bus.get_object(self.busname,
619
613
                                                      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),
 
614
            self.add_client(MandosClientWidget(server_proxy_object
 
615
                                               =self.mandos_serv,
 
616
                                               proxy_object
 
617
                                               =client_proxy_object,
 
618
                                               properties=client,
 
619
                                               update_hook
 
620
                                               =self.refresh,
 
621
                                               delete_hook
 
622
                                               =self.remove_client,
 
623
                                               logger
 
624
                                               =self.log_message),
627
625
                            path=path)
628
 
 
 
626
        
629
627
        self.refresh()
630
 
        self._input_callback_tag = (GLib.io_add_watch
 
628
        self._input_callback_tag = (gobject.io_add_watch
631
629
                                    (sys.stdin.fileno(),
632
 
                                     GLib.IO_IN,
 
630
                                     gobject.IO_IN,
633
631
                                     self.process_input))
634
632
        self.main_loop.run()
635
633
        # Main loop has finished, we should close everything now
636
 
        GLib.source_remove(self._input_callback_tag)
 
634
        gobject.source_remove(self._input_callback_tag)
637
635
        self.screen.stop()
638
 
 
 
636
    
639
637
    def stop(self):
640
638
        self.main_loop.quit()
641
 
 
 
639
    
642
640
    def process_input(self, source, condition):
643
641
        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
 
                        }
 
642
        translations = { "ctrl n": "down",      # Emacs
 
643
                         "ctrl p": "up",        # Emacs
 
644
                         "ctrl v": "page down", # Emacs
 
645
                         "meta v": "page up",   # Emacs
 
646
                         " ": "page down",      # less
 
647
                         "f": "page down",      # less
 
648
                         "b": "page up",        # less
 
649
                         "j": "down",           # vi
 
650
                         "k": "up",             # vi
 
651
                         }
654
652
        for key in keys:
655
653
            try:
656
654
                key = translations[key]
657
655
            except KeyError:    # :-)
658
656
                pass
659
 
 
 
657
            
660
658
            if key == "q" or key == "Q":
661
659
                self.stop()
662
660
                break
710
708
                else:
711
709
                    self.log_level = 0
712
710
                    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
            #elif (key == "end" or key == "meta >" or key == "G"
 
712
            #      or key == ">"):
 
713
            #    pass            # xxx end-of-buffer
 
714
            #elif (key == "home" or key == "meta <" or key == "g"
 
715
            #      or key == "<"):
 
716
            #    pass            # xxx beginning-of-buffer
 
717
            #elif key == "ctrl e" or key == "$":
 
718
            #    pass            # xxx move-end-of-line
 
719
            #elif key == "ctrl a" or key == "^":
 
720
            #    pass            # xxx move-beginning-of-line
 
721
            #elif key == "ctrl b" or key == "meta (" or key == "h":
 
722
            #    pass            # xxx left
 
723
            #elif key == "ctrl f" or key == "meta )" or key == "l":
 
724
            #    pass            # xxx right
 
725
            #elif key == "a":
 
726
            #    pass            # scroll up log
 
727
            #elif key == "z":
 
728
            #    pass            # scroll down log
731
729
            elif self.topwidget.selectable():
732
730
                self.topwidget.keypress(self.size, key)
733
731
                self.refresh()
734
732
        return True
735
733
 
736
 
 
737
734
ui = UserInterface()
738
735
try:
739
736
    ui.run()