/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-15 10:12:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091115101209-d0zrfwkp6u0l7v7b
* mandos (MandosServer.handle_ipc): Better log message.
  (main/MandosDBusService.ClientNotFound): Add "address" argument.
                                           All callers changed.
* mandos-monitor (MandosClientWidget.__init__): Add "logger" argument.
  (MandosClientWidget.checker_completed,
  MandosClientWidget.checker_started, MandosClientWidget.got_secret,
  MandosClientWidget.rejected): New methods, connected to signals.
  (MandosClientWidget.update): Improve display.
  (UserInterface.client_not_found): New method, conneced to signal.
  (UserInterface.log_message): New; log with timestamp.
  (UserInterface.log_message_raw): Same as old "log_message".  Bug
                                  fix; always do "refresh()".

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
 
                                                ["last_checked_ok"])
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["interval"]))
146
 
        if self.last_checker_failed:
147
 
            self._update_timer_callback_tag = (gobject.timeout_add
148
 
                                               (1000,
149
 
                                                self.update_timer))
150
110
    
151
111
    def checker_completed(self, exitstatus, condition, command):
152
112
        if exitstatus == 0:
153
 
            if self.last_checker_failed:
154
 
                self.last_checker_failed = False
155
 
                gobject.source_remove(self._update_timer_callback_tag)
156
 
                self._update_timer_callback_tag = None
157
113
            self.logger(u'Checker for client %s (command "%s")'
158
114
                        u' was successful'
159
115
                        % (self.properties[u"name"], command))
160
 
            self.update()
161
116
            return
162
 
        # Checker failed
163
 
        if not self.last_checker_failed:
164
 
            self.last_checker_failed = True
165
 
            self._update_timer_callback_tag = (gobject.timeout_add
166
 
                                               (1000,
167
 
                                                self.update_timer))
168
117
        if os.WIFEXITED(condition):
169
118
            self.logger(u'Checker for client %s (command "%s")'
170
119
                        u' failed with exit code %s'
171
120
                        % (self.properties[u"name"], command,
172
121
                           os.WEXITSTATUS(condition)))
173
 
        elif os.WIFSIGNALED(condition):
 
122
            return
 
123
        if os.WIFSIGNALED(condition):
174
124
            self.logger(u'Checker for client %s (command "%s")'
175
125
                        u' was killed by signal %s'
176
126
                        % (self.properties[u"name"], command,
177
127
                           os.WTERMSIG(condition)))
178
 
        elif os.WCOREDUMP(condition):
 
128
            return
 
129
        if os.WCOREDUMP(condition):
179
130
            self.logger(u'Checker for client %s (command "%s")'
180
131
                        u' dumped core'
181
132
                        % (self.properties[u"name"], command))
182
 
        else:
183
 
            self.logger(u'Checker for client %s completed mysteriously')
184
 
        self.update()
 
133
        self.logger(u'Checker for client %s completed mysteriously')
185
134
    
186
135
    def checker_started(self, command):
187
 
        #self.logger(u'Client %s started checker "%s"'
188
 
        #            % (self.properties[u"name"], unicode(command)))
189
 
        pass
 
136
        self.logger(u'Client %s started checker "%s"'
 
137
                    % (self.properties[u"name"], unicode(command)))
190
138
    
191
139
    def got_secret(self):
192
 
        self.last_checker_failed = False
193
140
        self.logger(u'Client %s received its secret'
194
141
                    % self.properties[u"name"])
195
142
    
196
 
    def need_approval(self, timeout, default):
197
 
        if not default:
198
 
            message = u'Client %s needs approval within %s seconds'
199
 
        else:
200
 
            message = u'Client %s will get its secret in %s seconds'
201
 
        self.logger(message
202
 
                    % (self.properties[u"name"], timeout/1000))
203
 
    
204
 
    def rejected(self, reason):
205
 
        self.logger(u'Client %s was rejected; reason: %s'
206
 
                    % (self.properties[u"name"], reason))
 
143
    def rejected(self):
 
144
        self.logger(u'Client %s was rejected'
 
145
                    % self.properties[u"name"])
207
146
    
208
147
    def selectable(self):
