/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: 2009-11-19 18:31:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.

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
 
 
29
22
# Some useful constants
30
23
domain = 'se.bsnet.fukt'
31
24
server_interface = domain + '.Mandos'
32
25
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
26
version = "1.0.14"
34
27
 
35
28
# Always run in monochrome mode
36
29
urwid.curses_display.curses.has_colors = lambda : False
40
33
urwid.curses_display.curses.A_UNDERLINE |= (
41
34
    urwid.curses_display.curses.A_BLINK)
42
35
 
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
 
 
59
36
class MandosClientPropertyCache(object):
60
37
    """This wraps a Mandos Client D-Bus proxy object, caches the
61
38
    properties and calls a hook function when any of them are
62
39
    changed.
63
40
    """
64
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
41
    def __init__(self, proxy_object=None, properties=None, *args,
 
42
                 **kwargs):
65
43
        self.proxy = proxy_object # Mandos Client proxy object
66
44
        
67
 
        self.properties = dict()
 
45
        if properties is None:
 
46
            self.properties = dict()
 
47
        else:
 
48
            self.properties = properties
68
49
        self.proxy.connect_to_signal(u"PropertyChanged",
69
50
                                     self.property_changed,
70
51
                                     client_interface,
71
52
                                     byte_arrays=True)
72
53
        
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)
 
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)
80
61
    
81
62
    def property_changed(self, property=None, value=None):
82
63
        """This is called whenever we get a PropertyChanged signal
101
82
        # Logger
102
83
        self.logger = logger
103
84
        
104
 
        self._update_timer_callback_tag = None
105
 
        self.last_checker_failed = False
106
 
        
107
85
        # The widget shown normally
108
86
        self._text_widget = urwid.Text(u"")
109
87
        # The widget shown when we have focus
125
103
                                     self.got_secret,
126
104
                                     client_interface,
127
105
                                     byte_arrays=True)
128
 
        self.proxy.connect_to_signal(u"NeedApproval",
129
 
                                     self.need_approval,
130
 
                                     client_interface,
131
 
                                     byte_arrays=True)
132
106
        self.proxy.connect_to_signal(u"Rejected",
133
107
                                     self.rejected,
134
108
                                     client_interface,
135
109
                                     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))
151
110
    
152
111
    def checker_completed(self, exitstatus, condition, command):
153
112
        if exitstatus == 0:
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()
 
113
            self.logger(u'Checker for client %s (command "%s")'
 
114
                        u' was successful'
 
115
                        % (self.properties[u"name"], command))
162
116
            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))
169
117
        if os.WIFEXITED(condition):
170
118
            self.logger(u'Checker for client %s (command "%s")'
171
119
                        u' failed with exit code %s'
172
 
                        % (self.properties[u"Name"], command,
 
120
                        % (self.properties[u"name"], command,
173
121
                           os.WEXITSTATUS(condition)))
174
 
        elif os.WIFSIGNALED(condition):
 
122
            return
 
123
        if os.WIFSIGNALED(condition):
175
124
            self.logger(u'Checker for client %s (command "%s")'
176
125
                        u' was killed by signal %s'
177
 
                        % (self.properties[u"Name"], command,
 
126
                        % (self.properties[u"name"], command,
178
127
                           os.WTERMSIG(condition)))
179
 
        elif os.WCOREDUMP(condition):
 
128
            return
 
129
        if os.WCOREDUMP(condition):
180
130
            self.logger(u'Checker for client %s (command "%s")'
181
131
                        u' dumped core'
182
 
                        % (self.properties[u"Name"], command))
183
 
        else:
184
 
            self.logger(u'Checker for client %s completed'
185
 
                        u' mysteriously')
186
 
        self.update()
 
132
                        % (self.properties[u"name"], command))
 
133
        self.logger(u'Checker for client %s completed mysteriously')
187
134
    
188
135
    def checker_started(self, command):
189
 
        #self.logger(u'Client %s started checker "%s"'
190
 
        #            % (self.properties[u"Name"], unicode(command)))
191
 
        pass
 
136
        self.logger(u'Client %s started checker "%s"'
 
137
                    % (self.properties[u"name"], unicode(command)))
192
138
    
193
139
    def got_secret(self):
194
 
        self.last_checker_failed = False
195
140
        self.logger(u'Client %s received its secret'
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))
 
141
                    % self.properties[u"name"])
 
142
    
 
143
    def rejected(self):
 
144
        self.logger(u'Client %s was rejected'
 
145
                    % self.properties[u"name"])
209
146
    
210
147
    def selectable(self):
211
148
        """Make this a "selectable" widget.
233
170
                          u"bold-underline-blink":
234
171
                              u"bold-underline-blink-standout",
235
172
                          }
236
 
 
 
173
        
237
174
        # Rebuild focus and non-focus widgets using current properties
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 disabled: %s'
260
 
                           % unicode(timer).rsplit(".", 1)[0])
261
 
        else:
262
 
            message = u"enabled"
263
 
        self._text = "%s%s" % (base, message)
264
 
            
 
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")})
265
181
        if not urwid.supports_unicode():
266
182
            self._text = self._text.encode("ascii", "replace")
267
183
        textlist = [(u"normal", self._text)]
278
194
        if self.update_hook is not None:
