/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: 2014-07-15 23:52:00 UTC
  • Revision ID: teddy@recompile.se-20140715235200-4dukd7i2tvbcix61
mandos-client: Bug Fix: Fix some memory leaks.

* plugins.d/mandos-client.c (resolve_callback): Always free resolver.
  (run_network_hooks): Free the individual direntries.
  (main): When listing network interfaces and when removing the GPGME
          temp directory, free the individual direntries.

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