/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-07 16:48:58 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 421.
  • Revision ID: belorn@fukt.bsnet.se-20100907164858-tcg8hkxdj41zizac
mandos server: Added debuglevel that adjust at what level information
               should be reported.
plugin-runner, askpass-fifo, password-prompt, splasy, usplash:
               Using error instead of perror

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