209
148
        """Make this a "selectable" widget.
231
170
                          u"bold-underline-blink":
232
171
                              u"bold-underline-blink-standout",
233
172
                          }
234
 
 
 
173
        
235
174
        # Rebuild focus and non-focus widgets using current properties
236
 
 
237
 
        # Base part of a client. Name!
238
 
        base = (u'%(name)s: '
239
 
                      % {u"name": self.properties[u"name"]})
240
 
        if not self.properties[u"enabled"]:
241
 
            message = u"DISABLED"
242
 
        elif self.properties[u"approved_pending"]:
243
 
            if self.properties[u"approved_by_default"]:
244
 
                message = u"Connection established to client. (d)eny?"
245
 
            else:
246
 
                message = u"Seeks approval to send secret. (a)pprove?"
247
 
        elif self.last_checker_failed:
248
 
            timeout = datetime.timedelta(milliseconds
249
 
                                         = self.properties[u"timeout"])
250
 
            last_ok = isoformat_to_datetime(
251
 
                max((self.properties["last_checked_ok"]
252
 
                     or self.properties["created"]),
253
 
                    self.properties[u"last_enabled"]))
254
 
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
255
 
            message = (u'A checker has failed! Time until client gets diabled: %s'
256
 
                           % unicode(timer).rsplit(".", 1)[0])
257
 
        else:
258
 
            message = u"enabled"
259
 
        self._text = "%s%s" % (base, message)
260
 
            
 
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")})
261
181
        if not urwid.supports_unicode():
262
182
            self._text = self._text.encode("ascii", "replace")
263
183
        textlist = [(u"normal", self._text)]
274
194
        if self.update_hook is not None:
275
195
            self.update_hook()
276
196
    
277
 
    def update_timer(self):
278
 
        "called by gobject"
279
 
        self.update()
280
 
        return True             # Keep calling this
281
 
    
282
197
    def delete(self):
283
 
        if self._update_timer_callback_tag is not None:
284
 
            gobject.source_remove(self._update_timer_callback_tag)
285
 
            self._update_timer_callback_tag = None
286
198
        if self.delete_hook is not None:
287
199
            self.delete_hook(self)
288
200
    
295
207
    def keypress(self, (maxcol,), key):
296
208
        """Handle keys.
297
209
        This overrides the method from urwid.FlowWidget"""
298
 
        if key == u"+":
299
 
            self.proxy.Enable(dbus_interface = client_interface)
300
 
        elif key == u"-":
301
 
            self.proxy.Disable(dbus_interface = client_interface)
302
 
        elif key == u"a":
303
 
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
304
 
                               dbus_interface = client_interface)
305
 
        elif key == u"d":
306
 
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
307
 
                                  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()
308
214
        elif key == u"r" or key == u"_" or key == u"ctrl k":
309
215
            self.server_proxy_object.RemoveClient(self.proxy
310
216
                                                  .object_path)
311
217
        elif key == u"s":
312
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
218
            self.proxy.StartChecker()
313
219
        elif key == u"S":
314
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
220
            self.proxy.StopChecker()
315
221
        elif key == u"C":
316
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
222
            self.proxy.CheckedOK()
317
223
        # xxx
318
224
#         elif key == u"p" or key == "=":
319
225
#             self.proxy.pause()
321
227
#             self.proxy.unpause()
322
228
#         elif key == u"RET":
323
229
#             self.open()
324
 
#        elif key == u"+":
325
 
#            self.proxy.Approve(True)
326
 
#        elif key == u"-":
327
 
#            self.proxy.Approve(False)
328
230
        else:
329
231
            return key
330
232
    
522
424
            return
523
425
        self.remove_client(client, path)
524
426
    
525
 
    def add_new_client(self, path):
 
427
    def add_new_client(self, path, properties):
526
428
        client_proxy_object = self.bus.get_object(self.busname, path)
527
429
        self.add_client(MandosClientWidget(server_proxy_object
528
430
                                           =self.mandos_serv,
529
431
                                           proxy_object
530
432
                                           =client_proxy_object,
 
433
                                           properties=properties,
531
434
                                           update_hook
532
435
                                           =self.refresh,
533
436
                                           delete_hook
534
 
                                           =self.remove_client,
535
 
                                           logger
536
 
                                           =self.log_message),
 
437
                                           =self.remove_client),
537
438
                        path=path)
538
439
    
539
440
    def add_client(self, client, path=None):
622
523
                self.log_message_raw((u"bold",
623
524
                                      u"  "
624
525
                                      .join((u"Clients:",
625
 
                                             u"+: Enable",
626
 
                                             u"-: Disable",
 
526
                                             u"e: Enable",
 
527
                                             u"d: Disable",
627
528
                                             u"r: Remove",
628
529
                                             u"s: Start new checker",
629
530
                                             u"S: Stop checker",
630
 
                                             u"C: Checker OK",
631
 
                                             u"a: Approve",
632
 
                                             u"d: Deny"))))
 
531
                                             u"C: Checker OK"))))
633
532
                self.refresh()
634
533
            elif key == u"tab":
635
534
                if self.topwidget.get_focus() is self.logbox:
663
562
ui = UserInterface()
664
563
try:
665
564
    ui.run()
666
 
except KeyboardInterrupt:
667
 
    ui.screen.stop()
668
 
except Exception, e:
669
 
    ui.log_message(unicode(e))
 
565
except:
670
566
    ui.screen.stop()
671
567
    raise