/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: 2010-09-26 17:36:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100926173630-zk7pe17fp2bv6zr7
* DBUS-API: Document new "LastApprovalRequest" client property.

* mandos (Client.last_approval_request): New attribute.
  (Client.need_approval): New method.
  (ClientDBus.need_approval): - '' -
  (ClientDBus.NeedApproval): Call self.need_approval().
  (ClientDBus.LastApprovalRequest_dbus_property): New D-Bus property.

* mandos-monitor: Show timeout counter during approval delay.
  (MandosClientWidget._update_timer_callback_lock): New.
  (MandosClientWidget.property_changed): Override to also call
                                         using_timer if
                                         ApprovalPending property is
                                         changed.
  (MandosClientWidget.using_timer): New method.
  (MandosClientWidget.checker_completed): Use "using_timer".
  (MandosClientWidget.need_approval): - '' -
  (MandosClientWidget.update): Show approval delay timer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
40
40
urwid.curses_display.curses.A_UNDERLINE |= (
41
41
    urwid.curses_display.curses.A_BLINK)
42
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
 
43
59
class MandosClientPropertyCache(object):
44
60
    """This wraps a Mandos Client D-Bus proxy object, caches the
45
61
    properties and calls a hook function when any of them are
85
101
        # Logger
86
102
        self.logger = logger
87
103
        
 
104
        self._update_timer_callback_tag = None
 
105
        self._update_timer_callback_lock = 0
 
106
        self.last_checker_failed = False
 
107
        
88
108
        # The widget shown normally
89
109
        self._text_widget = urwid.Text(u"")
90
110
        # The widget shown when we have focus
94
114
            *args, **kwargs)
95
115
        self.update()
96
116
        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
        
97
136
        self.proxy.connect_to_signal(u"CheckerCompleted",
98
137
                                     self.checker_completed,
99
138
                                     client_interface,
115
154
                                     client_interface,
116
155
                                     byte_arrays=True)
117
156
    
 
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
    
118
180
    def checker_completed(self, exitstatus, condition, command):
119
181
        if exitstatus == 0:
 
182
            if self.last_checker_failed:
 
183
                self.last_checker_failed = False
 
184
                self.using_timer(False)
120
185
            #self.logger(u'Checker for client %s (command "%s")'
121
186
            #            u' was successful'
122
 
            #            % (self.properties[u"name"], command))
 
187
            #            % (self.properties[u"Name"], command))
 
188
            self.update()
123
189
            return
 
190
        # Checker failed
 
191
        if not self.last_checker_failed:
 
192
            self.last_checker_failed = True
 
193
            self.using_timer(True)
124
194
        if os.WIFEXITED(condition):
125
195
            self.logger(u'Checker for client %s (command "%s")'
126
196
                        u' failed with exit code %s'
127
 
                        % (self.properties[u"name"], command,
 
197
                        % (self.properties[u"Name"], command,
128
198
                           os.WEXITSTATUS(condition)))
129
 
            return
130
 
        if os.WIFSIGNALED(condition):
 
199
        elif os.WIFSIGNALED(condition):
131
200
            self.logger(u'Checker for client %s (command "%s")'
132
201
                        u' was killed by signal %s'
133
 
                        % (self.properties[u"name"], command,
 
202
                        % (self.properties[u"Name"], command,
134
203
                           os.WTERMSIG(condition)))
135
 
            return
136
 
        if os.WCOREDUMP(condition):
 
204
        elif os.WCOREDUMP(condition):
137
205
            self.logger(u'Checker for client %s (command "%s")'
138
206
                        u' dumped core'
139
 
                        % (self.properties[u"name"], command))
140
 
        self.logger(u'Checker for client %s completed mysteriously')
 
207
                        % (self.properties[u"Name"], command))
 
208
        else:
 
209
            self.logger(u'Checker for client %s completed'
 
210
                        u' mysteriously')
 
211
        self.update()
141
212
    
142
213
    def checker_started(self, command):
143
214
        #self.logger(u'Client %s started checker "%s"'
144
 
        #            % (self.properties[u"name"], unicode(command)))
 
215
        #            % (self.properties[u"Name"], unicode(command)))
145
216
        pass
146
217
    
147
218
    def got_secret(self):
 
219
        self.last_checker_failed = False
148
220
        self.logger(u'Client %s received its secret'
149
 
                    % self.properties[u"name"])
 
221
                    % self.properties[u"Name"])
150
222
    
151
223
    def need_approval(self, timeout, default):
152
224
        if not default:
154
226
        else:
155
227
            message = u'Client %s will get its secret in %s seconds'
156
228
        self.logger(message
157
 
                    % (self.properties[u"name"], timeout/1000))
 
229
                    % (self.properties[u"Name"], timeout/1000))
 
230
        self.using_timer(True)
158
231
    
159
232
    def rejected(self, reason):
160
233
        self.logger(u'Client %s was rejected; reason: %s'
161
 
                    % (self.properties[u"name"], reason))
 
234
                    % (self.properties[u"Name"], reason))
162
235
    
163
236
    def selectable(self):
164
237
        """Make this a "selectable" widget.
