/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._update_timer_callback_lock = 0
106
 
        self.last_checker_failed = False
107
 
        
108
85
        # The widget shown normally
109
86
        self._text_widget = urwid.Text(u"")
110
87
        # The widget shown when we have focus
114
91
            *args, **kwargs)
115
92
        self.update()
116
93
        self.opened = False
117
 
        
118
 
        last_checked_ok = isoformat_to_datetime(self.properties
119
 
                                                [u"LastCheckedOK"])
120
 
        if last_checked_ok is None:
121
 
            self.last_checker_failed = True
122
 
        else:
123
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
124
 
                                         - last_checked_ok)
125
 
                                        > datetime.timedelta
126
 
                                        (milliseconds=
127
 
                                         self.properties
128
 
                                         [u"Interval"]))
129
 
        
130
 
        if self.last_checker_failed:
131
 
            self.using_timer(True)
132
 
        
133
 
        if self.need_approval:
134
 
            self.using_timer(True)
135
 
        
136
94
        self.proxy.connect_to_signal(u"CheckerCompleted",
137
95
                                     self.checker_completed,
138
96
                                     client_interface,
145
103
                                     self.got_secret,
146
104
                                     client_interface,
147
105
                                     byte_arrays=True)
148
 
        self.proxy.connect_to_signal(u"NeedApproval",
149
 
                                     self.need_approval,
150
 
                                     client_interface,
151
 
                                     byte_arrays=True)
152
106
        self.proxy.connect_to_signal(u"Rejected",
153
107
                                     self.rejected,
154
108
                                     client_interface,
155
109
                                     byte_arrays=True)
156
110
    
157
 
    def property_changed(self, property=None, value=None):
158
 
        super(self, MandosClientWidget).property_changed(property,
159
 
                                                         value)
160
 
        if property == u"ApprovalPending":
161
 
            using_timer(bool(value))
162
 
        
163
 
    def using_timer(self, flag):
164
 
        """Call this method with True or False when timer should be
165
 
        activated or deactivated.
166
 
        """
167
 
        old = self._update_timer_callback_lock
168
 
        if flag:
169
 
            self._update_timer_callback_lock += 1
170
 
        else:
171
 
            self._update_timer_callback_lock -= 1
172
 
        if old == 0 and self._update_timer_callback_lock:
173
 
            self._update_timer_callback_tag = (gobject.timeout_add
174
 
                                               (1000,
175
 
                                                self.update_timer))
176
 
        elif old and self._update_timer_callback_lock == 0:
177
 
            gobject.source_remove(self._update_timer_callback_tag)
178
 
            self._update_timer_callback_tag = None
179
 
    
180
111
    def checker_completed(self, exitstatus, condition, command):
181
112
        if exitstatus == 0:
182
 
            if self.last_checker_failed:
183
 
                self.last_checker_failed = False
184
 
                self.using_timer(False)
185
 
            #self.logger(u'Checker for client %s (command "%s")'
186
 
            #            u' was successful'
187
 
            #            % (self.properties[u"Name"], command))
188
 
            self.update()
 
113
            self.logger(u'Checker for client %s (command "%s")'
 
114
                        u' was successful'
 
115
                        % (self.properties[u"name"], command))
189
116
            return
190
 
        # Checker failed
191
 
        if not self.last_checker_failed:
192
 
            self.last_checker_failed = True
193
 
            self.using_timer(True)
194
117
        if os.WIFEXITED(condition):
