/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

Merge from Teddy:

* New upstream release.
* debian/rules: Build with BROKEN_PIE set on mips and mipsel
  architectures - fixes FTBFS there.
* New upstream release.
* Do not copy unnecessary files to initrd (Closes: #551907)

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
53
50
                                     self.property_changed,
54
51
                                     client_interface,
55
52
                                     byte_arrays=True)
56
 
        
 
53
 
57
54
        self.properties.update(
58
55
            self.proxy.GetAll(client_interface,
59
56
                              dbus_interface = dbus.PROPERTIES_IFACE))
60
 
 
61
 
        #XXX This break good super behaviour!
62
 
#        super(MandosClientPropertyCache, self).__init__(
63
 
#            *args, **kwargs)
 
57
        super(MandosClientPropertyCache, self).__init__(
 
58
            proxy_object=proxy_object, *args, **kwargs)
64
59
    
65
60
    def property_changed(self, property=None, value=None):
66
61
        """This is called whenever we get a PropertyChanged signal
106
101
                                     self.got_secret,
107
102
                                     client_interface,
108
103
                                     byte_arrays=True)
109
 
        self.proxy.connect_to_signal(u"NeedApproval",
110
 
                                     self.need_approval,
111
 
                                     client_interface,
112
 
                                     byte_arrays=True)
113
104
        self.proxy.connect_to_signal(u"Rejected",
114
105
                                     self.rejected,
115
106
                                     client_interface,
117
108
    
118
109
    def checker_completed(self, exitstatus, condition, command):
119
110
        if exitstatus == 0:
120
 
            #self.logger(u'Checker for client %s (command "%s")'
121
 
            #            u' was successful'
122
 
            #            % (self.properties[u"name"], command))
 
111
            self.logger(u'Checker for client %s (command "%s")'
 
112
                        u' was successful'
 
113
                        % (self.properties[u"name"], command))
123
114
            return
124
115
        if os.WIFEXITED(condition):
125
116
            self.logger(u'Checker for client %s (command "%s")'
140
131
        self.logger(u'Checker for client %s completed mysteriously')
141
132
    
142
133
    def checker_started(self, command):
143
 
        #self.logger(u'Client %s started checker "%s"'
144
 
        #            % (self.properties[u"name"], unicode(command)))
145
 
        pass
 
134
        self.logger(u'Client %s started checker "%s"'
 
135
                    % (self.properties[u"name"], unicode(command)))
146
136
    
147
137
    def got_secret(self):
148
138
        self.logger(u'Client %s received its secret'
149
139
                    % self.properties[u"name"])
150
140
    
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))
 
141
    def rejected(self):
 
142
        self.logger(u'Client %s was rejected'
 
143
                    % self.properties[u"name"])
162
144
    
163
145
    def selectable(self):
164
146
        """Make this a "selectable" widget.
186
168
                          u"bold-underline-blink":
187
169
                              u"bold-underline-blink-standout",
188
170
                          }
189
 
 
 
171
        
190
172
        # 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")})
 
173
        self._text = (u'%(name)s: %(enabled)s'
 
174
                      % { u"name": self.properties[u"name"],
 
175
                          u"enabled":
 
176
                              (u"enabled"
 
177
                               if self.properties[u"enabled"]
 
178
                               else u"DISABLED")})
207
179
        if not urwid.supports_unicode():
208
180
            self._text = self._text.encode("ascii", "replace")
209
181
        textlist = [(u"normal", self._text)]
233
205
    def keypress(self, (maxcol,), key):
234
206
        """Handle keys.
235
207
        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)
 
208
        if key == u"e" or key == u"+":
 
209
            self.proxy.Enable()
 
210
        elif key == u"d" or key == u"-":
 
211
            self.proxy.Disable()
246
212
        elif key == u"r" or key == u"_" or key == u"ctrl k":
247
213
            self.server_proxy_object.RemoveClient(self.proxy
248
214
                                                  .object_path)
249
215
        elif key == u"s":
250
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
216
            self.proxy.StartChecker()
251
217
        elif key == u"S":
252
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
218
            self.proxy.StopChecker()
253
219
        elif key == u"C":
254
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
220
            self.proxy.CheckedOK()
255
221
        # xxx
256
222
#         elif key == u"p" or key == "=":
257
223
#             self.proxy.pause()
259
225
#             self.proxy.unpause()
260
226
#         elif key == u"RET":
261
227
#             self.open()
262
 
#        elif key == u"+":
263
 
#            self.proxy.Approve(True)
264
 
#        elif key == u"-":
265
 
#            self.proxy.Approve(False)
266
228
        else:
267
229
            return key
268
230
    
560
522
                self.log_message_raw((u"bold",
561
523
                                      u"  "
562
524
                                      .join((u"Clients:",
563
 
                                             u"+: Enable",
564
 
                                             u"-: Disable",
 
525
                                             u"e: Enable",
 
526
                                             u"d: Disable",
565
527
                                             u"r: Remove",
566
528
                                             u"s: Start new checker",
567
529
                                             u"S: Stop checker",
568
 
                                             u"C: Checker OK",
569
 
                                             u"a: Approve",
570
 
                                             u"d: Deny"))))
 
530
                                             u"C: Checker OK"))))
571
531
                self.refresh()
572
532
            elif key == u"tab":
573
533
                if self.topwidget.get_focus() is self.logbox: