/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos-monitor

* mandos-monitor.xml: New.
* Makefile (PROGS): Add "mandos-monitor".
  (DOCS): Add "mandos-monitor.xml".
  (mandos-monitor.8, mandos-monitor.8.xhtml, mandos-monitor): New.
  (install-server): Install "mandos-ctl" and "mandos-monitor" too.
  (uninstall-server): Remove "mandos-ctl" and "mandos-monitor" too.
* mandos-monitor: Don't log uninteresting messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
19
19
 
20
20
import UserList
21
21
 
 
22
import locale
 
23
 
 
24
locale.setlocale(locale.LC_ALL, u'')
 
25
 
 
26
import logging
 
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
28
 
22
29
# Some useful constants
23
30
domain = 'se.bsnet.fukt'
24
31
server_interface = domain + '.Mandos'
25
32
client_interface = domain + '.Mandos.Client'
26
 
version = "1.0.14"
 
33
version = "1.0.15"
27
34
 
28
35
# Always run in monochrome mode
29
36
urwid.curses_display.curses.has_colors = lambda : False
33
40
urwid.curses_display.curses.A_UNDERLINE |= (
34
41
    urwid.curses_display.curses.A_BLINK)
35
42
 
 
43
def isoformat_to_datetime(iso):
 
44
    "Parse an ISO 8601 date string to a datetime.datetime()"
 
45
    if not iso:
 
46
        return None
 
47
    d, t = iso.split(u"T", 1)
 
48
    year, month, day = d.split(u"-", 2)
 
49
    hour, minute, second = t.split(u":", 2)
 
50
    second, fraction = divmod(float(second), 1)
 
51
    return datetime.datetime(int(year),
 
52
                             int(month),
 
53
                             int(day),
 
54
                             int(hour),
 
55
                             int(minute),
 
56
                             int(second),           # Whole seconds
 
57
                             int(fraction*1000000)) # Microseconds
 
58
 
36
59
class MandosClientPropertyCache(object):
37
60
    """This wraps a Mandos Client D-Bus proxy object, caches the
38
61
    properties and calls a hook function when any of them are
39
62
    changed.
40
63
    """
41
 
    def __init__(self, proxy_object=None, properties=None, *args,
42
 
                 **kwargs):
 
64
    def __init__(self, proxy_object=None, *args, **kwargs):
43
65
        self.proxy = proxy_object # Mandos Client proxy object
44
66
        
45
 
        if properties is None:
46
 
            self.properties = dict()
47
 
        else:
48
 
            self.properties = properties
 
67
        self.properties = dict()
49
68
        self.proxy.connect_to_signal(u"PropertyChanged",
50
69
                                     self.property_changed,
51
70
                                     client_interface,
52
71
                                     byte_arrays=True)
53
72
        
54
 
        if properties is None:
55
 
            self.properties.update(self.proxy.GetAll(client_interface,
56
 
                                                     dbus_interface =
57
 
                                                     dbus.PROPERTIES_IFACE))
58
 
        super(MandosClientPropertyCache, self).__init__(
59
 
            proxy_object=proxy_object,
60
 
            properties=properties, *args, **kwargs)
 
73
        self.properties.update(
 
74
            self.proxy.GetAll(client_interface,
 
75
                              dbus_interface = dbus.PROPERTIES_IFACE))
 
76
 
 
77
        #XXX This break good super behaviour!
 
78
#        super(MandosClientPropertyCache, self).__init__(
 
79
#            *args, **kwargs)
61
80
    
62
81
    def property_changed(self, property=None, value=None):
63
82
        """This is called whenever we get a PropertyChanged signal
82
101
        # Logger
83
102
        self.logger = logger
84
103
        
 
104
        self._update_timer_callback_tag = None
 
105
        self.last_checker_failed = False
 
106
        
85
107
        # The widget shown normally
86
108
        self._text_widget = urwid.Text(u"")
87
109
        # The widget shown when we have focus
103
125
                                     self.got_secret,
104
126
                                     client_interface,
105
127
                                     byte_arrays=True)
 
128
        self.proxy.connect_to_signal(u"NeedApproval",
 
129
                                     self.need_approval,
 
130
                                     client_interface,
 
131
                                     byte_arrays=True)
106
132
        self.proxy.connect_to_signal(u"Rejected",
107
133
                                     self.rejected,
108
134
                                     client_interface,
109
135
                                     byte_arrays=True)
 
136
        last_checked_ok = isoformat_to_datetime(self.properties
 
137
                                                [u"LastCheckedOK"])
 
138
        if last_checked_ok is None:
 
139
            self.last_checker_failed = True
 
140
        else:
 
141
            self.last_checker_failed = ((datetime.datetime.utcnow()
 
142
                                         - last_checked_ok)
 
143
                                        > datetime.timedelta
 
144
                                        (milliseconds=
 
145
                                         self.properties
 
146
                                         [u"Interval"]))
 
147
        if self.last_checker_failed:
 
148
            self._update_timer_callback_tag = (gobject.timeout_add
 
149
                                               (1000,
 
150
                                                self.update_timer))
110
151
    
111
152
    def checker_completed(self, exitstatus, condition, command):
112
153
        if exitstatus == 0:
113
 
            self.logger(u'Checker for client %s (command "%s")'
114
 
                        u' was successful'
115
 
                        % (self.properties[u"name"], command))
 
154
            if self.last_checker_failed:
 
155
                self.last_checker_failed = False
 
156
                gobject.source_remove(self._update_timer_callback_tag)
 
157
                self._update_timer_callback_tag = None
 
158
            #self.logger(u'Checker for client %s (command "%s")'
 
159
            #            u' was successful'
 
160
            #            % (self.properties[u"Name"], command))
 
161
            self.update()
116
162
            return
 
163
        # Checker failed
 
164
        if not self.last_checker_failed:
 
165
            self.last_checker_failed = True
 
166
            self._update_timer_callback_tag = (gobject.timeout_add
 
167
                                               (1000,
 
168
                                                self.update_timer))
117
169
        if os.WIFEXITED(condition):
118
170
            self.logger(u'Checker for client %s (command "%s")'
119
171
                        u' failed with exit code %s'
120
 
                        % (self.properties[u"name"], command,
 
172
                        % (self.properties[u"Name"], command,
121
173
                           os.WEXITSTATUS(condition)))
122
 
            return
123
 
        if os.WIFSIGNALED(condition):
 
174
        elif os.WIFSIGNALED(condition):
124
175
            self.logger(u'Checker for client %s (command "%s")'
125
176
                        u' was killed by signal %s'
126
 
                        % (self.properties[u"name"], command,
 
177
                        % (self.properties[u"Name"], command,
127
178
                           os.WTERMSIG(condition)))
128
 
            return
129
 
        if os.WCOREDUMP(condition):
 
179
        elif os.WCOREDUMP(condition):
130
180
            self.logger(u'Checker for client %s (command "%s")'
131
181
                        u' dumped core'
132
 
                        % (self.properties[u"name"], command))
133
 
        self.logger(u'Checker for client %s completed mysteriously')
 
182
                        % (self.properties[u"Name"], command))
 
183
        else:
 
184
            self.logger(u'Checker for client %s completed'
 
185
                        u' mysteriously')
 
186
        self.update()
134
187
    
135
188
    def checker_started(self, command):
136
 
        self.logger(u'Client %s started checker "%s"'
137
 
                    % (self.properties[u"name"], unicode(command)))
 
189
        #self.logger(u'Client %s started checker "%s"'
 
190
        #            % (self.properties[u"Name"], unicode(command)))
 
191
        pass
138
192
    
139
193
    def got_secret(self):
 
194
        self.last_checker_failed = False
140
195
        self.logger(u'Client %s received its secret'
141
 
                    % self.properties[u"name"])
142
 
    
143
 
    def rejected(self):
144
 
        self.logger(u'Client %s was rejected'
145
 
                    % self.properties[u"name"])
 
196
                    % self.properties[u"Name"])
 
197
    
 
198
    def need_approval(self, timeout, default):
 
199
        if not default:
 
200
            message = u'Client %s needs approval within %s seconds'
 
201
        else:
 
202
            message = u'Client %s will get its secret in %s seconds'
 
203
        self.logger(message
 
204
                    % (self.properties[u"Name"], timeout/1000))
 
205
    
 
206
    def rejected(self, reason):
 
207
        self.logger(u'Client %s was rejected; reason: %s'
 
208
                    % (self.properties[u"Name"], reason))
146
209
    
147
210
    def selectable(self):
148
211
        """Make this a "selectable" widget.