195
118
            self.logger(u'Checker for client %s (command "%s")'
196
119
                        u' failed with exit code %s'
197
 
                        % (self.properties[u"Name"], command,
 
120
                        % (self.properties[u"name"], command,
198
121
                           os.WEXITSTATUS(condition)))
199
 
        elif os.WIFSIGNALED(condition):
 
122
            return
 
123
        if os.WIFSIGNALED(condition):
200
124
            self.logger(u'Checker for client %s (command "%s")'
201
125
                        u' was killed by signal %s'
202
 
                        % (self.properties[u"Name"], command,
 
126
                        % (self.properties[u"name"], command,
203
127
                           os.WTERMSIG(condition)))
204
 
        elif os.WCOREDUMP(condition):
 
128
            return
 
129
        if os.WCOREDUMP(condition):
205
130
            self.logger(u'Checker for client %s (command "%s")'
206
131
                        u' dumped core'
207
 
                        % (self.properties[u"Name"], command))
208
 
        else:
209
 
            self.logger(u'Checker for client %s completed'
210
 
                        u' mysteriously')
211
 
        self.update()
 
132
                        % (self.properties[u"name"], command))
 
133
        self.logger(u'Checker for client %s completed mysteriously')
212
134
    
213
135
    def checker_started(self, command):
214
 
        #self.logger(u'Client %s started checker "%s"'
215
 
        #            % (self.properties[u"Name"], unicode(command)))
216
 
        pass
 
136
        self.logger(u'Client %s started checker "%s"'
 
137
                    % (self.properties[u"name"], unicode(command)))
217
138
    
218
139
    def got_secret(self):
219
 
        self.last_checker_failed = False
220
140
        self.logger(u'Client %s received its secret'
221
 
                    % self.properties[u"Name"])
222
 
    
223
 
    def need_approval(self, timeout, default):
224
 
        if not default:
225
 
            message = u'Client %s needs approval within %s seconds'
226
 
        else:
227
 
            message = u'Client %s will get its secret in %s seconds'
228
 
        self.logger(message
229
 
                    % (self.properties[u"Name"], timeout/1000))
230
 
        self.using_timer(True)
231
 
    
232
 
    def rejected(self, reason):
233
 
        self.logger(u'Client %s was rejected; reason: %s'
234
 
                    % (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"])
235
146
    
236
147
    def selectable(self):
237
148
        """Make this a "selectable" widget.
259
170
                          u"bold-underline-blink":
260
171
                              u"bold-underline-blink-standout",
261
172
                          }
262
 
 
 
173
        
263
174
        # Rebuild focus and non-focus widgets using current properties
264
 
 
265
 
        # Base part of a client. Name!
266
 
        base = (u'%(name)s: '
267
 
                      % {u"name": self.properties[u"Name"]})
268
 
        if not self.properties[u"Enabled"]:
269
 
            message = u"DISABLED"
270
 
        elif self.properties[u"ApprovalPending"]:
271
 
            timeout = datetime.timedelta(milliseconds
272
 
                                         = self.properties
273
 
                                         [u"ApprovalDelay"])
274
 
            last_approval_request = isoformat_to_datetime(
275
 
                self.properties[u"LastApprovalRequest"])
276
 
            if last_approval_request is not None:
277
 
                timer = timeout - (datetime.datetime.utcnow()
278
 
                                   - last_approval_request)
279
 
            else:
280
 
                timer = datetime.timedelta()
281
 
            if self.properties[u"ApprovedByDefault"]:
282
 
                message = u"Approval in %s. (d)eny?"
283
 
            else:
284
 
                message = u"Denial in %s. (a)pprove?"
285
 
            message = message % unicode(timer).rsplit(".", 1)[0]
286
 
        elif self.last_checker_failed:
287
 
            timeout = datetime.timedelta(milliseconds
288
 
                                         = self.properties
289
 
                                         [u"Timeout"])
290
 
            last_ok = isoformat_to_datetime(
291
 
                max((self.properties[u"LastCheckedOK"]
292
 
                     or self.properties[u"Created"]),
293
 
                    self.properties[u"LastEnabled"]))
294
 
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
295
 
            message = (u'A checker has failed! Time until client'
296
 
                       u' gets disabled: %s'
297
 
                           % unicode(timer).rsplit(".", 1)[0])
298
 
        else:
299
 
            message = u"enabled"
300
 
        self._text = "%s%s" % (base, message)
301
 
            
 
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")})
302
181
        if not urwid.supports_unicode():
303
182
            self._text = self._text.encode("ascii", "replace")
304
183
        textlist = [(u"normal", self._text)]
315
194
        if self.update_hook is not None:
316
195
            self.update_hook()
317
196
    
318
 
    def update_timer(self):
319
 
        "called by gobject"
320
 
        self.update()
321
 
        return True             # Keep calling this
322
 
    
323
197
    def delete(self):
324
 
        if self._update_timer_callback_tag is not None:
325
 
            gobject.source_remove(self._update_timer_callback_tag)
326
 
            self._update_timer_callback_tag = None
327
198
        if self.delete_hook is not None:
328
199
            self.delete_hook(self)
329
200
    
336
207
    def keypress(self, (maxcol,), key):
337
208
        """Handle keys.
338
209
        This overrides the method from urwid.FlowWidget"""
339
 
        if key == u"+":
340
 
            self.proxy.Enable(dbus_interface = client_interface)
341
 
        elif key == u"-":
342
 
            self.proxy.Disable(dbus_interface = client_interface)
343
 
        elif key == u"a":
344
 
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
345
 
                               dbus_interface = client_interface)
346
 
        elif key == u"d":
347
 
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
348
 
                                  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()
349
214
        elif key == u"r" or key == u"_" or key == u"ctrl k":
350
215
            self.server_proxy_object.RemoveClient(self.proxy
351
216
                                                  .object_path)
352
217
        elif key == u"s":
353
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
218
            self.proxy.StartChecker()
354
219
        elif key == u"S":
355
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
220
            self.proxy.StopChecker()
356
221
        elif key == u"C":
357
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
222
            self.proxy.CheckedOK()
358
223
        # xxx
359
224
#         elif key == u"p" or key == "=":
360
225
#             self.proxy.pause()
383
248
    use them as an excuse to shift focus away from this widget.
384
249
    """
385
250
    def keypress(self, (maxcol, maxrow), key):
386
 
        ret = super(ConstrainedListBox, self).keypress((maxcol,
387
 
                                                        maxrow), key)
 
251
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
388
252
        if ret in (u"up", u"down"):
389
253
            return
390
254
        return ret
507
371
        Call this when the widget layout needs to change"""
508
372
        self.uilist = []
509
373
        #self.uilist.append(urwid.ListBox(self.clients))
510
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
511
 
                                                          clients),
 
374
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
512
375
                                       #header=urwid.Divider(),
513
376
                                       header=None,
514
 
                                       footer=
515
 
                                       urwid.Divider(div_char=
516
 
                                                     self.divider)))
 
377
                                       footer=urwid.Divider(div_char=self.divider)))
517
378
        if self.log_visible:
518
379
            self.uilist.append(self.logbox)
519
380
            pass
537
398
        """Toggle visibility of the log buffer."""
538
399
        self.log_visible = not self.log_visible
539
400
        self.rebuild()
540
 
        #self.log_message(u"Log visibility changed to: "
541
 
        #                 + unicode(self.log_visible))
 
401
        self.log_message(u"Log visibility changed to: "
 
402
                         + unicode(self.log_visible))
542
403
    
543
404
    def change_log_display(self):
544
405
        """Change type of log display.
549
410
            self.log_wrap = u"clip"
550
411
        for textwidget in self.log:
551
412
            textwidget.set_wrap_mode(self.log_wrap)
552
 
        #self.log_message(u"Wrap mode: " + self.log_wrap)
 
413
        self.log_message(u"Wrap mode: " + self.log_wrap)
553
414
    
554
415
    def find_and_remove_client(self, path, name):
555
416
        """Find an client from its object path and remove it.
563
424
            return
564
425
        self.remove_client(client, path)
565
426
    
566
 
    def add_new_client(self, path):
 
427
    def add_new_client(self, path, properties):
567
428
        client_proxy_object = self.bus.get_object(self.busname, path)
568
429
        self.add_client(MandosClientWidget(server_proxy_object
569
430
                                           =self.mandos_serv,
570
431
                                           proxy_object
571
432
                                           =client_proxy_object,
 
433
                                           properties=properties,
572
434
                                           update_hook
573
435
                                           =self.refresh,
574
436
                                           delete_hook
575
 
                                           =self.remove_client,
576
 
                                           logger
577
 
                                           =self.log_message),
 
437
                                           =self.remove_client),
578
438
                        path=path)
579
439
    
580
440
    def add_client(self, client, path=None):
582
442
        if path is None:
583
443
            path = client.proxy.object_path
584
444
        self.clients_dict[path] = client
585
 
        self.clients.sort(None, lambda c: c.properties[u"Name"])
 
445
        self.clients.sort(None, lambda c: c.properties[u"name"])
586
446
        self.refresh()
587
447
    
588
448
    def remove_client(self, client, path=None):
663
523
                self.log_message_raw((u"bold",
664
524
                                      u"  "
665
525
                                      .join((u"Clients:",
666
 
                                             u"+: Enable",
667
 
                                             u"-: Disable",
 
526
                                             u"e: Enable",
 
527
                                             u"d: Disable",
668
528
                                             u"r: Remove",
669
529
                                             u"s: Start new checker",
670
530
                                             u"S: Stop checker",
671
 
                                             u"C: Checker OK",
672
 
                                             u"a: Approve",
673
 
                                             u"d: Deny"))))
 
531
                                             u"C: Checker OK"))))
674
532
                self.refresh()
675
533
            elif key == u"tab":
676
534
                if self.topwidget.get_focus() is self.logbox:
704
562
ui = UserInterface()
705
563
try:
706
564
    ui.run()
707
 
except KeyboardInterrupt:
708
 
    ui.screen.stop()
709
 
except Exception, e:
710
 
    ui.log_message(unicode(e))
 
565
except:
711
566
    ui.screen.stop()
712
567
    raise