/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: Björn Påhlsson
  • Date: 2010-09-12 18:12:11 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 428.
  • Revision ID: belorn@fukt.bsnet.se-20100912181211-wvkt0sk37zhx7tws
mandos-client: Added never ending loop for --connect
mandos-ctl: Better option parsing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
23
23
 
24
24
locale.setlocale(locale.LC_ALL, u'')
25
25
 
 
26
import logging
 
27
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
 
28
 
26
29
# Some useful constants
27
30
domain = 'se.bsnet.fukt'
28
31
server_interface = domain + '.Mandos'
29
32
client_interface = domain + '.Mandos.Client'
30
 
version = "1.0.14"
 
33
version = "1.0.15"
31
34
 
32
35
# Always run in monochrome mode
33
36
urwid.curses_display.curses.has_colors = lambda : False
37
40
urwid.curses_display.curses.A_UNDERLINE |= (
38
41
    urwid.curses_display.curses.A_BLINK)
39
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
 
40
59
class MandosClientPropertyCache(object):
41
60
    """This wraps a Mandos Client D-Bus proxy object, caches the
42
61
    properties and calls a hook function when any of them are
50
69
                                     self.property_changed,
51
70
                                     client_interface,
52
71
                                     byte_arrays=True)
53
 
 
 
72
        
54
73
        self.properties.update(
55
74
            self.proxy.GetAll(client_interface,
56
75
                              dbus_interface = dbus.PROPERTIES_IFACE))
57
 
        super(MandosClientPropertyCache, self).__init__(
58
 
            proxy_object=proxy_object, *args, **kwargs)
 
76
 
 
77
        #XXX This break good super behaviour!
 
78
#        super(MandosClientPropertyCache, self).__init__(
 
79
#            *args, **kwargs)
59
80
    
60
81
    def property_changed(self, property=None, value=None):
61
82
        """This is called whenever we get a PropertyChanged signal
80
101
        # Logger
81
102
        self.logger = logger
82
103
        
 
104
        self._update_timer_callback_tag = None
 
105
        self.last_checker_failed = False
 
106
        
83
107
        # The widget shown normally
84
108
        self._text_widget = urwid.Text(u"")
85
109
        # The widget shown when we have focus
101
125
                                     self.got_secret,
102
126
                                     client_interface,
103
127
                                     byte_arrays=True)
 
128
        self.proxy.connect_to_signal(u"NeedApproval",
 
129
                                     self.need_approval,
 
130
                                     client_interface,
 
131
                                     byte_arrays=True)
104
132
        self.proxy.connect_to_signal(u"Rejected",
105
133
                                     self.rejected,
106
134
                                     client_interface,
107
135
                                     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))
108
150
    
109
151
    def checker_completed(self, exitstatus, condition, command):
110
152
        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
111
157
            self.logger(u'Checker for client %s (command "%s")'
112
158
                        u' was successful'
113
159
                        % (self.properties[u"name"], command))
 
160
            self.update()
114
161
            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))
115
168
        if os.WIFEXITED(condition):
116
169
            self.logger(u'Checker for client %s (command "%s")'
117
170
                        u' failed with exit code %s'
118
171
                        % (self.properties[u"name"], command,
119
172
                           os.WEXITSTATUS(condition)))
120
 
            return
121
 
        if os.WIFSIGNALED(condition):
 
173
        elif os.WIFSIGNALED(condition):
122
174
            self.logger(u'Checker for client %s (command "%s")'
123
175
                        u' was killed by signal %s'
124
176
                        % (self.properties[u"name"], command,
125
177
                           os.WTERMSIG(condition)))
126
 
            return
127
 
        if os.WCOREDUMP(condition):
 
178
        elif os.WCOREDUMP(condition):
128
179
            self.logger(u'Checker for client %s (command "%s")'
129
180
                        u' dumped core'
130
181
                        % (self.properties[u"name"], command))
131
 
        self.logger(u'Checker for client %s completed mysteriously')
 
182
        else:
 
183
            self.logger(u'Checker for client %s completed mysteriously')
 
184
        self.update()
132
185
    
133
186
    def checker_started(self, command):