170
233
                          u"bold-underline-blink":
171
234
                              u"bold-underline-blink-standout",
172
235
                          }
173
 
        
 
236
 
174
237
        # Rebuild focus and non-focus widgets using current properties
175
 
        self._text = (u'%(name)s: %(enabled)s'
176
 
                      % { u"name": self.properties[u"name"],
177
 
                          u"enabled":
178
 
                              (u"enabled"
179
 
                               if self.properties[u"enabled"]
180
 
                               else u"DISABLED")})
 
238
 
 
239
        # Base part of a client. Name!
 
240
        base = (u'%(name)s: '
 
241
                      % {u"name": self.properties[u"Name"]})
 
242
        if not self.properties[u"Enabled"]:
 
243
            message = u"DISABLED"
 
244
        elif self.properties[u"ApprovalPending"]:
 
245
            if self.properties[u"ApprovedByDefault"]:
 
246
                message = u"Connection established to client. (d)eny?"
 
247
            else:
 
248
                message = u"Seeks approval to send secret. (a)pprove?"
 
249
        elif self.last_checker_failed:
 
250
            timeout = datetime.timedelta(milliseconds
 
251
                                         = self.properties
 
252
                                         [u"Timeout"])
 
253
            last_ok = isoformat_to_datetime(
 
254
                max((self.properties[u"LastCheckedOK"]
 
255
                     or self.properties[u"Created"]),
 
256
                    self.properties[u"LastEnabled"]))
 
257
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
 
258
            message = (u'A checker has failed! Time until client'
 
259
                       u' gets diabled: %s'
 
260
                           % unicode(timer).rsplit(".", 1)[0])
 
261
        else:
 
262
            message = u"enabled"
 
263
        self._text = "%s%s" % (base, message)
 
264
            
181
265
        if not urwid.supports_unicode():
182
266
            self._text = self._text.encode("ascii", "replace")
183
267
        textlist = [(u"normal", self._text)]
194
278
        if self.update_hook is not None:
195
279
            self.update_hook()
196
280
    
 
281
    def update_timer(self):
 
282
        "called by gobject"
 
283
        self.update()
 
284
        return True             # Keep calling this
 
285
    
197
286
    def delete(self):
 
287
        if self._update_timer_callback_tag is not None:
 
288
            gobject.source_remove(self._update_timer_callback_tag)
 
289
            self._update_timer_callback_tag = None
198
290
        if self.delete_hook is not None:
199
291
            self.delete_hook(self)
200
292
    
207
299
    def keypress(self, (maxcol,), key):
208
300
        """Handle keys.
209
301
        This overrides the method from urwid.FlowWidget"""
210
 
        if key == u"e" or key == u"+":
211
 
            self.proxy.Enable()
212
 
        elif key == u"d" or key == u"-":
213
 
            self.proxy.Disable()
 
302
        if key == u"+":
 
303
            self.proxy.Enable(dbus_interface = client_interface)
 
304
        elif key == u"-":
 
305
            self.proxy.Disable(dbus_interface = client_interface)
 
306
        elif key == u"a":
 
307
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
 
308
                               dbus_interface = client_interface)
 
309
        elif key == u"d":
 
310
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
 
311
                                  dbus_interface = client_interface)
214
312
        elif key == u"r" or key == u"_" or key == u"ctrl k":
215
313
            self.server_proxy_object.RemoveClient(self.proxy
216
314
                                                  .object_path)
217
315
        elif key == u"s":
218
 
            self.proxy.StartChecker()
 
316
            self.proxy.StartChecker(dbus_interface = client_interface)
219
317
        elif key == u"S":
220
 
            self.proxy.StopChecker()
 
318
            self.proxy.StopChecker(dbus_interface = client_interface)
