/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: 2014-07-16 23:44:54 UTC
  • Revision ID: teddy@recompile.se-20140716234454-6erpylmbf5qzndf3
mandos-client: Fix bug with GPGME 1.5.0.

* initramfs-tools-hook: If GPGME is 1.5.0 or later, copy "gpgconfig"
                        to RAM file system and do what GPGME does:
                        run "gpgconfig" to find GnuPG binary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
48
48
 
49
49
import locale
50
50
 
51
 
if sys.version_info.major == 2:
 
51
if sys.version_info[0] == 2:
52
52
    str = unicode
53
53
 
54
54
locale.setlocale(locale.LC_ALL, '')
60
60
domain = 'se.recompile'
61
61
server_interface = domain + '.Mandos'
62
62
client_interface = domain + '.Mandos.Client'
63
 
version = "1.6.9"
 
63
version = "1.6.6"
64
64
 
65
65
def isoformat_to_datetime(iso):
66
66
    "Parse an ISO 8601 date string to a datetime.datetime()"
87
87
        self.proxy = proxy_object # Mandos Client proxy object
88
88
        self.properties = dict() if properties is None else properties
89
89
        self.property_changed_match = (
90
 
            self.proxy.connect_to_signal("PropertiesChanged",
91
 
                                         self.properties_changed,
92
 
                                         dbus.PROPERTIES_IFACE,
 
90
            self.proxy.connect_to_signal("PropertyChanged",
 
91
                                         self._property_changed,
 
92
                                         client_interface,
93
93
                                         byte_arrays=True))
94
94
        
95
95
        if properties is None:
100
100
        
101
101
        super(MandosClientPropertyCache, self).__init__(**kwargs)
102
102
    
103
 
    def properties_changed(self, interface, properties, invalidated):
104
 
        """This is called whenever we get a PropertiesChanged signal
105
 
        It updates the changed properties in the "properties" dict.
 
103
    def _property_changed(self, property, value):
 
104
        """Helper which takes positional arguments"""
 
105
        return self.property_changed(property=property, value=value)
 
106
    
 
107
    def property_changed(self, property=None, value=None):
 
108
        """This is called whenever we get a PropertyChanged signal
 
109
        It updates the changed property in the "properties" dict.
106
110
        """
107
111
        # Update properties dict with new value
108
 
        self.properties.update(properties)
 
112
        self.properties[property] = value
109
113
    
110
114
    def delete(self):
111
115
        self.property_changed_match.remove()
157
161
                                         self.rejected,
158
162
                                         client_interface,
159
163
                                         byte_arrays=True))
160
 
        self.logger('Created client {}'
 
164
        self.logger('Created client {0}'
161
165
                    .format(self.properties["Name"]), level=0)
162
166
    
163
167
    def using_timer(self, flag):
175
179
    
176
180
    def checker_completed(self, exitstatus, condition, command):
177
181
        if exitstatus == 0:
178
 
            self.logger('Checker for client {} (command "{}")'
 
182
            self.logger('Checker for client {0} (command "{1}")'
179
183
                        ' succeeded'.format(self.properties["Name"],
180
184
                                            command), level=0)
181
185
            self.update()
182
186
            return
183
187
        # Checker failed
184
188
        if os.WIFEXITED(condition):
185
 
            self.logger('Checker for client {} (command "{}") failed'
186
 
                        ' with exit code {}'
 
189
            self.logger('Checker for client {0} (command "{1}")'
 
190
                        ' failed with exit code {2}'
187
191
                        .format(self.properties["Name"], command,
188
192
                                os.WEXITSTATUS(condition)))
189
193
        elif os.WIFSIGNALED(condition):
190
 
            self.logger('Checker for client {} (command "{}") was'
191
 
                        ' killed by signal {}'
 
194
            self.logger('Checker for client {0} (command "{1}") was'
 
195
                        ' killed by signal {2}'
192
196
                        .format(self.properties["Name"], command,
193
197
                                os.WTERMSIG(condition)))
194
198
        elif os.WCOREDUMP(condition):
195
 
            self.logger('Checker for client {} (command "{}") dumped'
196
 
                        ' core'.format(self.properties["Name"],
197
 
                                       command))
 
199
            self.logger('Checker for client {0} (command "{1}")'
 
200
                        ' dumped core'
 
201
                        .format(self.properties["Name"], command))
198
202
        else:
199
 
            self.logger('Checker for client {} completed'
 
203
            self.logger('Checker for client {0} completed'
200
204
                        ' mysteriously'
201
205
                        .format(self.properties["Name"]))
202
206
        self.update()
203
207
    
204
208
    def checker_started(self, command):
205
209
        """Server signals that a checker started."""
206
 
        self.logger('Client {} started checker "{}"'
 
210
        self.logger('Client {0} started checker "{1}"'
207
211
                    .format(self.properties["Name"],
208
212
                            command), level=0)
209
213
    
210
214
    def got_secret(self):
211
 
        self.logger('Client {} received its secret'
 
215
        self.logger('Client {0} received its secret'
212
216
                    .format(self.properties["Name"]))
213
217
    
214
218
    def need_approval(self, timeout, default):
215
219
        if not default:
216
 
            message = 'Client {} needs approval within {} seconds'
 
220
            message = 'Client {0} needs approval within {1} seconds'
217
221
        else:
218
 
            message = 'Client {} will get its secret in {} seconds'
 
222
            message = 'Client {0} will get its secret in {1} seconds'
219
223
        self.logger(message.format(self.properties["Name"],
220
224
                                   timeout/1000))
221
225
    
222
226
    def rejected(self, reason):
223
 
        self.logger('Client {} was rejected; reason: {}'
 
227
        self.logger('Client {0} was rejected; reason: {1}'
224
228
                    .format(self.properties["Name"], reason))
225
229
    
226
230
    def selectable(self):
270
274
            else:
271
275
                timer = datetime.timedelta()
272
276
            if self.properties["ApprovedByDefault"]:
273
 
                message = "Approval in {}. (d)eny?"
 
277
                message = "Approval in {0}. (d)eny?"
274
278
            else:
275
 
                message = "Denial in {}. (a)pprove?"
 
279
                message = "Denial in {0}. (a)pprove?"
276
280
            message = message.format(str(timer).rsplit(".", 1)[0])
277
281
            self.using_timer(True)
278
282
        elif self.properties["LastCheckerStatus"] != 0:
286
290
                timer = max(expires - datetime.datetime.utcnow(),
287
291
                            datetime.timedelta())
288
292
            message = ('A checker has failed! Time until client'
289
 
                       ' gets disabled: {}'
 
293
                       ' gets disabled: {0}'
290
294
                       .format(str(timer).rsplit(".", 1)[0]))
291
295
            self.using_timer(True)
292
296
        else:
293
297
            message = "enabled"
294
298
            self.using_timer(False)
295
 
        self._text = "{}{}".format(base, message)
 
299
        self._text = "{0}{1}".format(base, message)
296
300
        
297
301
        if not urwid.supports_unicode():
298
302
            self._text = self._text.encode("ascii", "replace")
373
377
        else:
374
378
            return key
375
379
    
376
 
    def properties_changed(self, interface, properties, invalidated):
377
 
        """Call self.update() if any properties changed.
 
380
    def property_changed(self, property=None, **kwargs):
 
381
        """Call self.update() if old value is not new value.
378
382
        This overrides the method from MandosClientPropertyCache"""
379
 
        old_values = { key: self.properties.get(key)
380
 
                       for key in properties.keys() }
381
 
        super(MandosClientWidget, self).properties_changed(
382
 
            interface, properties, invalidated)
383
 
        if any(old_values[key] != self.properties.get(key)
384
 
               for key in old_values):
 
383
        property_name = str(property)
 
384
        old_value = self.properties.get(property_name)
 
385
        super(MandosClientWidget, self).property_changed(
 
386
            property=property, **kwargs)
 
387
        if self.properties.get(property_name) != old_value:
385
388
            self.update()
386
389
 
387
390
 
466
469
        self.main_loop = gobject.MainLoop()
467
470
    
468
471
    def client_not_found(self, fingerprint, address):
469
 
        self.log_message("Client with address {} and fingerprint {}"
470
 
                         " could not be found"
 
472
        self.log_message("Client with address {0} and fingerprint"
 
473
                         " {1} could not be found"
471
474
                         .format(address, fingerprint))
472
475
    
473
476
    def rebuild(self):
491
494
        if level < self.log_level:
492
495
            return
493
496
        timestamp = datetime.datetime.now().isoformat()
494
 
        self.log_message_raw("{}: {}".format(timestamp, message),
 
497
        self.log_message_raw("{0}: {1}".format(timestamp, message),
495
498
                             level=level)
496
499
    
497
500
    def log_message_raw(self, markup, level=1):
510
513
        """Toggle visibility of the log buffer."""
511
514
        self.log_visible = not self.log_visible
512
515
        self.rebuild()
513
 
        self.log_message("Log visibility changed to: {}"
 
516
        self.log_message("Log visibility changed to: {0}"
514
517
                         .format(self.log_visible), level=0)
515
518
    
516
519
    def change_log_display(self):
522
525
            self.log_wrap = "clip"
523
526
        for textwidget in self.log:
524
527
            textwidget.set_wrap_mode(self.log_wrap)
525
 
        self.log_message("Wrap mode: {}".format(self.log_wrap),
 
528
        self.log_message("Wrap mode: {0}".format(self.log_wrap),
526
529
                         level=0)
527
530
    
528
531
    def find_and_remove_client(self, path, name):
534
537
            client = self.clients_dict[path]
535
538
        except KeyError:
536
539
            # not found?
537
 
            self.log_message("Unknown client {!r} ({!r}) removed"
 
540
            self.log_message("Unknown client {0!r} ({1!r}) removed"
538
541
                             .format(name, path))
539
542
            return
540
543
        client.delete()
658
661
            elif key == "window resize":
659
662
                self.size = self.screen.get_cols_rows()
660
663
                self.refresh()
661
 
            elif key == "ctrl l":
662
 
                self.screen.clear()
 
664
            elif key == "\f":  # Ctrl-L
663
665
                self.refresh()
664
666
            elif key == "l" or key == "D":
665
667
                self.toggle_log_display()