/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

  • Committer: Teddy Hogeborn
  • Date: 2014-01-06 15:56:54 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20140106155654-urx23ytuvy0nxzwp
Update init script to modern standards.

* init.d-mandos (status): Moved to standard location.  Re-added use of
                          -p switch compared to skeleton file.
  (*): Update message to include "status".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009-2012 Teddy Hogeborn
7
 
# Copyright © 2009-2012 Björn Påhlsson
 
6
# Copyright © 2009-2013 Teddy Hogeborn
 
7
# Copyright © 2009-2013 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
17
17
#     GNU General Public License for more details.
18
18
# 
19
19
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
20
# along with this program.  If not, see
 
21
# <http://www.gnu.org/licenses/>.
21
22
# 
22
23
# Contact the authors at <mandos@recompile.se>.
23
24
# 
24
25
 
25
26
from __future__ import (division, absolute_import, print_function,
26
27
                        unicode_literals)
 
28
try:
 
29
    from future_builtins import *
 
30
except ImportError:
 
31
    pass
27
32
 
28
33
import sys
29
34
import os
35
40
import urwid
36
41
 
37
42
from dbus.mainloop.glib import DBusGMainLoop
38
 
import gobject
 
43
try:
 
44
    import gobject
 
45
except ImportError:
 
46
    from gi.repository import GObject as gobject
39
47
 
40
48
import dbus
41
49
 
42
 
import UserList
43
 
 
44
50
import locale
45
51
 
 
52
if sys.version_info[0] == 2:
 
53
    str = unicode
 
54
 
46
55
locale.setlocale(locale.LC_ALL, '')
47
56
 
48
57
import logging
52
61
domain = 'se.recompile'
53
62
server_interface = domain + '.Mandos'
54
63
client_interface = domain + '.Mandos.Client'
55
 
version = "1.5.3"
56
 
 
57
 
# Always run in monochrome mode
58
 
urwid.curses_display.curses.has_colors = lambda : False
59
 
 
60
 
# Urwid doesn't support blinking, but we want it.  Since we have no
61
 
# use for underline on its own, we make underline also always blink.
62
 
urwid.curses_display.curses.A_UNDERLINE |= (
63
 
    urwid.curses_display.curses.A_BLINK)
 
64
version = "1.6.2"
64
65
 
65
66
def isoformat_to_datetime(iso):
66
67
    "Parse an ISO 8601 date string to a datetime.datetime()"
83
84
    properties and calls a hook function when any of them are
84
85
    changed.
85
86
    """
86
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
87
    def __init__(self, proxy_object=None, properties=None, **kwargs):
87
88
        self.proxy = proxy_object # Mandos Client proxy object
88
 
        
89
 
        self.properties = dict()
 
89
        self.properties = dict() if properties is None else properties
90
90
        self.property_changed_match = (
91
91
            self.proxy.connect_to_signal("PropertyChanged",
92
 
                                         self.property_changed,
 
92
                                         self._property_changed,
93
93
                                         client_interface,
94
94
                                         byte_arrays=True))
95
95
        
96
 
        self.properties.update(
97
 
            self.proxy.GetAll(client_interface,
98
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
99
 
 
100
 
        #XXX This breaks good super behaviour
101
 
#        super(MandosClientPropertyCache, self).__init__(
102
 
#            *args, **kwargs)
 
96
        if properties is None:
 
97
            self.properties.update(
 
98
                self.proxy.GetAll(client_interface,
 
99
                                  dbus_interface
 
100
                                  = dbus.PROPERTIES_IFACE))
 
101
        
 
102
        super(MandosClientPropertyCache, self).__init__(**kwargs)
 
103
    
 
104
    def _property_changed(self, property, value):
 
105
        """Helper which takes positional arguments"""
 
106
        return self.property_changed(property=property, value=value)
103
107
    
104
108
    def property_changed(self, property=None, value=None):
105
109
        """This is called whenever we get a PropertyChanged signal
108
112
        # Update properties dict with new value
109
113
        self.properties[property] = value
110
114
    
111
 
    def delete(self, *args, **kwargs):
 
115
    def delete(self):
112
116
        self.property_changed_match.remove()
113
 
        super(MandosClientPropertyCache, self).__init__(
114
 
            *args, **kwargs)
115
117
 
116
118
 
