/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 Hogeborn
  • Date: 2009-11-19 18:31:28 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
19
19
 
20
20
import UserList
21
21
 
22
 
import locale
23
 
 
24
 
locale.setlocale(locale.LC_ALL, u'')
25
 
 
26
 
import logging
27
 
logging.getLogger('dbus.proxies').setLevel(logging.CRITICAL)
28
 
 
29
22
# Some useful constants
30
23
domain = 'se.bsnet.fukt'
31
24
server_interface = domain + '.Mandos'
32
25
client_interface = domain + '.Mandos.Client'
33
 
version = "1.0.15"
 
26
version = "1.0.14"
34
27
 
35
28
# Always run in monochrome mode
36
29
urwid.curses_display.curses.has_colors = lambda : False
45
38
    properties and calls a hook function when any of them are
46
39
    changed.
47
40
    """
48
 
    def __init__(self, proxy_object=None, *args, **kwargs):
 
41
    def __init__(self, proxy_object=None, properties=None, *args,
 
42
                 **kwargs):
49
43
        self.proxy = proxy_object # Mandos Client proxy object
50
44
        
51
 
        self.properties = dict()
 
45
        if properties is None:
 
46
            self.properties = dict()
 
47
        else:
 
48
            self.properties = properties
52
49
        self.proxy.connect_to_signal(u"PropertyChanged",
53
50
                                     self.property_changed,
54
51
                                     client_interface,
55
52
                                     byte_arrays=True)
56
53
        
57
 
        self.properties.update(
58
 
            self.proxy.GetAll(client_interface,
59
 
                              dbus_interface = dbus.PROPERTIES_IFACE))
60
 
 
61
 
        #XXX This break good super behaviour!
62
 
#        super(MandosClientPropertyCache, self).__init__(
63
 
#            *args, **kwargs)
 
54
        if properties is None:
 
55
            self.properties.update(self.proxy.GetAll(client_interface,
 
56
                                                     dbus_interface =
 
57
                                                     dbus.PROPERTIES_IFACE))
 
58
        super(MandosClientPropertyCache, self).__init__(
 
59
            proxy_object=proxy_object,
 
60
            properties=properties, *args, **kwargs)
64
61
    
65
62
    def property_changed(self, property=None, value=None):
66
63
        """This is called whenever we get a PropertyChanged signal
106
103
                                     self.got_secret,
107
104
                                     client_interface,
108
105
                                     byte_arrays=True)
109
 
        self.proxy.connect_to_signal(u"NeedApproval",
110
 
                                     self.need_approval,
111
 
                                     client_interface,
112
 
                                     byte_arrays=True)
