/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 at bsnet
  • Date: 2010-09-09 18:16:14 UTC
  • mfrom: (237.2.35 mandos-empty-device)
  • Revision ID: teddy@fukt.bsnet.se-20100909181614-oanlmvkzsiodbo3c
Merge in branch to interpret an empty device name to mean
"autodetect".

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