117
119
class MandosClientWidget(urwid.FlowWidget, MandosClientPropertyCache):
119
121
    """
120
122
    
121
123
    def __init__(self, server_proxy_object=None, update_hook=None,
122
 
                 delete_hook=None, logger=None, *args, **kwargs):
 
124
                 delete_hook=None, logger=None, **kwargs):
123
125
        # Called on update
124
126
        self.update_hook = update_hook
125
127
        # Called on delete
130
132
        self.logger = logger
131
133
        
132
134
        self._update_timer_callback_tag = None
133
 
        self._update_timer_callback_lock = 0
134
135
        
135
136
        # The widget shown normally
136
137
        self._text_widget = urwid.Text("")
137
138
        # The widget shown when we have focus
138
139
        self._focus_text_widget = urwid.Text("")
139
 
        super(MandosClientWidget, self).__init__(
140
 
            update_hook=update_hook, delete_hook=delete_hook,
141
 
            *args, **kwargs)
 
140
        super(MandosClientWidget, self).__init__(**kwargs)
142
141
        self.update()
143
142
        self.opened = False
144
143
        
145
 
        last_checked_ok = isoformat_to_datetime(self.properties
146
 
                                                ["LastCheckedOK"])
147
 
        
148
 
        if self.properties ["LastCheckerStatus"] != 0:
149
 
            self.using_timer(True)
150
 
        
151
 
        if self.need_approval:
152
 
            self.using_timer(True)
153
 
        
154
144
        self.match_objects = (
155
145
            self.proxy.connect_to_signal("CheckerCompleted",
156
146
                                         self.checker_completed,
175
165
        #self.logger('Created client {0}'
176
166
        #            .format(self.properties["Name"]))
177
167
    
178
 
    def property_changed(self, property=None, value=None):
179
 
        super(self, MandosClientWidget).property_changed(property,
180
 
                                                         value)
181
 
        if property == "ApprovalPending":
182
 
            using_timer(bool(value))
183
 
        if property == "LastCheckerStatus":
184
 
            using_timer(value != 0)
185
 
            #self.logger('Checker for client {0} (command "{1}") was '
186
 
            #            ' successful'.format(self.properties["Name"],
187
 
            #                                 command))
188
 
    
189
168
    def using_timer(self, flag):
190
169
        """Call this method with True or False when timer should be
191
170
        activated or deactivated.
192
171
        """
193
 
        old = self._update_timer_callback_lock
194
 
        if flag:
195
 
            self._update_timer_callback_lock += 1
196
 
        else:
197
 
            self._update_timer_callback_lock -= 1
198
 
        if old == 0 and self._update_timer_callback_lock:
 
172
        if flag and self._update_timer_callback_tag is None:
199
173
            # Will update the shown timer value every second
200
174
            self._update_timer_callback_tag = (gobject.timeout_add
201
175
                                               (1000,
202
176
                                                self.update_timer))
203
 
        elif old and self._update_timer_callback_lock == 0:
 
177
        elif not (flag or self._update_timer_callback_tag is None):
204
178
            gobject.source_remove(self._update_timer_callback_tag)
205
179
            self._update_timer_callback_tag = None
206
180
    
234
208
           to log in the future. """
235
209
        #self.logger('Client {0} started checker "{1}"'
236
210
        #            .format(self.properties["Name"],
237
 
        #                    unicode(command)))
 
211
        #                    str(command)))
238
212
        pass
239
213
    
240
214
    def got_secret(self):
248
222
            message = 'Client {0} will get its secret in {1} seconds'
249
223
        self.logger(message.format(self.properties["Name"],
250
224
                                   timeout/1000))
251
 
        self.using_timer(True)
252
225
    
253
226
    def rejected(self, reason):
254
227
        self.logger('Client {0} was rejected; reason: {1}'
280
253
                          "bold-underline-blink":
281
254
                              "bold-underline-blink-standout",
282
255
                          }
283
 
 
 
256
        
284
257
        # Rebuild focus and non-focus widgets using current properties
285
 
 
 
258
        
286
259
        # Base part of a client. Name!
287
260
        base = '{name}: '.format(name=self.properties["Name"])
288
261
        if not self.properties["Enabled"]:
289
262
            message = "DISABLED"
 
263
            self.using_timer(False)
290
264
        elif self.properties["ApprovalPending"]:
