/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

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
125
120
                                     self.got_secret,
126
121
                                     client_interface,
127
122
                                     byte_arrays=True)
128
 
        self.proxy.connect_to_signal(u"NeedApproval",
129
 
                                     self.need_approval,
130
 
                                     client_interface,
131
 
                                     byte_arrays=True)
132
123
        self.proxy.connect_to_signal(u"Rejected",
133
124
                                     self.rejected,
134
125
                                     client_interface,
184
175
        self.update()
185
176
    
186
177
    def checker_started(self, command):
187
 
        #self.logger(u'Client %s started checker "%s"'
188
 
        #            % (self.properties[u"name"], unicode(command)))
189
 
        pass
 
178
        self.logger(u'Client %s started checker "%s"'
 
179
                    % (self.properties[u"name"], unicode(command)))
190
180
    
191
181
    def got_secret(self):
192
 
        self.last_checker_failed = False
193
182
        self.logger(u'Client %s received its secret'
194
183
                    % self.properties[u"name"])
195
184
    
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))
 
185
    def rejected(self):
 
186
        self.logger(u'Client %s was rejected'
 
187
                    % self.properties[u"name"])
207
188
    
208
189
    def selectable(self):
209
190
        """Make this a "selectable" widget.
231
212
                          u"bold-underline-blink":
232
213
                              u"bold-underline-blink-standout",
233
214
                          }
234
 
 
 
215
        
235
216
        # Rebuild focus and non-focus widgets using current properties
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
 
            
 
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"")})
261
240
        if not urwid.supports_unicode():
262
241
            self._text = self._text.encode("ascii", "replace")
263
242
        textlist = [(u"normal", self._text)]
295
274
    def keypress(self, (maxcol,), key):
296
275
        """Handle keys.
297
276
        This overrides the method from urwid.FlowWidget"""
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)
 
277
        if key == u"e" or key == u"+":
 
278
            self.proxy.Enable()
 
279
        elif key == u"d" or key == u"-":
 
280
            self.proxy.Disable()
308
281
        elif key == u"r" or key == u"_" or key == u"ctrl k":
309
282
            self.server_proxy_object.RemoveClient(self.proxy
310
283
                                                  .object_path)
311
284
        elif key == u"s":
312
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
285
            self.proxy.StartChecker()
313
286
        elif key == u"S":
314
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
287
            self.proxy.StopChecker()
315
288
        elif key == u"C":
316
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
289
            self.proxy.CheckedOK()
317
290
        # xxx
318
291
#         elif key == u"p" or key == "=":
319
292
#             self.proxy.pause()
321
294
#             self.proxy.unpause()
322
295
#         elif key == u"RET":
323
296
#             self.open()
324
 
#        elif key == u"+":
325
 
#            self.proxy.Approve(True)
326
 
#        elif key == u"-":
327
 
#            self.proxy.Approve(False)
328
297
        else:
329
298
            return key
330
299
    
622
591
                self.log_message_raw((u"bold",
623
592
                                      u"  "
624
593
                                      .join((u"Clients:",
625
 
                                             u"+: Enable",
626
 
                                             u"-: Disable",
 
594
                                             u"e: Enable",
 
595
                                             u"d: Disable",
627
596
                                             u"r: Remove",
628
597
                                             u"s: Start new checker",
629
598
                                             u"S: Stop checker",
630
 
                                             u"C: Checker OK",
631
 
                                             u"a: Approve",
632
 
                                             u"d: Deny"))))
 
599
                                             u"C: Checker OK"))))
633
600
                self.refresh()
634
601
            elif key == u"tab":
635
602
                if self.topwidget.get_focus() is self.logbox:
663
630
ui = UserInterface()
664
631
try:
665
632
    ui.run()
666
 
except KeyboardInterrupt:
667
 
    ui.screen.stop()
668
633
except Exception, e:
669
634
    ui.log_message(unicode(e))
670
635
    ui.screen.stop()