/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: 2019-09-03 18:43:11 UTC
  • Revision ID: teddy@recompile.se-20190903184311-zr795sh32mmq2drk
mandos: Only join() still running checker processes

* mandos (Client.checker_callback): Only do .join() on checker if it
                                    is not None.

Show diffs side-by-side

added added

removed removed

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