291
265
            timeout = datetime.timedelta(milliseconds
292
266
                                         = self.properties
294
268
            last_approval_request = isoformat_to_datetime(
295
269
                self.properties["LastApprovalRequest"])
296
270
            if last_approval_request is not None:
297
 
                timer = timeout - (datetime.datetime.utcnow()
298
 
                                   - last_approval_request)
 
271
                timer = max(timeout - (datetime.datetime.utcnow()
 
272
                                       - last_approval_request),
 
273
                            datetime.timedelta())
299
274
            else:
300
275
                timer = datetime.timedelta()
301
276
            if self.properties["ApprovedByDefault"]:
302
277
                message = "Approval in {0}. (d)eny?"
303
278
            else:
304
279
                message = "Denial in {0}. (a)pprove?"
305
 
            message = message.format(unicode(timer).rsplit(".", 1)[0])
 
280
            message = message.format(str(timer).rsplit(".", 1)[0])
 
281
            self.using_timer(True)
306
282
        elif self.properties["LastCheckerStatus"] != 0:
307
 
            # When checker has failed, print a timer until client expires
 
283
            # When checker has failed, show timer until client expires
308
284
            expires = self.properties["Expires"]
309
285
            if expires == "":
310
286
                timer = datetime.timedelta(0)
311
287
            else:
312
 
                expires = datetime.datetime.strptime(expires,
313
 
                                                     '%Y-%m-%dT%H:%M:%S.%f')
314
 
                timer = expires - datetime.datetime.utcnow()
 
288
                expires = (datetime.datetime.strptime
 
289
                           (expires, '%Y-%m-%dT%H:%M:%S.%f'))
 
290
                timer = max(expires - datetime.datetime.utcnow(),
 
291
                            datetime.timedelta())
315
292
            message = ('A checker has failed! Time until client'
316
293
                       ' gets disabled: {0}'
317
 
                       .format(unicode(timer).rsplit(".", 1)[0]))
 
294
                       .format(str(timer).rsplit(".", 1)[0]))
 
295
            self.using_timer(True)
318
296
        else:
319
297
            message = "enabled"
 
298
            self.using_timer(False)
320
299
        self._text = "{0}{1}".format(base, message)
321
 
            
 
300
        
322
301
        if not urwid.supports_unicode():
323
302
            self._text = self._text.encode("ascii", "replace")
324
303
        textlist = [("normal", self._text)]
341
320
        self.update()
342
321
        return True             # Keep calling this
343
322
    
344
 
    def delete(self, *args, **kwargs):
 
323
    def delete(self, **kwargs):
345
324
        if self._update_timer_callback_tag is not None:
346
325
            gobject.source_remove(self._update_timer_callback_tag)
347
326
            self._update_timer_callback_tag = None
350
329
        self.match_objects = ()
351
330
        if self.delete_hook is not None:
352
331
            self.delete_hook(self)
353
 
        return super(MandosClientWidget, self).delete(*args, **kwargs)
 
332
        return super(MandosClientWidget, self).delete(**kwargs)
354
333
    
355
334
    def render(self, maxcolrow, focus=False):
356
335
        """Render differently if we have focus.
398
377
        else:
399
378
            return key
400
379
    
401
 
    def property_changed(self, property=None, value=None,
402
 
                         *args, **kwargs):
 
380
    def property_changed(self, property=None, **kwargs):
403
381
        """Call self.update() if old value is not new value.
404
382
        This overrides the method from MandosClientPropertyCache"""
405
 
        property_name = unicode(property)
 
383
        property_name = str(property)
406
384
        old_value = self.properties.get(property_name)
407
385
        super(MandosClientWidget, self).property_changed(
408
 
            property=property, value=value, *args, **kwargs)
 
386
            property=property, **kwargs)
409
387
        if self.properties.get(property_name) != old_value:
410
388
            self.update()
411
389
 
415
393
    "down" key presses, thus not allowing any containing widgets to
416
394
    use them as an excuse to shift focus away from this widget.
417
395
    """
418
 
    def keypress(self, maxcolrow, key):
419
 
        ret = super(ConstrainedListBox, self).keypress(maxcolrow, key)
 
396
    def keypress(self, *args, **kwargs):
 
397
        ret = super(ConstrainedListBox, self).keypress(*args, **kwargs)
420
398
        if ret in ("up", "down"):