134
 
        self.logger(u'Client %s started checker "%s"'
135
 
                    % (self.properties[u"name"], unicode(command)))
 
187
        #self.logger(u'Client %s started checker "%s"'
 
188
        #            % (self.properties[u"name"], unicode(command)))
 
189
        pass
136
190
    
137
191
    def got_secret(self):
 
192
        self.last_checker_failed = False
138
193
        self.logger(u'Client %s received its secret'
139
194
                    % self.properties[u"name"])
140
195
    
141
 
    def rejected(self):
142
 
        self.logger(u'Client %s was rejected'
143
 
                    % self.properties[u"name"])
 
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))
144
207
    
145
208
    def selectable(self):
146
209
        """Make this a "selectable" widget.
168
231
                          u"bold-underline-blink":
169
232
                              u"bold-underline-blink-standout",
170
233
                          }
171
 
        
 
234
 
172
235
        # Rebuild focus and non-focus widgets using current properties
173
 
        self._text = (u'%(name)s: %(enabled)s'
174
 
                      % { u"name": self.properties[u"name"],
175
 
                          u"enabled":
176
 
                              (u"enabled"
177
 
                               if self.properties[u"enabled"]
178
 
                               else u"DISABLED")})
 
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
            
179
261
        if not urwid.supports_unicode():
180
262
            self._text = self._text.encode("ascii", "replace")
181
263
        textlist = [(u"normal", self._text)]
192
274
        if self.update_hook is not None:
193
275
            self.update_hook()
194
276
    
 
277
    def update_timer(self):
 
278
        "called by gobject"
 
279
        self.update()
 
280
        return True             # Keep calling this
 
281
    
195
282
    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
196
286
        if self.delete_hook is not None:
197
287
            self.delete_hook(self)
198
288
    
205
295
    def keypress(self, (maxcol,), key):
206
296
        """Handle keys.
207
297
        This overrides the method from urwid.FlowWidget"""
208
 
        if key == u"e" or key == u"+":
209
 
            self.proxy.Enable()
210
 
        elif key == u"d" or key == u"-":
211
 
            self.proxy.Disable()
 
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)
212
308
        elif key == u"r" or key == u"_" or key == u"ctrl k":
213
309
            self.server_proxy_object.RemoveClient(self.proxy
214
310
                                                  .object_path)
215
311
        elif key == u"s":
216
 
            self.proxy.StartChecker()
 
312
            self.proxy.StartChecker(dbus_interface = client_interface)
217
313
        elif key == u"S":
218
 
            self.proxy.StopChecker()
 
314
            self.proxy.StopChecker(dbus_interface = client_interface)
219
315
        elif key == u"C":
220
 
            self.proxy.CheckedOK()
 
316
            self.proxy.CheckedOK(dbus_interface = client_interface)
221
317
        # xxx
222
318
#         elif key == u"p" or key == "=":
223
319
#             self.proxy.pause()
225
321
#             self.proxy.unpause()
226
322
#         elif key == u"RET":
227
323
#             self.open()
 
324
#        elif key == u"+":
 
325
#            self.proxy.Approve(True)
 
326
#        elif key == u"-":
 
327
#            self.proxy.Approve(False)
228
328
        else:
229
329
            return key
230
330
    
522
622
                self.log_message_raw((u"bold",
523
623
                                      u"  "
524
624
                                      .join((u"Clients:",
525
 
                                             u"e: Enable",
526
 
                                             u"d: Disable",
 
625
                                             u"+: Enable",
 
626
                                             u"-: Disable",
527
627
                                             u"r: Remove",
528
628
                                             u"s: Start new checker",
529
629
                                             u"S: Stop checker",
530
 
                                             u"C: Checker OK"))))
 
630
                                             u"C: Checker OK",
 
631
                                             u"a: Approve",
 
632
                                             u"d: Deny"))))
531
633
                self.refresh()
532
634
            elif key == u"tab":
533
635
                if self.topwidget.get_focus() is self.logbox:
561
663
ui = UserInterface()
562
664
try:
563
665
    ui.run()
 
666
except KeyboardInterrupt:
 
667
    ui.screen.stop()
564
668
except Exception, e:
565
669
    ui.log_message(unicode(e))
566
670
    ui.screen.stop()