190
263
        # Rebuild focus and non-focus widgets using current properties
191
264
 
192
265
        # Base part of a client. Name!
193
 
        self._text = (u'%(name)s: '
194
 
                      % {u"name": self.properties[u"name"]})
195
 
 
196
 
        if self.properties[u"approved_pending"]:
197
 
            if self.properties[u"approved_by_default"]:
198
 
                self._text += u"Connection established to client. (d)eny?"
199
 
            else:
200
 
                self._text += u"Seeks approval to send secret. (a)pprove?"
 
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])
201
298
        else:
202
 
            self._text += (u'%(enabled)s'
203
 
                           % {u"enabled":
204
 
                               (u"enabled"
205
 
                                if self.properties[u"enabled"]
206
 
                                else u"DISABLED")})
 
299
            message = u"enabled"
 
300
        self._text = "%s%s" % (base, message)
 
301
            
207
302
        if not urwid.supports_unicode():
208
303
            self._text = self._text.encode("ascii", "replace")
209
304
        textlist = [(u"normal", self._text)]
220
315
        if self.update_hook is not None:
221
316
            self.update_hook()
222
317
    
 
318
    def update_timer(self):
 
319
        "called by gobject"
 
320
        self.update()
 
321
        return True             # Keep calling this
 
322
    
223
323
    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
224
327
        if self.delete_hook is not None:
225
328
            self.delete_hook(self)
226
329
    
259
362
#             self.proxy.unpause()
260
363
#         elif key == u"RET":
261
364
#             self.open()
262
 
#        elif key == u"+":
263
 
#            self.proxy.Approve(True)
264
 
#        elif key == u"-":
265
 
#            self.proxy.Approve(False)
266
365
        else:
267
366
            return key
268
367
    
284
383
    use them as an excuse to shift focus away from this widget.
285
384
    """
286
385
    def keypress(self, (maxcol, maxrow), key):
287
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
386
        ret = super(ConstrainedListBox, self).keypress((maxcol,
 
387
                                                        maxrow), key)
288
388
        if ret in (u"up", u"down"):
289
389
            return
290
390
        return ret
407
507
        Call this when the widget layout needs to change"""
408
508
        self.uilist = []
409
509
        #self.uilist.append(urwid.ListBox(self.clients))
410
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
510
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
511
                                                          clients),
411
512
                                       #header=urwid.Divider(),
412
513
                                       header=None,
413
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
514
                                       footer=
 
515
                                       urwid.Divider(div_char=
 
516
                                                     self.divider)))
414
517
        if self.log_visible:
415
518
            self.uilist.append(self.logbox)
416
519
            pass
434
537
        """Toggle visibility of the log buffer."""
435
538
        self.log_visible = not self.log_visible
436
539
        self.rebuild()
437
 
        self.log_message(u"Log visibility changed to: "
438
 
                         + unicode(self.log_visible))
 
540
        #self.log_message(u"Log visibility changed to: "
 
541
        #                 + unicode(self.log_visible))
439
542
    
440
543
    def change_log_display(self):
441
544
        """Change type of log display.
446
549
            self.log_wrap = u"clip"
447
550
        for textwidget in self.log:
448
551
            textwidget.set_wrap_mode(self.log_wrap)
449
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
552
        #self.log_message(u"Wrap mode: " + self.log_wrap)
450
553
    
451
554
    def find_and_remove_client(self, path, name):
452
555
        """Find an client from its object path and remove it.
479
582
        if path is None:
480
583
            path = client.proxy.object_path
481
584
        self.clients_dict[path] = client
482
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
585
        self.clients.sort(None, lambda c: c.properties[u"Name"])
483
586
        self.refresh()
484
587
    
485
588
    def remove_client(self, client, path=None):
601
704
ui = UserInterface()
602
705
try:
603
706
    ui.run()
 
707
except KeyboardInterrupt:
 
708
    ui.screen.stop()
604
709
except Exception, e:
605
710
    ui.log_message(unicode(e))
606
711
    ui.screen.stop()