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
- browse files at revision 708
- compare with another revision
- download diff
- download tarball
- view history from revision 708
- Committer: Teddy Hogeborn
- Date: 2014-06-22 02:19:30 UTC
- Revision ID: teddy@recompile.se-20140622021930-icl7h4cm97blhjml
mandos-keygen: Generate "checker" option to use SSH fingerprints.
To turn this off, use a new "--no-ssh" option to mandos-keygen.
* INSTALL (Mandos Server, Mandos Client): Document new suggested
installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
"mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
(mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
called "Faking ping
replies?" to address new
default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
behavior of
mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
"sec*", since no such files may exist.
(password mode): Scan for SSH key fingerprints and output as new
"checker" and "ssh_fingerprint" options, unless new
"--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
(OPTIONS/--no-ssh): New.
(SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
possibility of using SSH key
fingerprints for checking.
To turn this off, use a new "--no-ssh" option to mandos-keygen.
* INSTALL (Mandos Server, Mandos Client): Document new suggested
installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
"mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
(mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
called "Faking ping
replies?" to address new
default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
behavior of
mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
"sec*", since no such files may exist.
(password mode): Scan for SSH key fingerprints and output as new
"checker" and "ssh_fingerprint" options, unless new
"--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
(OPTIONS/--no-ssh): New.
(SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
possibility of using SSH key
fingerprints for checking.
added
removed
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-2016 Teddy Hogeborn
7
# Copyright © 2009-2016 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
if sys.version_info.major == 2:
51
if sys.version_info[0] == 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.12"
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.5"
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,
162
161
self.rejected,
163
162
client_interface,
164
163
byte_arrays=True))
165
self.logger('Created client {}'
166
.format(self.properties["Name"]), level=0)
167
164
#self.logger('Created client {0}'
165
# .format(self.properties["Name"]))
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
self.logger('Checker for client {} (command "{}")'
184
' succeeded'.format(self.properties["Name"],
185
command), level=0)
186
182
self.update()
187
183
return
188
184
# Checker failed
189
185
if os.WIFEXITED(condition):
190
self.logger('Checker for client {} (command "{}") failed'
191
' with exit code {}'
186
self.logger('Checker for client {0} (command "{1}")'
187
' failed with exit code {2}'
192
188
.format(self.properties["Name"], command,
193
189
os.WEXITSTATUS(condition)))
194
190
elif os.WIFSIGNALED(condition):
195
self.logger('Checker for client {} (command "{}") was'
196
' killed by signal {}'
191
self.logger('Checker for client {0} (command "{1}") was'
192
' killed by signal {2}'
197
193
.format(self.properties["Name"], command,
198
194
os.WTERMSIG(condition)))
195
elif os.WCOREDUMP(condition):
196
self.logger('Checker for client {0} (command "{1}")'
197
' dumped core'
198
.format(self.properties["Name"], command))
199
else:
200
self.logger('Checker for client {0} completed'
201
' mysteriously'
202
.format(self.properties["Name"]))
199
203
self.update()
200
204
201
205
def checker_started(self, command):
202
"""Server signals that a checker started."""
203
self.logger('Client {} started checker "{}"'
204
.format(self.properties["Name"],
205
command), level=0)
206
206
"""Server signals that a checker started. This could be useful
207
to log in the future. """
208
#self.logger('Client {0} started checker "{1}"'
209
# .format(self.properties["Name"],
210
# str(command)))
211
pass
212
207
213
def got_secret(self):
208
self.logger('Client {} received its secret'
214
self.logger('Client {0} received its secret'
209
215
.format(self.properties["Name"]))
210
216
211
217
def need_approval(self, timeout, default):
212
218
if not default:
213
message = 'Client {} needs approval within {} seconds'
219
message = 'Client {0} needs approval within {1} seconds'
214
220
else:
215
message = 'Client {} will get its secret in {} seconds'
221
message = 'Client {0} will get its secret in {1} seconds'
216
222
self.logger(message.format(self.properties["Name"],
217
223
timeout/1000))
218
224
219
225
def rejected(self, reason):
220
self.logger('Client {} was rejected; reason: {}'
226
self.logger('Client {0} was rejected; reason: {1}'
221
227
.format(self.properties["Name"], reason))
222
228
223
229
def selectable(self):
224
230
"""Make this a "selectable" widget.
225
231
This overrides the method from urwid.FlowWidget."""
226
232
return True
227
233
228
234
def rows(self, maxcolrow, focus=False):
229
235
"""How many rows this widget will occupy might depend on
230
236
whether we have focus or not.
231
237
This overrides the method from urwid.FlowWidget"""
232
238
return self.current_widget(focus).rows(maxcolrow, focus=focus)
233
239
234
240
def current_widget(self, focus=False):
235
241
if focus or self.opened:
236
242
return self._focus_widget
237
243
return self._widget
238
244
239
245
def update(self):
240
246
"Called when what is visible on the screen should be updated."
241
247
# 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
248
with_standout = { "normal": "standout",
249
"bold": "bold-standout",
250
"underline-blink":
251
"underline-blink-standout",
252
"bold-underline-blink":
253
"bold-underline-blink-standout",
254
}
255
250
256
# Rebuild focus and non-focus widgets using current properties
251
257
252
258
# Base part of a client. Name!
253
259
base = '{name}: '.format(name=self.properties["Name"])
254
260
if not self.properties["Enabled"]:
255
261
message = "DISABLED"
256
262
self.using_timer(False)
257
263
elif self.properties["ApprovalPending"]:
258
timeout = datetime.timedelta(
259
milliseconds=self.properties["ApprovalDelay"])
264
timeout = datetime.timedelta(milliseconds
265
= self.properties
266
["ApprovalDelay"])
260
267
last_approval_request = isoformat_to_datetime(
261
268
self.properties["LastApprovalRequest"])
262
269
if last_approval_request is not None:
266
273
else:
267
274
timer = datetime.timedelta()
268
275
if self.properties["ApprovedByDefault"]:
269
message = "Approval in {}. (d)eny?"
276
message = "Approval in {0}. (d)eny?"
270
277
else:
271
message = "Denial in {}. (a)pprove?"
278
message = "Denial in {0}. (a)pprove?"
272
279
message = message.format(str(timer).rsplit(".", 1)[0])
273
280
self.using_timer(True)
274
281
elif self.properties["LastCheckerStatus"] != 0:
282
289
timer = max(expires - datetime.datetime.utcnow(),
283
290
datetime.timedelta())
284
291
message = ('A checker has failed! Time until client'
285
' gets disabled: {}'
292
' gets disabled: {0}'
286
293
.format(str(timer).rsplit(".", 1)[0]))
287
294
self.using_timer(True)
288
295
else:
289
296
message = "enabled"
290
297
self.using_timer(False)
291
self._text = "{}{}".format(base, message)
292
298
self._text = "{0}{1}".format(base, message)
299
293
300
if not urwid.supports_unicode():
294
301
self._text = self._text.encode("ascii", "replace")
295
302
textlist = [("normal", self._text)]
305
312
# Run update hook, if any
306
313
if self.update_hook is not None:
307
314
self.update_hook()
308
315
309
316
def update_timer(self):
310
"""called by GLib. Will indefinitely loop until
311
GLib.source_remove() on tag is called
312
"""
317
"""called by gobject. Will indefinitely loop until
318
gobject.source_remove() on tag is called"""
313
319
self.update()
314
320
return True # Keep calling this
315
321
316
322
def delete(self, **kwargs):
317
323
if self._update_timer_callback_tag is not None:
318
GLib.source_remove(self._update_timer_callback_tag)
324
gobject.source_remove(self._update_timer_callback_tag)
319
325
self._update_timer_callback_tag = None
320
326
for match in self.match_objects:
321
327
match.remove()
323
329
if self.delete_hook is not None:
324
330
self.delete_hook(self)
325
331
return super(MandosClientWidget, self).delete(**kwargs)
326
332
327
333
def render(self, maxcolrow, focus=False):
328
334
"""Render differently if we have focus.
329
335
This overrides the method from urwid.FlowWidget"""
330
336
return self.current_widget(focus).render(maxcolrow,
331
337
focus=focus)
332
338
333
339
def keypress(self, maxcolrow, key):
334
340
"""Handle keys.
335
341
This overrides the method from urwid.FlowWidget"""
336
342
if key == "+":
337
self.proxy.Set(client_interface, "Enabled",
338
dbus.Boolean(True), ignore_reply=True,
339
dbus_interface=dbus.PROPERTIES_IFACE)
343
self.proxy.Enable(dbus_interface = client_interface,
344
ignore_reply=True)
340
345
elif key == "-":
341
self.proxy.Set(client_interface, "Enabled", False,
342
ignore_reply=True,
343
dbus_interface=dbus.PROPERTIES_IFACE)
346
self.proxy.Disable(dbus_interface = client_interface,
347
ignore_reply=True)
344
348
elif key == "a":
345
349
self.proxy.Approve(dbus.Boolean(True, variant_level=1),
346
dbus_interface=client_interface,
350
dbus_interface = client_interface,
347
351
ignore_reply=True)
348
352
elif key == "d":
349
353
self.proxy.Approve(dbus.Boolean(False, variant_level=1),
350
dbus_interface=client_interface,
354
dbus_interface = client_interface,
351
355
ignore_reply=True)
352
356
elif key == "R" or key == "_" or key == "ctrl k":
353
357
self.server_proxy_object.RemoveClient(self.proxy
354
358
.object_path,
355
359
ignore_reply=True)
356
360
elif key == "s":
357
self.proxy.Set(client_interface, "CheckerRunning",
358
dbus.Boolean(True), ignore_reply=True,
359
dbus_interface=dbus.PROPERTIES_IFACE)
361
self.proxy.StartChecker(dbus_interface = client_interface,
362
ignore_reply=True)
360
363
elif key == "S":
361
self.proxy.Set(client_interface, "CheckerRunning",
362
dbus.Boolean(False), ignore_reply=True,
363
dbus_interface=dbus.PROPERTIES_IFACE)
364
self.proxy.StopChecker(dbus_interface = client_interface,
365
ignore_reply=True)
364
366
elif key == "C":
365
self.proxy.CheckedOK(dbus_interface=client_interface,
367
self.proxy.CheckedOK(dbus_interface = client_interface,
366
368
ignore_reply=True)
367
369
# xxx
368
370
# elif key == "p" or key == "=":
373
375
# self.open()
374
376
else:
375
377
return key
376
377
def properties_changed(self, interface, properties, invalidated):
378
"""Call self.update() if any properties changed.
378
379
def property_changed(self, property=None, **kwargs):
380
"""Call self.update() if old value is not new value.
379
381
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):
382
property_name = str(property)
383
old_value = self.properties.get(property_name)
384
super(MandosClientWidget, self).property_changed(
385
property=property, **kwargs)
386
if self.properties.get(property_name) != old_value:
386
387
self.update()
387
388
388
389
392
393
use them as an excuse to shift focus away from this widget.
393
394
"""
394
395
def keypress(self, *args, **kwargs):
395
ret = (super(ConstrainedListBox, self)
396
.keypress(*args, **kwargs))
396
ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
397
397
if ret in ("up", "down"):
398
398
return
399
399
return ret
403
403
"""This is the entire user interface - the whole screen
404
404
with boxes, lists of client widgets, etc.
405
405
"""
406
def __init__(self, max_log_length=1000, log_level=1):
406
def __init__(self, max_log_length=1000):
407
407
DBusGMainLoop(set_as_default=True)
408
408
409
409
self.screen = urwid.curses_display.Screen()
410
410
411
411
self.screen.register_palette((
412
412
("normal",
413
413
"default", "default", None),
418
418
("standout",
419
419
"standout", "default", "standout"),
420
420
("bold-underline-blink",
421
"bold,underline,blink", "default",
422
"bold,underline,blink"),
421
"bold,underline,blink", "default", "bold,underline,blink"),
423
422
("bold-standout",
424
423
"bold,standout", "default", "bold,standout"),
425
424
("underline-blink-standout",
429
428
"bold,underline,blink,standout", "default",
430
429
"bold,underline,blink,standout"),
431
430
))
432
431
433
432
if urwid.supports_unicode():
434
self.divider = "─" # \u2500
433
self.divider = "─" # \u2500
434
#self.divider = "━" # \u2501
435
435
else:
436
self.divider = "_" # \u005f
437
436
#self.divider = "-" # \u002d
437
self.divider = "_" # \u005f
438
438
439
self.screen.start()
439
440
440
441
self.size = self.screen.get_cols_rows()
441
442
442
443
self.clients = urwid.SimpleListWalker([])
443
444
self.clients_dict = {}
444
445
445
446
# We will add Text widgets to this list
446
447
self.log = []
447
448
self.max_log_length = max_log_length
448
449
self.log_level = log_level
450
449
451
450
# We keep a reference to the log widget so we can remove it
452
451
# from the ListWalker without it getting destroyed
453
452
self.logbox = ConstrainedListBox(self.log)
454
453
455
454
# This keeps track of whether self.uilist currently has
456
455
# self.logbox in it or not
457
456
self.log_visible = True
458
457
self.log_wrap = "any"
459
458
460
459
self.rebuild()
461
460
self.log_message_raw(("bold",
462
461
"Mandos Monitor version " + version))
463
462
self.log_message_raw(("bold",
464
463
"q: Quit ?: Help"))
465
464
466
465
self.busname = domain + '.Mandos'
467
self.main_loop = GLib.MainLoop()
468
466
self.main_loop = gobject.MainLoop()
467
469
468
def client_not_found(self, fingerprint, address):
470
self.log_message("Client with address {} and fingerprint {}"
471
" could not be found"
469
self.log_message("Client with address {0} and fingerprint"
470
" {1} could not be found"
472
471
.format(address, fingerprint))
473
472
474
473
def rebuild(self):
475
474
"""This rebuilds the User Interface.
476
475
Call this when the widget layout needs to change"""
477
476
self.uilist = []
478
# self.uilist.append(urwid.ListBox(self.clients))
477
#self.uilist.append(urwid.ListBox(self.clients))
479
478
self.uilist.append(urwid.Frame(ConstrainedListBox(self.
480
479
clients),
481
# header=urwid.Divider(),
480
#header=urwid.Divider(),
482
481
header=None,
483
footer=urwid.Divider(
484
div_char=self.divider)))
482
footer=
483
urwid.Divider(div_char=
484
self.divider)))
485
485
if self.log_visible:
486
486
self.uilist.append(self.logbox)
487
487
self.topwidget = urwid.Pile(self.uilist)
488
489
def log_message(self, message, level=1):
488
489
def log_message(self, message):
490
490
"""Log message formatted with timestamp"""
491
if level < self.log_level:
492
return
493
491
timestamp = datetime.datetime.now().isoformat()
494
self.log_message_raw("{}: {}".format(timestamp, message),
495
level=level)
496
497
def log_message_raw(self, markup, level=1):
492
self.log_message_raw(timestamp + ": " + message)
493
494
def log_message_raw(self, markup):
498
495
"""Add a log message to the log buffer."""
499
if level < self.log_level:
500
return
501
496
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]
497
if (self.max_log_length
498
and len(self.log) > self.max_log_length):
499
del self.log[0:len(self.log)-self.max_log_length-1]
505
500
self.logbox.set_focus(len(self.logbox.body.contents),
506
501
coming_from="above")
507
502
self.refresh()
508
503
509
504
def toggle_log_display(self):
510
505
"""Toggle visibility of the log buffer."""
511
506
self.log_visible = not self.log_visible
512
507
self.rebuild()
513
self.log_message("Log visibility changed to: {}"
514
.format(self.log_visible), level=0)
515
508
#self.log_message("Log visibility changed to: "
509
# + str(self.log_visible))
510
516
511
def change_log_display(self):
517
512
"""Change type of log display.
518
513
Currently, this toggles wrapping of text lines."""
522
517
self.log_wrap = "clip"
523
518
for textwidget in self.log:
524
519
textwidget.set_wrap_mode(self.log_wrap)
525
self.log_message("Wrap mode: {}".format(self.log_wrap),
526
level=0)
527
528
def find_and_remove_client(self, path, interfaces):
520
#self.log_message("Wrap mode: " + self.log_wrap)
521
522
def find_and_remove_client(self, path, name):
529
523
"""Find a client by its object path and remove it.
530
531
This is connected to the InterfacesRemoved signal from the
524
525
This is connected to the ClientRemoved signal from the
532
526
Mandos server object."""
533
if client_interface not in interfaces:
534
# Not a Mandos client object; ignore
535
return
536
527
try:
537
528
client = self.clients_dict[path]
538
529
except KeyError:
539
530
# not found?
540
self.log_message("Unknown client {!r} removed"
541
.format(path))
531
self.log_message("Unknown client {0!r} ({1!r}) removed"
532
.format(name, path))
542
533
return
543
534
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
535
536
def add_new_client(self, path):
554
537
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])),
538
self.add_client(MandosClientWidget(server_proxy_object
539
=self.mandos_serv,
540
proxy_object
541
=client_proxy_object,
542
update_hook
543
=self.refresh,
544
delete_hook
545
=self.remove_client,
546
logger
547
=self.log_message),
562
548
path=path)
563
549
564
550
def add_client(self, client, path=None):
565
551
self.clients.append(client)
566
552
if path is None:
568
554
self.clients_dict[path] = client
569
555
self.clients.sort(key=lambda c: c.properties["Name"])
570
556
self.refresh()
571
557
572
558
def remove_client(self, client, path=None):
573
559
self.clients.remove(client)
574
560
if path is None:
575
561
path = client.proxy.object_path
576
562
del self.clients_dict[path]
577
563
self.refresh()
578
564
579
565
def refresh(self):
580
566
"""Redraw the screen"""
581
567
canvas = self.topwidget.render(self.size, focus=True)
582
568
self.screen.draw_screen(self.size, canvas)
583
569
584
570
def run(self):
585
571
"""Start the main loop and exit when it's done."""
586
572
self.bus = dbus.SystemBus()
587
573
mandos_dbus_objc = self.bus.get_object(
588
574
self.busname, "/", follow_name_owner_changes=True)
589
self.mandos_serv = dbus.Interface(
590
mandos_dbus_objc, dbus_interface=server_interface)
575
self.mandos_serv = dbus.Interface(mandos_dbus_objc,
576
dbus_interface
577
= server_interface)
591
578
try:
592
579
mandos_clients = (self.mandos_serv
593
580
.GetAllClientsWithProperties())
594
581
if not mandos_clients:
595
self.log_message_raw(("bold",
596
"Note: Server has no clients."))
582
self.log_message_raw(("bold", "Note: Server has no clients."))
597
583
except dbus.exceptions.DBusException:
598
self.log_message_raw(("bold",
599
"Note: No Mandos server running."))
584
self.log_message_raw(("bold", "Note: No Mandos server running."))
600
585
mandos_clients = dbus.Dictionary()
601
586
602
587
(self.mandos_serv
603
.connect_to_signal("InterfacesRemoved",
588
.connect_to_signal("ClientRemoved",
604
589
self.find_and_remove_client,
605
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
590
dbus_interface=server_interface,
606
591
byte_arrays=True))
607
592
(self.mandos_serv
608
.connect_to_signal("InterfacesAdded",
593
.connect_to_signal("ClientAdded",
609
594
self.add_new_client,
610
dbus_interface=dbus.OBJECT_MANAGER_IFACE,
595
dbus_interface=server_interface,
611
596
byte_arrays=True))
612
597
(self.mandos_serv
613
598
.connect_to_signal("ClientNotFound",
617
602
for path, client in mandos_clients.items():
618
603
client_proxy_object = self.bus.get_object(self.busname,
619
604
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),
605
self.add_client(MandosClientWidget(server_proxy_object
606
=self.mandos_serv,
607
proxy_object
608
=client_proxy_object,
609
properties=client,
610
update_hook
611
=self.refresh,
612
delete_hook
613
=self.remove_client,
614
logger
615
=self.log_message),
627
616
path=path)
628
617
629
618
self.refresh()
630
self._input_callback_tag = (GLib.io_add_watch
619
self._input_callback_tag = (gobject.io_add_watch
631
620
(sys.stdin.fileno(),
632
GLib.IO_IN,
621
gobject.IO_IN,
633
622
self.process_input))
634
623
self.main_loop.run()
635
624
# Main loop has finished, we should close everything now
636
GLib.source_remove(self._input_callback_tag)
625
gobject.source_remove(self._input_callback_tag)
637
626
self.screen.stop()
638
627
639
628
def stop(self):
640
629
self.main_loop.quit()
641
630
642
631
def process_input(self, source, condition):
643
632
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
}
633
translations = { "ctrl n": "down", # Emacs
634
"ctrl p": "up", # Emacs
635
"ctrl v": "page down", # Emacs
636
"meta v": "page up", # Emacs
637
" ": "page down", # less
638
"f": "page down", # less
639
"b": "page up", # less
640
"j": "down", # vi
641
"k": "up", # vi
642
}
654
643
for key in keys:
655
644
try:
656
645
key = translations[key]
657
646
except KeyError: # :-)
658
647
pass
659
648
660
649
if key == "q" or key == "Q":
661
650
self.stop()
662
651
break
663
652
elif key == "window resize":
664
653
self.size = self.screen.get_cols_rows()
665
654
self.refresh()
666
elif key == "ctrl l":
667
self.screen.clear()
655
elif key == "\f": # Ctrl-L
668
656
self.refresh()
669
657
elif key == "l" or key == "D":
670
658
self.toggle_log_display()
682
670
"?: Help",
683
671
"l: Log window toggle",
684
672
"TAB: Switch window",
685
"w: Wrap (log lines)",
686
"v: Toggle verbose log",
687
))))
673
"w: Wrap (log)"))))
688
674
self.log_message_raw(("bold",
689
675
" "
690
676
.join(("Clients:",
703
689
else:
704
690
self.topwidget.set_focus(self.logbox)
705
691
self.refresh()
706
elif key == "v":
707
if self.log_level == 0:
708
self.log_level = 1
709
self.log_message("Verbose mode: Off")
710
else:
711
self.log_level = 0
712
self.log_message("Verbose mode: On")
713
# elif (key == "end" or key == "meta >" or key == "G"
714
# or key == ">"):
715
# pass # xxx end-of-buffer
716
# elif (key == "home" or key == "meta <" or key == "g"
717
# or key == "<"):
718
# pass # xxx beginning-of-buffer
719
# elif key == "ctrl e" or key == "$":
720
# pass # xxx move-end-of-line
721
# elif key == "ctrl a" or key == "^":
722
# pass # xxx move-beginning-of-line
723
# elif key == "ctrl b" or key == "meta (" or key == "h":
724
# pass # xxx left
725
# elif key == "ctrl f" or key == "meta )" or key == "l":
726
# pass # xxx right
727
# elif key == "a":
728
# pass # scroll up log
729
# elif key == "z":
730
# pass # scroll down log
692
#elif (key == "end" or key == "meta >" or key == "G"
693
# or key == ">"):
694
# pass # xxx end-of-buffer
695
#elif (key == "home" or key == "meta <" or key == "g"
696
# or key == "<"):
697
# pass # xxx beginning-of-buffer
698
#elif key == "ctrl e" or key == "$":
699
# pass # xxx move-end-of-line
700
#elif key == "ctrl a" or key == "^":
701
# pass # xxx move-beginning-of-line
702
#elif key == "ctrl b" or key == "meta (" or key == "h":
703
# pass # xxx left
704
#elif key == "ctrl f" or key == "meta )" or key == "l":
705
# pass # xxx right
706
#elif key == "a":
707
# pass # scroll up log
708
#elif key == "z":
709
# pass # scroll down log
731
710
elif self.topwidget.selectable():
732
711
self.topwidget.keypress(self.size, key)
733
712
self.refresh()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0