221
319
        elif key == u"C":
222
 
            self.proxy.CheckedOK()
 
320
            self.proxy.CheckedOK(dbus_interface = client_interface)
223
321
        # xxx
224
322
#         elif key == u"p" or key == "=":
225
323
#             self.proxy.pause()
248
346
    use them as an excuse to shift focus away from this widget.
249
347
    """
250
348
    def keypress(self, (maxcol, maxrow), key):
251
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
349
        ret = super(ConstrainedListBox, self).keypress((maxcol,
 
350
                                                        maxrow), key)
252
351
        if ret in (u"up", u"down"):
253
352
            return
254
353
        return ret
371
470
        Call this when the widget layout needs to change"""
372
471
        self.uilist = []
373
472
        #self.uilist.append(urwid.ListBox(self.clients))
374
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
473
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
474
                                                          clients),
375
475
                                       #header=urwid.Divider(),
376
476
                                       header=None,
377
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
477
                                       footer=
 
478
                                       urwid.Divider(div_char=
 
479
                                                     self.divider)))
378
480
        if self.log_visible:
379
481
            self.uilist.append(self.logbox)
380
482
            pass
398
500
        """Toggle visibility of the log buffer."""
399
501
        self.log_visible = not self.log_visible
400
502
        self.rebuild()
401
 
        self.log_message(u"Log visibility changed to: "
402
 
                         + unicode(self.log_visible))
 
503
        #self.log_message(u"Log visibility changed to: "
 
504
        #                 + unicode(self.log_visible))
403
505
    
404
506
    def change_log_display(self):
405
507
        """Change type of log display.
410
512
            self.log_wrap = u"clip"
411
513
        for textwidget in self.log:
412
514
            textwidget.set_wrap_mode(self.log_wrap)
413
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
515
        #self.log_message(u"Wrap mode: " + self.log_wrap)
414
516
    
415
517
    def find_and_remove_client(self, path, name):
416
518
        """Find an client from its object path and remove it.
424
526
            return
425
527
        self.remove_client(client, path)
426
528
    
427
 
    def add_new_client(self, path, properties):
 
529
    def add_new_client(self, path):
428
530
        client_proxy_object = self.bus.get_object(self.busname, path)
429
531
        self.add_client(MandosClientWidget(server_proxy_object
430
532
                                           =self.mandos_serv,
431
533
                                           proxy_object
432
534
                                           =client_proxy_object,
433
 
                                           properties=properties,
434
535
                                           update_hook
435
536
                                           =self.refresh,
436
537
                                           delete_hook
437
 
                                           =self.remove_client),
 
538
                                           =self.remove_client,
 
539
                                           logger
 
540
                                           =self.log_message),
438
541
                        path=path)
439
542
    
440
543
    def add_client(self, client, path=None):
442
545
        if path is None:
443
546
            path = client.proxy.object_path
444
547
        self.clients_dict[path] = client
445
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
548
        self.clients.sort(None, lambda c: c.properties[u"Name"])
446
549
        self.refresh()
447
550
    
448
551
    def remove_client(self, client, path=None):
523
626
                self.log_message_raw((u"bold",
524
627
                                      u"  "
525
628
                                      .join((u"Clients:",
526
 
                                             u"e: Enable",
527
 
                                             u"d: Disable",
 
629
                                             u"+: Enable",
 
630
                                             u"-: Disable",
528
631
                                             u"r: Remove",
529
632
                                             u"s: Start new checker",
530
633
                                             u"S: Stop checker",
531
 
                                             u"C: Checker OK"))))
 
634
                                             u"C: Checker OK",
 
635
                                             u"a: Approve",
 
636
                                             u"d: Deny"))))
532
637
                self.refresh()
533
638
            elif key == u"tab":
534
639
                if self.topwidget.get_focus() is self.logbox:
562
667
ui = UserInterface()
563
668
try:
564
669
    ui.run()
565
 
except:
 
670
except KeyboardInterrupt:
 
671
    ui.screen.stop()
 
672
except Exception, e:
 
673
    ui.log_message(unicode(e))
566
674
    ui.screen.stop()
567
675
    raise