279
195
            self.update_hook()
280
196
    
281
 
    def update_timer(self):
282
 
        "called by gobject"
283
 
        self.update()
284
 
        return True             # Keep calling this
285
 
    
286
197
    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
290
198
        if self.delete_hook is not None:
291
199
            self.delete_hook(self)
292
200
    
299
207
    def keypress(self, (maxcol,), key):
300
208
        """Handle keys.
301
209
        This overrides the method from urwid.FlowWidget"""
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)
 
210
        if key == u"e" or key == u"+":
 
211
            self.proxy.Enable()
 
212
        elif key == u"d" or key == u"-":
 
213
            self.proxy.Disable()
312
214
        elif key == u"r" or key == u"_" or key == u"ctrl k":
313
215
            self.server_proxy_object.RemoveClient(self.proxy
314
216
                                                  .object_path)
315
217
        elif key == u"s":
316
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
218
            self.proxy.StartChecker()
317
219
        elif key == u"S":
318
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
220
            self.proxy.StopChecker()
319
221
        elif key == u"C":
320
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
222
            self.proxy.CheckedOK()
321
223
        # xxx
322
224
#         elif key == u"p" or key == "=":
323
225
#             self.proxy.pause()
346
248
    use them as an excuse to shift focus away from this widget.
347
249
    """
348
250
    def keypress(self, (maxcol, maxrow), key):
349
 
        ret = super(ConstrainedListBox, self).keypress((maxcol,
350
 
                                                        maxrow), key)
 
251
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
351
252
        if ret in (u"up", u"down"):
352
253
            return
353
254
        return ret
470
371
        Call this when the widget layout needs to change"""
471
372
        self.uilist = []
472
373
        #self.uilist.append(urwid.ListBox(self.clients))
473
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
474
 
                                                          clients),
 
374
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
475
375
                                       #header=urwid.Divider(),
476
376
                                       header=None,
477
 
                                       footer=
478
 
                                       urwid.Divider(div_char=
479
 
                                                     self.divider)))
 
377
                                       footer=urwid.Divider(div_char=self.divider)))
480
378
        if self.log_visible:
481
379
            self.uilist.append(self.logbox)
482
380
            pass
500
398
        """Toggle visibility of the log buffer."""
501
399
        self.log_visible = not self.log_visible
502
400
        self.rebuild()
503
 
        #self.log_message(u"Log visibility changed to: "
504
 
        #                 + unicode(self.log_visible))
 
401
        self.log_message(u"Log visibility changed to: "
 
402
                         + unicode(self.log_visible))
505
403
    
506
404
    def change_log_display(self):
507
405
        """Change type of log display.
512
410
            self.log_wrap = u"clip"
513
411
        for textwidget in self.log:
514
412
            textwidget.set_wrap_mode(self.log_wrap)
515
 
        #self.log_message(u"Wrap mode: " + self.log_wrap)
 
413
        self.log_message(u"Wrap mode: " + self.log_wrap)
516
414
    
517
415
    def find_and_remove_client(self, path, name):
518
416
        """Find an client from its object path and remove it.
526
424
            return
527
425
        self.remove_client(client, path)
528
426
    
529
 
    def add_new_client(self, path):
 
427
    def add_new_client(self, path, properties):
530
428
        client_proxy_object = self.bus.get_object(self.busname, path)
531
429
        self.add_client(MandosClientWidget(server_proxy_object
532
430
                                           =self.mandos_serv,
533
431
                                           proxy_object
534
432
                                           =client_proxy_object,
 
433
                                           properties=properties,
535
434
                                           update_hook
536
435
                                           =self.refresh,
537
436
                                           delete_hook
538
 
                                           =self.remove_client,
539
 
                                           logger
540
 
                                           =self.log_message),
 
437
                                           =self.remove_client),
541
438
                        path=path)
542
439
    
543
440
    def add_client(self, client, path=None):
545
442
        if path is None:
546
443
            path = client.proxy.object_path
547
444
        self.clients_dict[path] = client
548
 
        self.clients.sort(None, lambda c: c.properties[u"Name"])
 
445
        self.clients.sort(None, lambda c: c.properties[u"name"])
549
446
        self.refresh()
550
447
    
551
448
    def remove_client(self, client, path=None):
626
523
                self.log_message_raw((u"bold",
627
524
                                      u"  "
628
525
                                      .join((u"Clients:",
629
 
                                             u"+: Enable",
630
 
                                             u"-: Disable",
 
526
                                             u"e: Enable",
 
527
                                             u"d: Disable",
631
528
                                             u"r: Remove",
632
529
                                             u"s: Start new checker",
633
530
                                             u"S: Stop checker",
634
 
                                             u"C: Checker OK",
635
 
                                             u"a: Approve",
636
 
                                             u"d: Deny"))))
 
531
                                             u"C: Checker OK"))))
637
532
                self.refresh()
638
533
            elif key == u"tab":
639
534
                if self.topwidget.get_focus() is self.logbox:
667
562
ui = UserInterface()
668
563
try:
669
564
    ui.run()
670
 
except KeyboardInterrupt:
671
 
    ui.screen.stop()
672
 
except Exception, e:
673
 
    ui.log_message(unicode(e))
 
565
except:
674
566
    ui.screen.stop()
675
567
    raise