421
399
            return
422
400
        return ret
435
413
                ("normal",
436
414
                 "default", "default", None),
437
415
                ("bold",
438
 
                 "default", "default", "bold"),
 
416
                 "bold", "default", "bold"),
439
417
                ("underline-blink",
440
 
                 "default", "default", "underline"),
 
418
                 "underline,blink", "default", "underline,blink"),
441
419
                ("standout",
442
 
                 "default", "default", "standout"),
 
420
                 "standout", "default", "standout"),
443
421
                ("bold-underline-blink",
444
 
                 "default", "default", ("bold", "underline")),
 
422
                 "bold,underline,blink", "default", "bold,underline,blink"),
445
423
                ("bold-standout",
446
 
                 "default", "default", ("bold", "standout")),
 
424
                 "bold,standout", "default", "bold,standout"),
447
425
                ("underline-blink-standout",
448
 
                 "default", "default", ("underline", "standout")),
 
426
                 "underline,blink,standout", "default",
 
427
                 "underline,blink,standout"),
449
428
                ("bold-underline-blink-standout",
450
 
                 "default", "default", ("bold", "underline",
451
 
                                          "standout")),
 
429
                 "bold,underline,blink,standout", "default",
 
430
                 "bold,underline,blink,standout"),
452
431
                ))
453
432
        
454
433
        if urwid.supports_unicode():
509
488
        self.topwidget = urwid.Pile(self.uilist)
510
489
    
511
490
    def log_message(self, message):
 
491
        """Log message formatted with timestamp"""
512
492
        timestamp = datetime.datetime.now().isoformat()
513
493
        self.log_message_raw(timestamp + ": " + message)
514
494
    
527
507
        self.log_visible = not self.log_visible
528
508
        self.rebuild()
529
509
        #self.log_message("Log visibility changed to: "
530
 
        #                 + unicode(self.log_visible))
 
510
        #                 + str(self.log_visible))
531
511
    
532
512
    def change_log_display(self):
533
513
        """Change type of log display.
573
553
        if path is None:
574
554
            path = client.proxy.object_path
575
555
        self.clients_dict[path] = client
576
 
        self.clients.sort(None, lambda c: c.properties["Name"])
 
556
        self.clients.sort(key=lambda c: c.properties["Name"])
577
557
        self.refresh()
578
558
    
579
559
    def remove_client(self, client, path=None):
581
561
        if path is None:
582
562
            path = client.proxy.object_path
583
563
        del self.clients_dict[path]
584
 
        if not self.clients_dict:
585
 
            # Work around bug in Urwid 0.9.8.3 - if a SimpleListWalker
586
 
            # is completely emptied, we need to recreate it.
587
 
            self.clients = urwid.SimpleListWalker([])
588
 
            self.rebuild()
589
564
        self.refresh()
590
565
    
591
566
    def refresh(self):
604
579
        try:
605
580
            mandos_clients = (self.mandos_serv
606
581
                              .GetAllClientsWithProperties())
 
582
            if not mandos_clients:
 
583
                self.log_message_raw(("bold", "Note: Server has no clients."))
607
584
        except dbus.exceptions.DBusException:
 
585
            self.log_message_raw(("bold", "Note: No Mandos server running."))
608
586
            mandos_clients = dbus.Dictionary()
609
587
        
610
588
        (self.mandos_serv
622
600
                            self.client_not_found,
623
601
                            dbus_interface=server_interface,
624
602
                            byte_arrays=True))
625
 
        for path, client in mandos_clients.iteritems():
 
603
        for path, client in mandos_clients.items():
626
604
            client_proxy_object = self.bus.get_object(self.busname,
627
605
                                                      path)
628
606
            self.add_client(MandosClientWidget(server_proxy_object
637
615
                                               logger
638
616
                                               =self.log_message),
639
617
                            path=path)
640
 
 
 
618
        
641
619
        self.refresh()
642
620
        self._input_callback_tag = (gobject.io_add_watch
643
621
                                    (sys.stdin.fileno(),
740
718
    ui.run()
741
719
except KeyboardInterrupt:
742
720
    ui.screen.stop()
743
 
except Exception, e:
744
 
    ui.log_message(unicode(e))
 
721
except Exception as e:
 
722
    ui.log_message(str(e))
745
723
    ui.screen.stop()
746
724
    raise