113
106
        self.proxy.connect_to_signal(u"Rejected",
114
107
                                     self.rejected,
115
108
                                     client_interface,
117
110
    
118
111
    def checker_completed(self, exitstatus, condition, command):
119
112
        if exitstatus == 0:
120
 
            #self.logger(u'Checker for client %s (command "%s")'
121
 
            #            u' was successful'
122
 
            #            % (self.properties[u"name"], command))
 
113
            self.logger(u'Checker for client %s (command "%s")'
 
114
                        u' was successful'
 
115
                        % (self.properties[u"name"], command))
123
116
            return
124
117
        if os.WIFEXITED(condition):
125
118
            self.logger(u'Checker for client %s (command "%s")'
140
133
        self.logger(u'Checker for client %s completed mysteriously')
141
134
    
142
135
    def checker_started(self, command):
143
 
        #self.logger(u'Client %s started checker "%s"'
144
 
        #            % (self.properties[u"name"], unicode(command)))
145
 
        pass
 
136
        self.logger(u'Client %s started checker "%s"'
 
137
                    % (self.properties[u"name"], unicode(command)))
146
138
    
147
139
    def got_secret(self):
148
140
        self.logger(u'Client %s received its secret'
149
141
                    % self.properties[u"name"])
150
142
    
151
 
    def need_approval(self, timeout, default):
152
 
        if not default:
153
 
            message = u'Client %s needs approval within %s seconds'
154
 
        else:
155
 
            message = u'Client %s will get its secret in %s seconds'
156
 
        self.logger(message
157
 
                    % (self.properties[u"name"], timeout/1000))
158
 
    
159
 
    def rejected(self, reason):
160
 
        self.logger(u'Client %s was rejected; reason: %s'
161
 
                    % (self.properties[u"name"], reason))
 
143
    def rejected(self):
 
144
        self.logger(u'Client %s was rejected'
 
145
                    % self.properties[u"name"])
162
146
    
163
147
    def selectable(self):
164
148
        """Make this a "selectable" widget.
186
170
                          u"bold-underline-blink":
187
171
                              u"bold-underline-blink-standout",
188
172
                          }
189
 
 
 
173
        
190
174
        # Rebuild focus and non-focus widgets using current properties
191
 
 
192
 
        # Base part of a client. Name!
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?"
201
 
        else:
202
 
            self._text += (u'%(enabled)s'
203
 
                           % {u"enabled":
204
 
                               (u"enabled"
205
 
                                if self.properties[u"enabled"]
206
 
                                else u"DISABLED")})
 
175
        self._text = (u'%(name)s: %(enabled)s'
 
176
                      % { u"name": self.properties[u"name"],
 
177
                          u"enabled":
 
178
                              (u"enabled"
 
179
                               if self.properties[u"enabled"]
 
180
                               else u"DISABLED")})
207
181
        if not urwid.supports_unicode():
208
182
            self._text = self._text.encode("ascii", "replace")
209
183
        textlist = [(u"normal", self._text)]
233
207
    def keypress(self, (maxcol,), key):
234
208
        """Handle keys.
235
209
        This overrides the method from urwid.FlowWidget"""
236
 
        if key == u"+":
237
 
            self.proxy.Enable(dbus_interface = client_interface)
238
 
        elif key == u"-":
239
 
            self.proxy.Disable(dbus_interface = client_interface)
240
 
        elif key == u"a":
241
 
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
242
 
                               dbus_interface = client_interface)
243
 
        elif key == u"d":
244
 
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
245
 
                                  dbus_interface = client_interface)
 
210
        if key == u"e" or key == u"+":
 
211
            self.proxy.Enable()
 
212
        elif key == u"d" or key == u"-":
 
213
            self.proxy.Disable()
246
214
        elif key == u"r" or key == u"_" or key == u"ctrl k":
247
215
            self.server_proxy_object.RemoveClient(self.proxy
248
216
                                                  .object_path)
249
217
        elif key == u"s":
250
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
218
            self.proxy.StartChecker()
251
219
        elif key == u"S":
252
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
220
            self.proxy.StopChecker()
253
221
        elif key == u"C":
254
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
222
            self.proxy.CheckedOK()
255
223
        # xxx
256
224
#         elif key == u"p" or key == "=":
257
225
#             self.proxy.pause()
259
227
#             self.proxy.unpause()
260
228
#         elif key == u"RET":
261
229
#             self.open()
262
 
#        elif key == u"+":
263
 
#            self.proxy.Approve(True)
264
 
#        elif key == u"-":
265
 
#            self.proxy.Approve(False)
266
230
        else:
267
231
            return key
268
232
    
460
424
            return
461
425
        self.remove_client(client, path)
462
426
    
463
 
    def add_new_client(self, path):
 
427
    def add_new_client(self, path, properties):
464
428
        client_proxy_object = self.bus.get_object(self.busname, path)
465
429
        self.add_client(MandosClientWidget(server_proxy_object
466
430
                                           =self.mandos_serv,
467
431
                                           proxy_object
468
432
                                           =client_proxy_object,
 
433
                                           properties=properties,
469
434
                                           update_hook
470
435
                                           =self.refresh,
471
436
                                           delete_hook
472
 
                                           =self.remove_client,
473
 
                                           logger
474
 
                                           =self.log_message),
 
437
                                           =self.remove_client),
475
438
                        path=path)
476
439
    
477
440
    def add_client(self, client, path=None):
560
523
                self.log_message_raw((u"bold",
561
524
                                      u"  "
562
525
                                      .join((u"Clients:",
563
 
                                             u"+: Enable",
564
 
                                             u"-: Disable",
 
526
                                             u"e: Enable",
 
527
                                             u"d: Disable",
565
528
                                             u"r: Remove",
566
529
                                             u"s: Start new checker",
567
530
                                             u"S: Stop checker",
568
 
                                             u"C: Checker OK",
569
 
                                             u"a: Approve",
570
 
                                             u"d: Deny"))))
 
531
                                             u"C: Checker OK"))))
571
532
                self.refresh()
572
533
            elif key == u"tab":
573
534
                if self.topwidget.get_focus() is self.logbox:
601
562
ui = UserInterface()
602
563
try:
603
564
    ui.run()
604
 
except Exception, e:
605
 
    ui.log_message(unicode(e))
 
565
except:
606
566
    ui.screen.stop()
607
567
    raise