/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos-monitor

* 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
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
70
73
        self.properties.update(
71
74
            self.proxy.GetAll(client_interface,
72
75
                              dbus_interface = dbus.PROPERTIES_IFACE))
73
 
        super(MandosClientPropertyCache, self).__init__(
74
 
            proxy_object=proxy_object, *args, **kwargs)
 
76
 
 
77
        #XXX This break good super behaviour!
 
78
#        super(MandosClientPropertyCache, self).__init__(
 
79
#            *args, **kwargs)
75
80
    
76
81
    def property_changed(self, property=None, value=None):
77
82
        """This is called whenever we get a PropertyChanged signal
97
102
        self.logger = logger
98
103
        
99
104
        self._update_timer_callback_tag = None
 
105
        self._update_timer_callback_lock = 0
100
106
        self.last_checker_failed = False
101
107
        
102
108
        # The widget shown normally
108
114
            *args, **kwargs)
109
115
        self.update()
110
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
        
111
136
        self.proxy.connect_to_signal(u"CheckerCompleted",
112
137
                                     self.checker_completed,
113
138
                                     client_interface,
120
145
                                     self.got_secret,
121
146
                                     client_interface,
122
147
                                     byte_arrays=True)
 
148
        self.proxy.connect_to_signal(u"NeedApproval",
 
149
                                     self.need_approval,
 
150
                                     client_interface,
 
151
                                     byte_arrays=True)
123
152
        self.proxy.connect_to_signal(u"Rejected",
124
153
                                     self.rejected,
125
154
                                     client_interface,
126
155
                                     byte_arrays=True)
127
 
        last_checked_ok = isoformat_to_datetime(self.properties
128
 
                                                ["last_checked_ok"])
129
 
        if last_checked_ok is None:
130
 
            self.last_checker_failed = True
 
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
131
170
        else:
132
 
            self.last_checker_failed = ((datetime.datetime.utcnow()
133
 
                                         - last_checked_ok)
134
 
                                        > datetime.timedelta
135
 
                                        (milliseconds=
136
 
                                         self.properties["interval"]))
137
 
        if self.last_checker_failed:
 
171
            self._update_timer_callback_lock -= 1
 
172
        if old == 0 and self._update_timer_callback_lock:
138
173
            self._update_timer_callback_tag = (gobject.timeout_add
139
174
                                               (1000,
140
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
141
179
    
142
180
    def checker_completed(self, exitstatus, condition, command):
143
181
        if exitstatus == 0:
144
182
            if self.last_checker_failed:
145
183
                self.last_checker_failed = False
146
 
                gobject.source_remove(self._update_timer_callback_tag)
147
 
                self._update_timer_callback_tag = None
148
 
            self.logger(u'Checker for client %s (command "%s")'
149
 
                        u' was successful'
150
 
                        % (self.properties[u"name"], command))
 
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))
151
188
            self.update()
152
189
            return
153
190
        # Checker failed
154
191
        if not self.last_checker_failed:
155
192
            self.last_checker_failed = True
156
 
            self._update_timer_callback_tag = (gobject.timeout_add
157
 
                                               (1000,
158
 
                                                self.update_timer))
 
193
            self.using_timer(True)
159
194
        if os.WIFEXITED(condition):
160
195
            self.logger(u'Checker for client %s (command "%s")'
161
196
                        u' failed with exit code %s'
162
 
                        % (self.properties[u"name"], command,
 
197
                        % (self.properties[u"Name"], command,
163
198
                           os.WEXITSTATUS(condition)))
164
199
        elif os.WIFSIGNALED(condition):
165
200
            self.logger(u'Checker for client %s (command "%s")'
166
201
                        u' was killed by signal %s'
167
 
                        % (self.properties[u"name"], command,
 
202
                        % (self.properties[u"Name"], command,
168
203
                           os.WTERMSIG(condition)))
169
204
        elif os.WCOREDUMP(condition):
170
205
            self.logger(u'Checker for client %s (command "%s")'
171
206
                        u' dumped core'
172
 
                        % (self.properties[u"name"], command))
 
207
                        % (self.properties[u"Name"], command))
173
208
        else:
174
 
            self.logger(u'Checker for client %s completed mysteriously')
 
209
            self.logger(u'Checker for client %s completed'
 
210
                        u' mysteriously')
175
211
        self.update()
176
212
    
177
213
    def checker_started(self, command):
178
 
        self.logger(u'Client %s started checker "%s"'
179
 
                    % (self.properties[u"name"], unicode(command)))
 
214
        #self.logger(u'Client %s started checker "%s"'
 
215
        #            % (self.properties[u"Name"], unicode(command)))
 
216
        pass
180
217
    
181
218
    def got_secret(self):
 
219
        self.last_checker_failed = False
182
220
        self.logger(u'Client %s received its secret'
183
 
                    % self.properties[u"name"])
184
 
    
185
 
    def rejected(self):
186
 
        self.logger(u'Client %s was rejected'
187
 
                    % self.properties[u"name"])
 
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))
188
235
    
189
236
    def selectable(self):
190
237
        """Make this a "selectable" widget.
212
259
                          u"bold-underline-blink":
213
260
                              u"bold-underline-blink-standout",
214
261
                          }
215
 
        
 
262
 
216
263
        # Rebuild focus and non-focus widgets using current properties
217
 
        self._text = (u'%(name)s: %(enabled)s%(timer)s'
218
 
                      % { u"name": self.properties[u"name"],
219
 
                          u"enabled":
220
 
                              (u"enabled"
221
 
                               if self.properties[u"enabled"]
222
 
                               else u"DISABLED"),
223
 
                          u"timer": (unicode(datetime.timedelta
224
 
                                             (milliseconds =
225
 
                                              self.properties
226
 
                                              [u"timeout"])
227
 
                                             - (datetime.datetime
228
 
                                                .utcnow()
229
 
                                                - isoformat_to_datetime
230
 
                                                (max((self.properties
231
 
                                                 ["last_checked_ok"]
232
 
                                                 or
233
 
                                                 self.properties
234
 
                                                 ["created"]),
235
 
                                                    self.properties[u"last_enabled"]))))
236
 
                                     if (self.last_checker_failed
237
 
                                         and self.properties
238
 
                                         [u"enabled"])
239
 
                                     else u"")})
 
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
            
240
302
        if not urwid.supports_unicode():
241
303
            self._text = self._text.encode("ascii", "replace")
242
304
        textlist = [(u"normal", self._text)]
274
336
    def keypress(self, (maxcol,), key):
275
337
        """Handle keys.
276
338
        This overrides the method from urwid.FlowWidget"""
277
 
        if key == u"e" or key == u"+":
278
 
            self.proxy.Enable()
279
 
        elif key == u"d" or key == u"-":
280
 
            self.proxy.Disable()
 
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)
281
349
        elif key == u"r" or key == u"_" or key == u"ctrl k":
282
350
            self.server_proxy_object.RemoveClient(self.proxy
283
351
                                                  .object_path)
284
352
        elif key == u"s":
285
 
            self.proxy.StartChecker()
 
353
            self.proxy.StartChecker(dbus_interface = client_interface)
286
354
        elif key == u"S":
287
 
            self.proxy.StopChecker()
 
355
            self.proxy.StopChecker(dbus_interface = client_interface)
288
356
        elif key == u"C":
289
 
            self.proxy.CheckedOK()
 
357
            self.proxy.CheckedOK(dbus_interface = client_interface)
290
358
        # xxx
291
359
#         elif key == u"p" or key == "=":
292
360
#             self.proxy.pause()
315
383
    use them as an excuse to shift focus away from this widget.
316
384
    """
317
385
    def keypress(self, (maxcol, maxrow), key):
318
 
        ret = super(ConstrainedListBox, self).keypress((maxcol, maxrow), key)
 
386
        ret = super(ConstrainedListBox, self).keypress((maxcol,
 
387
                                                        maxrow), key)
319
388
        if ret in (u"up", u"down"):
320
389
            return
321
390
        return ret
438
507
        Call this when the widget layout needs to change"""
439
508
        self.uilist = []
440
509
        #self.uilist.append(urwid.ListBox(self.clients))
441
 
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.clients),
 
510
        self.uilist.append(urwid.Frame(ConstrainedListBox(self.
 
511
                                                          clients),
442
512
                                       #header=urwid.Divider(),
443
513
                                       header=None,
444
 
                                       footer=urwid.Divider(div_char=self.divider)))
 
514
                                       footer=
 
515
                                       urwid.Divider(div_char=
 
516
                                                     self.divider)))
445
517
        if self.log_visible:
446
518
            self.uilist.append(self.logbox)
447
519
            pass
465
537
        """Toggle visibility of the log buffer."""
466
538
        self.log_visible = not self.log_visible
467
539
        self.rebuild()
468
 
        self.log_message(u"Log visibility changed to: "
469
 
                         + unicode(self.log_visible))
 
540
        #self.log_message(u"Log visibility changed to: "
 
541
        #                 + unicode(self.log_visible))
470
542
    
471
543
    def change_log_display(self):
472
544
        """Change type of log display.
477
549
            self.log_wrap = u"clip"
478
550
        for textwidget in self.log:
479
551
            textwidget.set_wrap_mode(self.log_wrap)
480
 
        self.log_message(u"Wrap mode: " + self.log_wrap)
 
552
        #self.log_message(u"Wrap mode: " + self.log_wrap)
481
553
    
482
554
    def find_and_remove_client(self, path, name):
483
555
        """Find an client from its object path and remove it.
510
582
        if path is None:
511
583
            path = client.proxy.object_path
512
584
        self.clients_dict[path] = client
513
 
        self.clients.sort(None, lambda c: c.properties[u"name"])
 
585
        self.clients.sort(None, lambda c: c.properties[u"Name"])
514
586
        self.refresh()
515
587
    
516
588
    def remove_client(self, client, path=None):
591
663
                self.log_message_raw((u"bold",
592
664
                                      u"  "
593
665
                                      .join((u"Clients:",
594
 
                                             u"e: Enable",
595
 
                                             u"d: Disable",
 
666
                                             u"+: Enable",
 
667
                                             u"-: Disable",
596
668
                                             u"r: Remove",
597
669
                                             u"s: Start new checker",
598
670
                                             u"S: Stop checker",
599
 
                                             u"C: Checker OK"))))
 
671
                                             u"C: Checker OK",
 
672
                                             u"a: Approve",
 
673
                                             u"d: Deny"))))
600
674
                self.refresh()
601
675
            elif key == u"tab":
602
676
                if self.topwidget.get_focus() is self.logbox:
630
704
ui = UserInterface()
631
705
try:
632
706
    ui.run()
 
707
except KeyboardInterrupt:
 
708
    ui.screen.stop()
633
709
except Exception, e:
634
710
    ui.log_message(unicode(e))
635
711
    ui.screen.stop()