/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

  • Committer: Teddy Hogeborn
  • Date: 2011-08-08 21:12:37 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110808211237-jejsz5brjytrjot8
* Makefile (DOCS): Added "intro.8mandos".
  (intro.8mandos, intro.8mandos.xhtml): New.
* README: Replaced text with link, reference and short summary.
* intro.xml: New.
* mandos-clients.conf.xml (SEE ALSO): Added "intro(8mandos)".
* mandos-ctl.xml (SEE ALSO): - '' -
* mandos-keygen.xml (SEE ALSO): - '' -
* mandos-monitor.xml (SEE ALSO): - '' -
* mandos.conf.xml (SEE ALSO): - '' -
* mandos.xml (SEE ALSO): - '' -
* plugin-runner.xml (SEE ALSO): - '' -
* plugins.d/askpass-fifo.xml (SEE ALSO): - '' -
* plugins.d/mandos-client.xml (SEE ALSO): - '' -
* plugins.d/password-prompt.xml (SEE ALSO): - '' -
* plugins.d/plymouth.xml (SEE ALSO): - '' -
* plugins.d/splashy.xml (SEE ALSO): - '' -
* plugins.d/usplash.xml (SEE ALSO): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
 
from __future__ import division, with_statement, absolute_import
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
35
36
 
36
37
import SocketServer as socketserver
37
38
import socket
38
 
import optparse
 
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
81
82
        SO_BINDTODEVICE = None
82
83
 
83
84
 
84
 
version = "1.0.14"
 
85
version = "1.3.1"
85
86
 
86
 
#logger = logging.getLogger(u'mandos')
87
 
logger = logging.Logger(u'mandos')
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
88
89
syslogger = (logging.handlers.SysLogHandler
89
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
 
              address = "/dev/log"))
 
91
              address = str("/dev/log")))
91
92
syslogger.setFormatter(logging.Formatter
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
93
 
                        u' %(message)s'))
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
                        ' %(message)s'))
94
95
logger.addHandler(syslogger)
95
96
 
96
97
console = logging.StreamHandler()
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
 
                                       u' %(levelname)s:'
99
 
                                       u' %(message)s'))
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
99
                                       ' %(levelname)s:'
 
100
                                       ' %(message)s'))
100
101
logger.addHandler(console)
101
102
 
102
103
class AvahiError(Exception):
119
120
    Attributes:
120
121
    interface: integer; avahi.IF_UNSPEC or an interface index.
121
122
               Used to optionally bind to the specified interface.
122
 
    name: string; Example: u'Mandos'
123
 
    type: string; Example: u'_mandos._tcp'.
 
123
    name: string; Example: 'Mandos'
 
124
    type: string; Example: '_mandos._tcp'.
124
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
125
126
    port: integer; what port to announce
126
127
    TXT: list of strings; TXT record for the service
135
136
    """
136
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
138
                 servicetype = None, port = None, TXT = None,
138
 
                 domain = u"", host = u"", max_renames = 32768,
 
139
                 domain = "", host = "", max_renames = 32768,
139
140
                 protocol = avahi.PROTO_UNSPEC, bus = None):
140
141
        self.interface = interface
141
142
        self.name = name
150
151
        self.group = None       # our entry group
151
152
        self.server = None
152
153
        self.bus = bus
 
154
        self.entry_group_state_changed_match = None
153
155
    def rename(self):
154
156
        """Derived from the Avahi example code"""
155
157
        if self.rename_count >= self.max_renames:
156
 
            logger.critical(u"No suitable Zeroconf service name found"
157
 
                            u" after %i retries, exiting.",
 
158
            logger.critical("No suitable Zeroconf service name found"
 
159
                            " after %i retries, exiting.",
158
160
                            self.rename_count)
159
 
            raise AvahiServiceError(u"Too many renames")
 
161
            raise AvahiServiceError("Too many renames")
160
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
 
        logger.info(u"Changing Zeroconf service name to %r ...",
 
163
        logger.info("Changing Zeroconf service name to %r ...",
162
164
                    self.name)
163
165
        syslogger.setFormatter(logging.Formatter
164
 
                               (u'Mandos (%s) [%%(process)d]:'
165
 
                                u' %%(levelname)s: %%(message)s'
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
166
168
                                % self.name))
167
169
        self.remove()
168
 
        self.add()
 
170
        try:
 
171
            self.add()
 
172
        except dbus.exceptions.DBusException as error:
 
173
            logger.critical("DBusException: %s", error)
 
174
            self.cleanup()
 
175
            os._exit(1)
169
176
        self.rename_count += 1
170
177
    def remove(self):
171
178
        """Derived from the Avahi example code"""
 
179
        if self.entry_group_state_changed_match is not None:
 
180
            self.entry_group_state_changed_match.remove()
 
181
            self.entry_group_state_changed_match = None
172
182
        if self.group is not None:
173
183
            self.group.Reset()
174
184
    def add(self):
175
185
        """Derived from the Avahi example code"""
 
186
        self.remove()
176
187
        if self.group is None:
177
188
            self.group = dbus.Interface(
178
189
                self.bus.get_object(avahi.DBUS_NAME,
179
190
                                    self.server.EntryGroupNew()),
180
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
181
 
            self.group.connect_to_signal('StateChanged',
182
 
                                         self
183
 
                                         .entry_group_state_changed)
184
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
192
        self.entry_group_state_changed_match = (
 
193
            self.group.connect_to_signal(
 
194
                'StateChanged', self .entry_group_state_changed))
 
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
185
196
                     self.name, self.type)
186
197
        self.group.AddService(
187
198
            self.interface,
194
205
        self.group.Commit()
195
206
    def entry_group_state_changed(self, state, error):
196
207
        """Derived from the Avahi example code"""
197
 
        logger.debug(u"Avahi state change: %i", state)
 
208
        logger.debug("Avahi entry group state change: %i", state)
198
209
        
199
210
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
200
 
            logger.debug(u"Zeroconf service established.")
 
211
            logger.debug("Zeroconf service established.")
201
212
        elif state == avahi.ENTRY_GROUP_COLLISION:
202
 
            logger.warning(u"Zeroconf service name collision.")
 
213
            logger.info("Zeroconf service name collision.")
203
214
            self.rename()
204
215
        elif state == avahi.ENTRY_GROUP_FAILURE:
205
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
216
            logger.critical("Avahi: Error in group state changed %s",
206
217
                            unicode(error))
207
 
            raise AvahiGroupError(u"State changed: %s"
 
218
            raise AvahiGroupError("State changed: %s"
208
219
                                  % unicode(error))
209
220
    def cleanup(self):
210
221
        """Derived from the Avahi example code"""
211
222
        if self.group is not None:
212
 
            self.group.Free()
 
223
            try:
 
224
                self.group.Free()
 
225
            except (dbus.exceptions.UnknownMethodException,
 
226
                    dbus.exceptions.DBusException) as e:
 
227
                pass
213
228
            self.group = None
214
 
    def server_state_changed(self, state):
 
229
        self.remove()
 
230
    def server_state_changed(self, state, error=None):
215
231
        """Derived from the Avahi example code"""
216
 
        if state == avahi.SERVER_COLLISION:
217
 
            logger.error(u"Zeroconf server name collision")
218
 
            self.remove()
 
232
        logger.debug("Avahi server state change: %i", state)
 
233
        bad_states = { avahi.SERVER_INVALID:
 
234
                           "Zeroconf server invalid",
 
235
                       avahi.SERVER_REGISTERING: None,
 
236
                       avahi.SERVER_COLLISION:
 
237
                           "Zeroconf server name collision",
 
238
                       avahi.SERVER_FAILURE:
 
239
                           "Zeroconf server failure" }
 
240
        if state in bad_states:
 
241
            if bad_states[state] is not None:
 
242
                if error is None:
 
243
                    logger.error(bad_states[state])
 
244
                else:
 
245
                    logger.error(bad_states[state] + ": %r", error)
 
246
            self.cleanup()
219
247
        elif state == avahi.SERVER_RUNNING:
220
248
            self.add()
 
249
        else:
 
250
            if error is None:
 
251
                logger.debug("Unknown state: %r", state)
 
252
            else:
 
253
                logger.debug("Unknown state: %r: %r", state, error)
221
254
    def activate(self):
222
255
        """Derived from the Avahi example code"""
223
256
        if self.server is None:
224
257
            self.server = dbus.Interface(
225
258
                self.bus.get_object(avahi.DBUS_NAME,
226
 
                                    avahi.DBUS_PATH_SERVER),
 
259
                                    avahi.DBUS_PATH_SERVER,
 
260
                                    follow_name_owner_changes=True),
227
261
                avahi.DBUS_INTERFACE_SERVER)
228
 
        self.server.connect_to_signal(u"StateChanged",
 
262
        self.server.connect_to_signal("StateChanged",
229
263
                                 self.server_state_changed)
230
264
        self.server_state_changed(self.server.GetState())
231
265
 
234
268
    """A representation of a client host served by this server.
235
269
    
236
270
    Attributes:
237
 
    name:       string; from the config file, used in log messages and
238
 
                        D-Bus identifiers
 
271
    _approved:   bool(); 'None' if not yet approved/disapproved
 
272
    approval_delay: datetime.timedelta(); Time to wait for approval
 
273
    approval_duration: datetime.timedelta(); Duration of one approval
 
274
    checker:    subprocess.Popen(); a running checker process used
 
275
                                    to see if the client lives.
 
276
                                    'None' if no process is running.
 
277
    checker_callback_tag: a gobject event source tag, or None
 
278
    checker_command: string; External command which is run to check
 
279
                     if client lives.  %() expansions are done at
 
280
                     runtime with vars(self) as dict, so that for
 
281
                     instance %(name)s can be used in the command.
 
282
    checker_initiator_tag: a gobject event source tag, or None
 
283
    created:    datetime.datetime(); (UTC) object creation
 
284
    current_checker_command: string; current running checker_command
 
285
    disable_hook:  If set, called by disable() as disable_hook(self)
 
286
    disable_initiator_tag: a gobject event source tag, or None
 
287
    enabled:    bool()
239
288
    fingerprint: string (40 or 32 hexadecimal digits); used to
240
289
                 uniquely identify the client
241
 
    secret:     bytestring; sent verbatim (over TLS) to client
242
290
    host:       string; available for use by the checker command
243
 
    created:    datetime.datetime(); (UTC) object creation
 
291
    interval:   datetime.timedelta(); How often to start a new checker
 
292
    last_approval_request: datetime.datetime(); (UTC) or None
 
293
    last_checked_ok: datetime.datetime(); (UTC) or None
244
294
    last_enabled: datetime.datetime(); (UTC)
245
 
    enabled:    bool()
246
 
    last_checked_ok: datetime.datetime(); (UTC) or None
 
295
    name:       string; from the config file, used in log messages and
 
296
                        D-Bus identifiers
 
297
    secret:     bytestring; sent verbatim (over TLS) to client
247
298
    timeout:    datetime.timedelta(); How long from last_checked_ok
248
299
                                      until this client is disabled
249
 
    interval:   datetime.timedelta(); How often to start a new checker
250
 
    disable_hook:  If set, called by disable() as disable_hook(self)
251
 
    checker:    subprocess.Popen(); a running checker process used
252
 
                                    to see if the client lives.
253
 
                                    'None' if no process is running.
254
 
    checker_initiator_tag: a gobject event source tag, or None
255
 
    disable_initiator_tag: - '' -
256
 
    checker_callback_tag:  - '' -
257
 
    checker_command: string; External command which is run to check if
258
 
                     client lives.  %() expansions are done at
259
 
                     runtime with vars(self) as dict, so that for
260
 
                     instance %(name)s can be used in the command.
261
 
    current_checker_command: string; current running checker_command
262
 
    approved_delay: datetime.timedelta(); Time to wait for approval
263
 
    _approved:   bool(); 'None' if not yet approved/disapproved
264
 
    approved_duration: datetime.timedelta(); Duration of one approval
 
300
    runtime_expansions: Allowed attributes for runtime expansion.
265
301
    """
266
302
    
 
303
    runtime_expansions = ("approval_delay", "approval_duration",
 
304
                          "created", "enabled", "fingerprint",
 
305
                          "host", "interval", "last_checked_ok",
 
306
                          "last_enabled", "name", "timeout")
 
307
    
267
308
    @staticmethod
268
309
    def _timedelta_to_milliseconds(td):
269
310
        "Convert a datetime.timedelta() to milliseconds"
279
320
        "Return the 'interval' attribute in milliseconds"
280
321
        return self._timedelta_to_milliseconds(self.interval)
281
322
 
282
 
    def approved_delay_milliseconds(self):
283
 
        return self._timedelta_to_milliseconds(self.approved_delay)
 
323
    def approval_delay_milliseconds(self):
 
324
        return self._timedelta_to_milliseconds(self.approval_delay)
284
325
    
285
326
    def __init__(self, name = None, disable_hook=None, config=None):
286
327
        """Note: the 'checker' key in 'config' sets the
289
330
        self.name = name
290
331
        if config is None:
291
332
            config = {}
292
 
        logger.debug(u"Creating client %r", self.name)
 
333
        logger.debug("Creating client %r", self.name)
293
334
        # Uppercase and remove spaces from fingerprint for later
294
335
        # comparison purposes with return value from the fingerprint()
295
336
        # function
296
 
        self.fingerprint = (config[u"fingerprint"].upper()
297
 
                            .replace(u" ", u""))
298
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
299
 
        if u"secret" in config:
300
 
            self.secret = config[u"secret"].decode(u"base64")
301
 
        elif u"secfile" in config:
 
337
        self.fingerprint = (config["fingerprint"].upper()
 
338
                            .replace(" ", ""))
 
339
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
340
        if "secret" in config:
 
341
            self.secret = config["secret"].decode("base64")
 
342
        elif "secfile" in config:
302
343
            with open(os.path.expanduser(os.path.expandvars
303
 
                                         (config[u"secfile"])),
 
344
                                         (config["secfile"])),
304
345
                      "rb") as secfile:
305
346
                self.secret = secfile.read()
306
347
        else:
307
 
            raise TypeError(u"No secret or secfile for client %s"
 
348
            raise TypeError("No secret or secfile for client %s"
308
349
                            % self.name)
309
 
        self.host = config.get(u"host", u"")
 
350
        self.host = config.get("host", "")
310
351
        self.created = datetime.datetime.utcnow()
311
352
        self.enabled = False
 
353
        self.last_approval_request = None
312
354
        self.last_enabled = None
313
355
        self.last_checked_ok = None
314
 
        self.timeout = string_to_delta(config[u"timeout"])
315
 
        self.interval = string_to_delta(config[u"interval"])
 
356
        self.timeout = string_to_delta(config["timeout"])
 
357
        self.interval = string_to_delta(config["interval"])
316
358
        self.disable_hook = disable_hook
317
359
        self.checker = None
318
360
        self.checker_initiator_tag = None
319
361
        self.disable_initiator_tag = None
320
362
        self.checker_callback_tag = None
321
 
        self.checker_command = config[u"checker"]
 
363
        self.checker_command = config["checker"]
322
364
        self.current_checker_command = None
323
365
        self.last_connect = None
324
366
        self._approved = None
325
 
        self.approved_by_default = config.get(u"approved_by_default",
 
367
        self.approved_by_default = config.get("approved_by_default",
326
368
                                              True)
327
369
        self.approvals_pending = 0
328
 
        self.approved_delay = string_to_delta(
329
 
            config[u"approved_delay"])
330
 
        self.approved_duration = string_to_delta(
331
 
            config[u"approved_duration"])
 
370
        self.approval_delay = string_to_delta(
 
371
            config["approval_delay"])
 
372
        self.approval_duration = string_to_delta(
 
373
            config["approval_duration"])
332
374
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
333
375
    
334
376
    def send_changedstate(self):
338
380
        
339
381
    def enable(self):
340
382
        """Start this client's checker and timeout hooks"""
341
 
        if getattr(self, u"enabled", False):
 
383
        if getattr(self, "enabled", False):
342
384
            # Already enabled
343
385
            return
344
386
        self.send_changedstate()
363
405
        if not quiet:
364
406
            self.send_changedstate()
365
407
        if not quiet:
366
 
            logger.info(u"Disabling client %s", self.name)
367
 
        if getattr(self, u"disable_initiator_tag", False):
 
408
            logger.info("Disabling client %s", self.name)
 
409
        if getattr(self, "disable_initiator_tag", False):
368
410
            gobject.source_remove(self.disable_initiator_tag)
369
411
            self.disable_initiator_tag = None
370
 
        if getattr(self, u"checker_initiator_tag", False):
 
412
        if getattr(self, "checker_initiator_tag", False):
371
413
            gobject.source_remove(self.checker_initiator_tag)
372
414
            self.checker_initiator_tag = None
373
415
        self.stop_checker()
388
430
        if os.WIFEXITED(condition):
389
431
            exitstatus = os.WEXITSTATUS(condition)
390
432
            if exitstatus == 0:
391
 
                logger.info(u"Checker for %(name)s succeeded",
 
433
                logger.info("Checker for %(name)s succeeded",
392
434
                            vars(self))
393
435
                self.checked_ok()
394
436
            else:
395
 
                logger.info(u"Checker for %(name)s failed",
 
437
                logger.info("Checker for %(name)s failed",
396
438
                            vars(self))
397
439
        else:
398
 
            logger.warning(u"Checker for %(name)s crashed?",
 
440
            logger.warning("Checker for %(name)s crashed?",
399
441
                           vars(self))
400
442
    
401
443
    def checked_ok(self):
410
452
                                      (self.timeout_milliseconds(),
411
453
                                       self.disable))
412
454
    
 
455
    def need_approval(self):
 
456
        self.last_approval_request = datetime.datetime.utcnow()
 
457
    
413
458
    def start_checker(self):
414
459
        """Start a new checker subprocess if one is not running.
415
460
        
427
472
        # If a checker exists, make sure it is not a zombie
428
473
        try:
429
474
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
430
 
        except (AttributeError, OSError), error:
 
475
        except (AttributeError, OSError) as error:
431
476
            if (isinstance(error, OSError)
432
477
                and error.errno != errno.ECHILD):
433
478
                raise error
434
479
        else:
435
480
            if pid:
436
 
                logger.warning(u"Checker was a zombie")
 
481
                logger.warning("Checker was a zombie")
437
482
                gobject.source_remove(self.checker_callback_tag)
438
483
                self.checker_callback(pid, status,
439
484
                                      self.current_checker_command)
444
489
                command = self.checker_command % self.host
445
490
            except TypeError:
446
491
                # Escape attributes for the shell
447
 
                escaped_attrs = dict((key,
448
 
                                      re.escape(unicode(str(val),
449
 
                                                        errors=
450
 
                                                        u'replace')))
451
 
                                     for key, val in
452
 
                                     vars(self).iteritems())
 
492
                escaped_attrs = dict(
 
493
                    (attr,
 
494
                     re.escape(unicode(str(getattr(self, attr, "")),
 
495
                                       errors=
 
496
                                       'replace')))
 
497
                    for attr in
 
498
                    self.runtime_expansions)
 
499
 
453
500
                try:
454
501
                    command = self.checker_command % escaped_attrs
455
 
                except TypeError, error:
456
 
                    logger.error(u'Could not format string "%s":'
457
 
                                 u' %s', self.checker_command, error)
 
502
                except TypeError as error:
 
503
                    logger.error('Could not format string "%s":'
 
504
                                 ' %s', self.checker_command, error)
458
505
                    return True # Try again later
459
506
            self.current_checker_command = command
460
507
            try:
461
 
                logger.info(u"Starting checker %r for %s",
 
508
                logger.info("Starting checker %r for %s",
462
509
                            command, self.name)
463
510
                # We don't need to redirect stdout and stderr, since
464
511
                # in normal mode, that is already done by daemon(),
466
513
                # always replaced by /dev/null.)
467
514
                self.checker = subprocess.Popen(command,
468
515
                                                close_fds=True,
469
 
                                                shell=True, cwd=u"/")
 
516
                                                shell=True, cwd="/")
470
517
                self.checker_callback_tag = (gobject.child_watch_add
471
518
                                             (self.checker.pid,
472
519
                                              self.checker_callback,
477
524
                if pid:
478
525
                    gobject.source_remove(self.checker_callback_tag)
479
526
                    self.checker_callback(pid, status, command)
480
 
            except OSError, error:
481
 
                logger.error(u"Failed to start subprocess: %s",
 
527
            except OSError as error:
 
528
                logger.error("Failed to start subprocess: %s",
482
529
                             error)
483
530
        # Re-run this periodically if run by gobject.timeout_add
484
531
        return True
488
535
        if self.checker_callback_tag:
489
536
            gobject.source_remove(self.checker_callback_tag)
490
537
            self.checker_callback_tag = None
491
 
        if getattr(self, u"checker", None) is None:
 
538
        if getattr(self, "checker", None) is None:
492
539
            return
493
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
540
        logger.debug("Stopping checker for %(name)s", vars(self))
494
541
        try:
495
542
            os.kill(self.checker.pid, signal.SIGTERM)
496
543
            #time.sleep(0.5)
497
544
            #if self.checker.poll() is None:
498
545
            #    os.kill(self.checker.pid, signal.SIGKILL)
499
 
        except OSError, error:
 
546
        except OSError as error:
500
547
            if error.errno != errno.ESRCH: # No such process
501
548
                raise
502
549
        self.checker = None
503
550
 
504
 
def dbus_service_property(dbus_interface, signature=u"v",
505
 
                          access=u"readwrite", byte_arrays=False):
 
551
def dbus_service_property(dbus_interface, signature="v",
 
552
                          access="readwrite", byte_arrays=False):
506
553
    """Decorators for marking methods of a DBusObjectWithProperties to
507
554
    become properties on the D-Bus.
508
555
    
515
562
    """
516
563
    # Encoding deeply encoded byte arrays is not supported yet by the
517
564
    # "Set" method, so we fail early here:
518
 
    if byte_arrays and signature != u"ay":
519
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
520
 
                         u" signature %r" % signature)
 
565
    if byte_arrays and signature != "ay":
 
566
        raise ValueError("Byte arrays not supported for non-'ay'"
 
567
                         " signature %r" % signature)
521
568
    def decorator(func):
522
569
        func._dbus_is_property = True
523
570
        func._dbus_interface = dbus_interface
524
571
        func._dbus_signature = signature
525
572
        func._dbus_access = access
526
573
        func._dbus_name = func.__name__
527
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
574
        if func._dbus_name.endswith("_dbus_property"):
528
575
            func._dbus_name = func._dbus_name[:-14]
529
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
576
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
530
577
        return func
531
578
    return decorator
532
579
 
560
607
    
561
608
    @staticmethod
562
609
    def _is_dbus_property(obj):
563
 
        return getattr(obj, u"_dbus_is_property", False)
 
610
        return getattr(obj, "_dbus_is_property", False)
564
611
    
565
612
    def _get_all_dbus_properties(self):
566
613
        """Returns a generator of (name, attribute) pairs
574
621
        property with the specified name and interface.
575
622
        """
576
623
        for name in (property_name,
577
 
                     property_name + u"_dbus_property"):
 
624
                     property_name + "_dbus_property"):
578
625
            prop = getattr(self, name, None)
579
626
            if (prop is None
580
627
                or not self._is_dbus_property(prop)
584
631
                continue
585
632
            return prop
586
633
        # No such property
587
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
588
 
                                   + interface_name + u"."
 
634
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
635
                                   + interface_name + "."
589
636
                                   + property_name)
590
637
    
591
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
592
 
                         out_signature=u"v")
 
638
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
639
                         out_signature="v")
593
640
    def Get(self, interface_name, property_name):
594
641
        """Standard D-Bus property Get() method, see D-Bus standard.
595
642
        """
596
643
        prop = self._get_dbus_property(interface_name, property_name)
597
 
        if prop._dbus_access == u"write":
 
644
        if prop._dbus_access == "write":
598
645
            raise DBusPropertyAccessException(property_name)
599
646
        value = prop()
600
 
        if not hasattr(value, u"variant_level"):
 
647
        if not hasattr(value, "variant_level"):
601
648
            return value
602
649
        return type(value)(value, variant_level=value.variant_level+1)
603
650
    
604
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
651
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
605
652
    def Set(self, interface_name, property_name, value):
606
653
        """Standard D-Bus property Set() method, see D-Bus standard.
607
654
        """
608
655
        prop = self._get_dbus_property(interface_name, property_name)
609
 
        if prop._dbus_access == u"read":
 
656
        if prop._dbus_access == "read":
610
657
            raise DBusPropertyAccessException(property_name)
611
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
658
        if prop._dbus_get_args_options["byte_arrays"]:
612
659
            # The byte_arrays option is not supported yet on
613
660
            # signatures other than "ay".
614
 
            if prop._dbus_signature != u"ay":
 
661
            if prop._dbus_signature != "ay":
615
662
                raise ValueError
616
663
            value = dbus.ByteArray(''.join(unichr(byte)
617
664
                                           for byte in value))
618
665
        prop(value)
619
666
    
620
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
621
 
                         out_signature=u"a{sv}")
 
667
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
668
                         out_signature="a{sv}")
622
669
    def GetAll(self, interface_name):
623
670
        """Standard D-Bus property GetAll() method, see D-Bus
624
671
        standard.
632
679
                # Interface non-empty but did not match
633
680
                continue
634
681
            # Ignore write-only properties
635
 
            if prop._dbus_access == u"write":
 
682
            if prop._dbus_access == "write":
636
683
                continue
637
684
            value = prop()
638
 
            if not hasattr(value, u"variant_level"):
 
685
            if not hasattr(value, "variant_level"):
639
686
                all[name] = value
640
687
                continue
641
688
            all[name] = type(value)(value, variant_level=
642
689
                                    value.variant_level+1)
643
 
        return dbus.Dictionary(all, signature=u"sv")
 
690
        return dbus.Dictionary(all, signature="sv")
644
691
    
645
692
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
646
 
                         out_signature=u"s",
 
693
                         out_signature="s",
647
694
                         path_keyword='object_path',
648
695
                         connection_keyword='connection')
649
696
    def Introspect(self, object_path, connection):
654
701
        try:
655
702
            document = xml.dom.minidom.parseString(xmlstring)
656
703
            def make_tag(document, name, prop):
657
 
                e = document.createElement(u"property")
658
 
                e.setAttribute(u"name", name)
659
 
                e.setAttribute(u"type", prop._dbus_signature)
660
 
                e.setAttribute(u"access", prop._dbus_access)
 
704
                e = document.createElement("property")
 
705
                e.setAttribute("name", name)
 
706
                e.setAttribute("type", prop._dbus_signature)
 
707
                e.setAttribute("access", prop._dbus_access)
661
708
                return e
662
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
709
            for if_tag in document.getElementsByTagName("interface"):
663
710
                for tag in (make_tag(document, name, prop)
664
711
                            for name, prop
665
712
                            in self._get_all_dbus_properties()
666
713
                            if prop._dbus_interface
667
 
                            == if_tag.getAttribute(u"name")):
 
714
                            == if_tag.getAttribute("name")):
668
715
                    if_tag.appendChild(tag)
669
716
                # Add the names to the return values for the
670
717
                # "org.freedesktop.DBus.Properties" methods
671
 
                if (if_tag.getAttribute(u"name")
672
 
                    == u"org.freedesktop.DBus.Properties"):
673
 
                    for cn in if_tag.getElementsByTagName(u"method"):
674
 
                        if cn.getAttribute(u"name") == u"Get":
675
 
                            for arg in cn.getElementsByTagName(u"arg"):
676
 
                                if (arg.getAttribute(u"direction")
677
 
                                    == u"out"):
678
 
                                    arg.setAttribute(u"name", u"value")
679
 
                        elif cn.getAttribute(u"name") == u"GetAll":
680
 
                            for arg in cn.getElementsByTagName(u"arg"):
681
 
                                if (arg.getAttribute(u"direction")
682
 
                                    == u"out"):
683
 
                                    arg.setAttribute(u"name", u"props")
684
 
            xmlstring = document.toxml(u"utf-8")
 
718
                if (if_tag.getAttribute("name")
 
719
                    == "org.freedesktop.DBus.Properties"):
 
720
                    for cn in if_tag.getElementsByTagName("method"):
 
721
                        if cn.getAttribute("name") == "Get":
 
722
                            for arg in cn.getElementsByTagName("arg"):
 
723
                                if (arg.getAttribute("direction")
 
724
                                    == "out"):
 
725
                                    arg.setAttribute("name", "value")
 
726
                        elif cn.getAttribute("name") == "GetAll":
 
727
                            for arg in cn.getElementsByTagName("arg"):
 
728
                                if (arg.getAttribute("direction")
 
729
                                    == "out"):
 
730
                                    arg.setAttribute("name", "props")
 
731
            xmlstring = document.toxml("utf-8")
685
732
            document.unlink()
686
733
        except (AttributeError, xml.dom.DOMException,
687
 
                xml.parsers.expat.ExpatError), error:
688
 
            logger.error(u"Failed to override Introspection method",
 
734
                xml.parsers.expat.ExpatError) as error:
 
735
            logger.error("Failed to override Introspection method",
689
736
                         error)
690
737
        return xmlstring
691
738
 
697
744
    dbus_object_path: dbus.ObjectPath
698
745
    bus: dbus.SystemBus()
699
746
    """
 
747
    
 
748
    runtime_expansions = (Client.runtime_expansions
 
749
                          + ("dbus_object_path",))
 
750
    
700
751
    # dbus.service.Object doesn't use super(), so we can't either.
701
752
    
702
753
    def __init__(self, bus = None, *args, **kwargs):
705
756
        Client.__init__(self, *args, **kwargs)
706
757
        # Only now, when this client is initialized, can it show up on
707
758
        # the D-Bus
 
759
        client_object_name = unicode(self.name).translate(
 
760
            {ord("."): ord("_"),
 
761
             ord("-"): ord("_")})
708
762
        self.dbus_object_path = (dbus.ObjectPath
709
 
                                 (u"/clients/"
710
 
                                  + self.name.replace(u".", u"_")))
 
763
                                 ("/clients/" + client_object_name))
711
764
        DBusObjectWithProperties.__init__(self, self.bus,
712
765
                                          self.dbus_object_path)
713
 
 
 
766
        
714
767
    def _get_approvals_pending(self):
715
768
        return self._approvals_pending
716
769
    def _set_approvals_pending(self, value):
720
773
        if (hasattr(self, "dbus_object_path")
721
774
            and bval is not bool(old_value)):
722
775
            dbus_bool = dbus.Boolean(bval, variant_level=1)
723
 
            self.PropertyChanged(dbus.String(u"approved_pending"),
 
776
            self.PropertyChanged(dbus.String("ApprovalPending"),
724
777
                                 dbus_bool)
725
778
 
726
779
    approvals_pending = property(_get_approvals_pending,
734
787
                           variant_level=variant_level)
735
788
    
736
789
    def enable(self):
737
 
        oldstate = getattr(self, u"enabled", False)
 
790
        oldstate = getattr(self, "enabled", False)
738
791
        r = Client.enable(self)
739
792
        if oldstate != self.enabled:
740
793
            # Emit D-Bus signals
741
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
794
            self.PropertyChanged(dbus.String("Enabled"),
742
795
                                 dbus.Boolean(True, variant_level=1))
743
796
            self.PropertyChanged(
744
 
                dbus.String(u"last_enabled"),
 
797
                dbus.String("LastEnabled"),
745
798
                self._datetime_to_dbus(self.last_enabled,
746
799
                                       variant_level=1))
747
800
        return r
748
801
    
749
802
    def disable(self, quiet = False):
750
 
        oldstate = getattr(self, u"enabled", False)
 
803
        oldstate = getattr(self, "enabled", False)
751
804
        r = Client.disable(self, quiet=quiet)
752
805
        if not quiet and oldstate != self.enabled:
753
806
            # Emit D-Bus signal
754
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
807
            self.PropertyChanged(dbus.String("Enabled"),
755
808
                                 dbus.Boolean(False, variant_level=1))
756
809
        return r
757
810
    
760
813
            self.remove_from_connection()
761
814
        except LookupError:
762
815
            pass
763
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
816
        if hasattr(DBusObjectWithProperties, "__del__"):
764
817
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
765
818
        Client.__del__(self, *args, **kwargs)
766
819
    
769
822
        self.checker_callback_tag = None
770
823
        self.checker = None
771
824
        # Emit D-Bus signal
772
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
825
        self.PropertyChanged(dbus.String("CheckerRunning"),
773
826
                             dbus.Boolean(False, variant_level=1))
774
827
        if os.WIFEXITED(condition):
775
828
            exitstatus = os.WEXITSTATUS(condition)
787
840
                                       *args, **kwargs)
788
841
    
789
842
    def checked_ok(self, *args, **kwargs):
790
 
        r = Client.checked_ok(self, *args, **kwargs)
 
843
        Client.checked_ok(self, *args, **kwargs)
791
844
        # Emit D-Bus signal
792
845
        self.PropertyChanged(
793
 
            dbus.String(u"last_checked_ok"),
 
846
            dbus.String("LastCheckedOK"),
794
847
            (self._datetime_to_dbus(self.last_checked_ok,
795
848
                                    variant_level=1)))
 
849
    
 
850
    def need_approval(self, *args, **kwargs):
 
851
        r = Client.need_approval(self, *args, **kwargs)
 
852
        # Emit D-Bus signal
 
853
        self.PropertyChanged(
 
854
            dbus.String("LastApprovalRequest"),
 
855
            (self._datetime_to_dbus(self.last_approval_request,
 
856
                                    variant_level=1)))
796
857
        return r
797
858
    
798
859
    def start_checker(self, *args, **kwargs):
808
869
            # Emit D-Bus signal
809
870
            self.CheckerStarted(self.current_checker_command)
810
871
            self.PropertyChanged(
811
 
                dbus.String(u"checker_running"),
 
872
                dbus.String("CheckerRunning"),
812
873
                dbus.Boolean(True, variant_level=1))
813
874
        return r
814
875
    
815
876
    def stop_checker(self, *args, **kwargs):
816
 
        old_checker = getattr(self, u"checker", None)
 
877
        old_checker = getattr(self, "checker", None)
817
878
        r = Client.stop_checker(self, *args, **kwargs)
818
879
        if (old_checker is not None
819
 
            and getattr(self, u"checker", None) is None):
820
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
880
            and getattr(self, "checker", None) is None):
 
881
            self.PropertyChanged(dbus.String("CheckerRunning"),
821
882
                                 dbus.Boolean(False, variant_level=1))
822
883
        return r
823
884
 
828
889
    def approve(self, value=True):
829
890
        self.send_changedstate()
830
891
        self._approved = value
831
 
        gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
 
892
        gobject.timeout_add(self._timedelta_to_milliseconds
 
893
                            (self.approval_duration),
832
894
                            self._reset_approved)
833
895
    
834
896
    
835
897
    ## D-Bus methods, signals & properties
836
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
837
899
    
838
900
    ## Signals
839
901
    
840
902
    # CheckerCompleted - signal
841
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
903
    @dbus.service.signal(_interface, signature="nxs")
842
904
    def CheckerCompleted(self, exitcode, waitstatus, command):
843
905
        "D-Bus signal"
844
906
        pass
845
907
    
846
908
    # CheckerStarted - signal
847
 
    @dbus.service.signal(_interface, signature=u"s")
 
909
    @dbus.service.signal(_interface, signature="s")
848
910
    def CheckerStarted(self, command):
849
911
        "D-Bus signal"
850
912
        pass
851
913
    
852
914
    # PropertyChanged - signal
853
 
    @dbus.service.signal(_interface, signature=u"sv")
 
915
    @dbus.service.signal(_interface, signature="sv")
854
916
    def PropertyChanged(self, property, value):
855
917
        "D-Bus signal"
856
918
        pass
865
927
        pass
866
928
    
867
929
    # Rejected - signal
868
 
    @dbus.service.signal(_interface, signature=u"s")
 
930
    @dbus.service.signal(_interface, signature="s")
869
931
    def Rejected(self, reason):
870
932
        "D-Bus signal"
871
933
        pass
872
934
    
873
935
    # NeedApproval - signal
874
 
    @dbus.service.signal(_interface, signature=u"db")
 
936
    @dbus.service.signal(_interface, signature="tb")
875
937
    def NeedApproval(self, timeout, default):
876
938
        "D-Bus signal"
877
 
        pass
 
939
        return self.need_approval()
878
940
    
879
941
    ## Methods
880
 
 
 
942
    
881
943
    # Approve - method
882
 
    @dbus.service.method(_interface, in_signature=u"b")
 
944
    @dbus.service.method(_interface, in_signature="b")
883
945
    def Approve(self, value):
884
946
        self.approve(value)
885
 
 
 
947
    
886
948
    # CheckedOK - method
887
949
    @dbus.service.method(_interface)
888
950
    def CheckedOK(self):
889
 
        return self.checked_ok()
 
951
        self.checked_ok()
890
952
    
891
953
    # Enable - method
892
954
    @dbus.service.method(_interface)
913
975
    
914
976
    ## Properties
915
977
    
916
 
    # approved_pending - property
917
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
918
 
    def approved_pending_dbus_property(self):
 
978
    # ApprovalPending - property
 
979
    @dbus_service_property(_interface, signature="b", access="read")
 
980
    def ApprovalPending_dbus_property(self):
919
981
        return dbus.Boolean(bool(self.approvals_pending))
920
982
    
921
 
    # approved_by_default - property
922
 
    @dbus_service_property(_interface, signature=u"b",
923
 
                           access=u"readwrite")
924
 
    def approved_by_default_dbus_property(self):
925
 
        return dbus.Boolean(self.approved_by_default)
926
 
    
927
 
    # approved_delay - property
928
 
    @dbus_service_property(_interface, signature=u"t",
929
 
                           access=u"readwrite")
930
 
    def approved_delay_dbus_property(self):
931
 
        return dbus.UInt64(self.approved_delay_milliseconds())
932
 
    
933
 
    # approved_duration - property
934
 
    @dbus_service_property(_interface, signature=u"t",
935
 
                           access=u"readwrite")
936
 
    def approved_duration_dbus_property(self):
937
 
        return dbus.UInt64(self._timedelta_to_milliseconds(
938
 
                self.approved_duration))
939
 
    
940
 
    # name - property
941
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
942
 
    def name_dbus_property(self):
 
983
    # ApprovedByDefault - property
 
984
    @dbus_service_property(_interface, signature="b",
 
985
                           access="readwrite")
 
986
    def ApprovedByDefault_dbus_property(self, value=None):
 
987
        if value is None:       # get
 
988
            return dbus.Boolean(self.approved_by_default)
 
989
        self.approved_by_default = bool(value)
 
990
        # Emit D-Bus signal
 
991
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
992
                             dbus.Boolean(value, variant_level=1))
 
993
    
 
994
    # ApprovalDelay - property
 
995
    @dbus_service_property(_interface, signature="t",
 
996
                           access="readwrite")
 
997
    def ApprovalDelay_dbus_property(self, value=None):
 
998
        if value is None:       # get
 
999
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1000
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1001
        # Emit D-Bus signal
 
1002
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
1003
                             dbus.UInt64(value, variant_level=1))
 
1004
    
 
1005
    # ApprovalDuration - property
 
1006
    @dbus_service_property(_interface, signature="t",
 
1007
                           access="readwrite")
 
1008
    def ApprovalDuration_dbus_property(self, value=None):
 
1009
        if value is None:       # get
 
1010
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1011
                    self.approval_duration))
 
1012
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1013
        # Emit D-Bus signal
 
1014
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
1015
                             dbus.UInt64(value, variant_level=1))
 
1016
    
 
1017
    # Name - property
 
1018
    @dbus_service_property(_interface, signature="s", access="read")
 
1019
    def Name_dbus_property(self):
943
1020
        return dbus.String(self.name)
944
1021
    
945
 
    # fingerprint - property
946
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
947
 
    def fingerprint_dbus_property(self):
 
1022
    # Fingerprint - property
 
1023
    @dbus_service_property(_interface, signature="s", access="read")
 
1024
    def Fingerprint_dbus_property(self):
948
1025
        return dbus.String(self.fingerprint)
949
1026
    
950
 
    # host - property
951
 
    @dbus_service_property(_interface, signature=u"s",
952
 
                           access=u"readwrite")
953
 
    def host_dbus_property(self, value=None):
 
1027
    # Host - property
 
1028
    @dbus_service_property(_interface, signature="s",
 
1029
                           access="readwrite")
 
1030
    def Host_dbus_property(self, value=None):
954
1031
        if value is None:       # get
955
1032
            return dbus.String(self.host)
956
1033
        self.host = value
957
1034
        # Emit D-Bus signal
958
 
        self.PropertyChanged(dbus.String(u"host"),
 
1035
        self.PropertyChanged(dbus.String("Host"),
959
1036
                             dbus.String(value, variant_level=1))
960
1037
    
961
 
    # created - property
962
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
963
 
    def created_dbus_property(self):
 
1038
    # Created - property
 
1039
    @dbus_service_property(_interface, signature="s", access="read")
 
1040
    def Created_dbus_property(self):
964
1041
        return dbus.String(self._datetime_to_dbus(self.created))
965
1042
    
966
 
    # last_enabled - property
967
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
968
 
    def last_enabled_dbus_property(self):
 
1043
    # LastEnabled - property
 
1044
    @dbus_service_property(_interface, signature="s", access="read")
 
1045
    def LastEnabled_dbus_property(self):
969
1046
        if self.last_enabled is None:
970
 
            return dbus.String(u"")
 
1047
            return dbus.String("")
971
1048
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
972
1049
    
973
 
    # enabled - property
974
 
    @dbus_service_property(_interface, signature=u"b",
975
 
                           access=u"readwrite")
976
 
    def enabled_dbus_property(self, value=None):
 
1050
    # Enabled - property
 
1051
    @dbus_service_property(_interface, signature="b",
 
1052
                           access="readwrite")
 
1053
    def Enabled_dbus_property(self, value=None):
977
1054
        if value is None:       # get
978
1055
            return dbus.Boolean(self.enabled)
979
1056
        if value:
981
1058
        else:
982
1059
            self.disable()
983
1060
    
984
 
    # last_checked_ok - property
985
 
    @dbus_service_property(_interface, signature=u"s",
986
 
                           access=u"readwrite")
987
 
    def last_checked_ok_dbus_property(self, value=None):
 
1061
    # LastCheckedOK - property
 
1062
    @dbus_service_property(_interface, signature="s",
 
1063
                           access="readwrite")
 
1064
    def LastCheckedOK_dbus_property(self, value=None):
988
1065
        if value is not None:
989
1066
            self.checked_ok()
990
1067
            return
991
1068
        if self.last_checked_ok is None:
992
 
            return dbus.String(u"")
 
1069
            return dbus.String("")
993
1070
        return dbus.String(self._datetime_to_dbus(self
994
1071
                                                  .last_checked_ok))
995
1072
    
996
 
    # timeout - property
997
 
    @dbus_service_property(_interface, signature=u"t",
998
 
                           access=u"readwrite")
999
 
    def timeout_dbus_property(self, value=None):
 
1073
    # LastApprovalRequest - property
 
1074
    @dbus_service_property(_interface, signature="s", access="read")
 
1075
    def LastApprovalRequest_dbus_property(self):
 
1076
        if self.last_approval_request is None:
 
1077
            return dbus.String("")
 
1078
        return dbus.String(self.
 
1079
                           _datetime_to_dbus(self
 
1080
                                             .last_approval_request))
 
1081
    
 
1082
    # Timeout - property
 
1083
    @dbus_service_property(_interface, signature="t",
 
1084
                           access="readwrite")
 
1085
    def Timeout_dbus_property(self, value=None):
1000
1086
        if value is None:       # get
1001
1087
            return dbus.UInt64(self.timeout_milliseconds())
1002
1088
        self.timeout = datetime.timedelta(0, 0, 0, value)
1003
1089
        # Emit D-Bus signal
1004
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1090
        self.PropertyChanged(dbus.String("Timeout"),
1005
1091
                             dbus.UInt64(value, variant_level=1))
1006
 
        if getattr(self, u"disable_initiator_tag", None) is None:
 
1092
        if getattr(self, "disable_initiator_tag", None) is None:
1007
1093
            return
1008
1094
        # Reschedule timeout
1009
1095
        gobject.source_remove(self.disable_initiator_tag)
1021
1107
            self.disable_initiator_tag = (gobject.timeout_add
1022
1108
                                          (time_to_die, self.disable))
1023
1109
    
1024
 
    # interval - property
1025
 
    @dbus_service_property(_interface, signature=u"t",
1026
 
                           access=u"readwrite")
1027
 
    def interval_dbus_property(self, value=None):
 
1110
    # Interval - property
 
1111
    @dbus_service_property(_interface, signature="t",
 
1112
                           access="readwrite")
 
1113
    def Interval_dbus_property(self, value=None):
1028
1114
        if value is None:       # get
1029
1115
            return dbus.UInt64(self.interval_milliseconds())
1030
1116
        self.interval = datetime.timedelta(0, 0, 0, value)
1031
1117
        # Emit D-Bus signal
1032
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1118
        self.PropertyChanged(dbus.String("Interval"),
1033
1119
                             dbus.UInt64(value, variant_level=1))
1034
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1120
        if getattr(self, "checker_initiator_tag", None) is None:
1035
1121
            return
1036
1122
        # Reschedule checker run
1037
1123
        gobject.source_remove(self.checker_initiator_tag)
1039
1125
                                      (value, self.start_checker))
1040
1126
        self.start_checker()    # Start one now, too
1041
1127
 
1042
 
    # checker - property
1043
 
    @dbus_service_property(_interface, signature=u"s",
1044
 
                           access=u"readwrite")
1045
 
    def checker_dbus_property(self, value=None):
 
1128
    # Checker - property
 
1129
    @dbus_service_property(_interface, signature="s",
 
1130
                           access="readwrite")
 
1131
    def Checker_dbus_property(self, value=None):
1046
1132
        if value is None:       # get
1047
1133
            return dbus.String(self.checker_command)
1048
1134
        self.checker_command = value
1049
1135
        # Emit D-Bus signal
1050
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1136
        self.PropertyChanged(dbus.String("Checker"),
1051
1137
                             dbus.String(self.checker_command,
1052
1138
                                         variant_level=1))
1053
1139
    
1054
 
    # checker_running - property
1055
 
    @dbus_service_property(_interface, signature=u"b",
1056
 
                           access=u"readwrite")
1057
 
    def checker_running_dbus_property(self, value=None):
 
1140
    # CheckerRunning - property
 
1141
    @dbus_service_property(_interface, signature="b",
 
1142
                           access="readwrite")
 
1143
    def CheckerRunning_dbus_property(self, value=None):
1058
1144
        if value is None:       # get
1059
1145
            return dbus.Boolean(self.checker is not None)
1060
1146
        if value:
1062
1148
        else:
1063
1149
            self.stop_checker()
1064
1150
    
1065
 
    # object_path - property
1066
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1067
 
    def object_path_dbus_property(self):
 
1151
    # ObjectPath - property
 
1152
    @dbus_service_property(_interface, signature="o", access="read")
 
1153
    def ObjectPath_dbus_property(self):
1068
1154
        return self.dbus_object_path # is already a dbus.ObjectPath
1069
1155
    
1070
 
    # secret = property
1071
 
    @dbus_service_property(_interface, signature=u"ay",
1072
 
                           access=u"write", byte_arrays=True)
1073
 
    def secret_dbus_property(self, value):
 
1156
    # Secret = property
 
1157
    @dbus_service_property(_interface, signature="ay",
 
1158
                           access="write", byte_arrays=True)
 
1159
    def Secret_dbus_property(self, value):
1074
1160
        self.secret = str(value)
1075
1161
    
1076
1162
    del _interface
1110
1196
    
1111
1197
    def handle(self):
1112
1198
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1113
 
            logger.info(u"TCP connection from: %s",
 
1199
            logger.info("TCP connection from: %s",
1114
1200
                        unicode(self.client_address))
1115
 
            logger.debug(u"Pipe FD: %d",
 
1201
            logger.debug("Pipe FD: %d",
1116
1202
                         self.server.child_pipe.fileno())
1117
1203
 
1118
1204
            session = (gnutls.connection
1125
1211
            # no X.509 keys are added to it.  Therefore, we can use it
1126
1212
            # here despite using OpenPGP certificates.
1127
1213
 
1128
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1129
 
            #                      u"+AES-256-CBC", u"+SHA1",
1130
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1131
 
            #                      u"+DHE-DSS"))
 
1214
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1215
            #                      "+AES-256-CBC", "+SHA1",
 
1216
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1217
            #                      "+DHE-DSS"))
1132
1218
            # Use a fallback default, since this MUST be set.
1133
1219
            priority = self.server.gnutls_priority
1134
1220
            if priority is None:
1135
 
                priority = u"NORMAL"
 
1221
                priority = "NORMAL"
1136
1222
            (gnutls.library.functions
1137
1223
             .gnutls_priority_set_direct(session._c_object,
1138
1224
                                         priority, None))
1140
1226
            # Start communication using the Mandos protocol
1141
1227
            # Get protocol number
1142
1228
            line = self.request.makefile().readline()
1143
 
            logger.debug(u"Protocol version: %r", line)
 
1229
            logger.debug("Protocol version: %r", line)
1144
1230
            try:
1145
1231
                if int(line.strip().split()[0]) > 1:
1146
1232
                    raise RuntimeError
1147
 
            except (ValueError, IndexError, RuntimeError), error:
1148
 
                logger.error(u"Unknown protocol version: %s", error)
 
1233
            except (ValueError, IndexError, RuntimeError) as error:
 
1234
                logger.error("Unknown protocol version: %s", error)
1149
1235
                return
1150
1236
 
1151
1237
            # Start GnuTLS connection
1152
1238
            try:
1153
1239
                session.handshake()
1154
 
            except gnutls.errors.GNUTLSError, error:
1155
 
                logger.warning(u"Handshake failed: %s", error)
 
1240
            except gnutls.errors.GNUTLSError as error:
 
1241
                logger.warning("Handshake failed: %s", error)
1156
1242
                # Do not run session.bye() here: the session is not
1157
1243
                # established.  Just abandon the request.
1158
1244
                return
1159
 
            logger.debug(u"Handshake succeeded")
 
1245
            logger.debug("Handshake succeeded")
1160
1246
 
1161
1247
            approval_required = False
1162
1248
            try:
1163
1249
                try:
1164
1250
                    fpr = self.fingerprint(self.peer_certificate
1165
1251
                                           (session))
1166
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1167
 
                    logger.warning(u"Bad certificate: %s", error)
 
1252
                except (TypeError,
 
1253
                        gnutls.errors.GNUTLSError) as error:
 
1254
                    logger.warning("Bad certificate: %s", error)
1168
1255
                    return
1169
 
                logger.debug(u"Fingerprint: %s", fpr)
 
1256
                logger.debug("Fingerprint: %s", fpr)
1170
1257
 
1171
1258
                try:
1172
1259
                    client = ProxyClient(child_pipe, fpr,
1174
1261
                except KeyError:
1175
1262
                    return
1176
1263
                
1177
 
                if client.approved_delay:
1178
 
                    delay = client.approved_delay
 
1264
                if client.approval_delay:
 
1265
                    delay = client.approval_delay
1179
1266
                    client.approvals_pending += 1
1180
1267
                    approval_required = True
1181
1268
                
1182
1269
                while True:
1183
1270
                    if not client.enabled:
1184
 
                        logger.warning(u"Client %s is disabled",
 
1271
                        logger.info("Client %s is disabled",
1185
1272
                                       client.name)
1186
1273
                        if self.server.use_dbus:
1187
1274
                            # Emit D-Bus signal
1188
1275
                            client.Rejected("Disabled")                    
1189
1276
                        return
1190
1277
                    
1191
 
                    if client._approved or not client.approved_delay:
 
1278
                    if client._approved or not client.approval_delay:
1192
1279
                        #We are approved or approval is disabled
1193
1280
                        break
1194
1281
                    elif client._approved is None:
1195
 
                        logger.info(u"Client %s need approval",
 
1282
                        logger.info("Client %s needs approval",
1196
1283
                                    client.name)
1197
1284
                        if self.server.use_dbus:
1198
1285
                            # Emit D-Bus signal
1199
1286
                            client.NeedApproval(
1200
 
                                client.approved_delay_milliseconds(),
 
1287
                                client.approval_delay_milliseconds(),
1201
1288
                                client.approved_by_default)
1202
1289
                    else:
1203
 
                        logger.warning(u"Client %s was not approved",
 
1290
                        logger.warning("Client %s was not approved",
1204
1291
                                       client.name)
1205
1292
                        if self.server.use_dbus:
1206
1293
                            # Emit D-Bus signal
1207
 
                            client.Rejected("Disapproved")
 
1294
                            client.Rejected("Denied")
1208
1295
                        return
1209
1296
                    
1210
1297
                    #wait until timeout or approved
1221
1308
                                           client.name)
1222
1309
                            if self.server.use_dbus:
1223
1310
                                # Emit D-Bus signal
1224
 
                                client.Rejected("Time out")
 
1311
                                client.Rejected("Approval timed out")
1225
1312
                            return
1226
1313
                        else:
1227
1314
                            break
1232
1319
                while sent_size < len(client.secret):
1233
1320
                    try:
1234
1321
                        sent = session.send(client.secret[sent_size:])
1235
 
                    except (gnutls.errors.GNUTLSError), error:
 
1322
                    except gnutls.errors.GNUTLSError as error:
1236
1323
                        logger.warning("gnutls send failed")
1237
1324
                        return
1238
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1325
                    logger.debug("Sent: %d, remaining: %d",
1239
1326
                                 sent, len(client.secret)
1240
1327
                                 - (sent_size + sent))
1241
1328
                    sent_size += sent
1242
1329
 
1243
 
                logger.info(u"Sending secret to %s", client.name)
 
1330
                logger.info("Sending secret to %s", client.name)
1244
1331
                # bump the timeout as if seen
1245
1332
                client.checked_ok()
1246
1333
                if self.server.use_dbus:
1252
1339
                    client.approvals_pending -= 1
1253
1340
                try:
1254
1341
                    session.bye()
1255
 
                except (gnutls.errors.GNUTLSError), error:
1256
 
                    logger.warning("gnutls bye failed")
 
1342
                except gnutls.errors.GNUTLSError as error:
 
1343
                    logger.warning("GnuTLS bye failed")
1257
1344
    
1258
1345
    @staticmethod
1259
1346
    def peer_certificate(session):
1269
1356
                     .gnutls_certificate_get_peers
1270
1357
                     (session._c_object, ctypes.byref(list_size)))
1271
1358
        if not bool(cert_list) and list_size.value != 0:
1272
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1273
 
                                            u" certificate")
 
1359
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1360
                                            " certificate")
1274
1361
        if list_size.value == 0:
1275
1362
            return None
1276
1363
        cert = cert_list[0]
1302
1389
        if crtverify.value != 0:
1303
1390
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1304
1391
            raise (gnutls.errors.CertificateSecurityError
1305
 
                   (u"Verify failed"))
 
1392
                   ("Verify failed"))
1306
1393
        # New buffer for the fingerprint
1307
1394
        buf = ctypes.create_string_buffer(20)
1308
1395
        buf_len = ctypes.c_size_t()
1315
1402
        # Convert the buffer to a Python bytestring
1316
1403
        fpr = ctypes.string_at(buf, buf_len.value)
1317
1404
        # Convert the bytestring to hexadecimal notation
1318
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1405
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1319
1406
        return hex_fpr
1320
1407
 
1321
1408
 
1349
1436
 
1350
1437
    def add_pipe(self, parent_pipe):
1351
1438
        """Dummy function; override as necessary"""
1352
 
        pass
 
1439
        raise NotImplementedError
1353
1440
 
1354
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1355
1442
                     socketserver.TCPServer, object):
1373
1460
        bind to an address or port if they were not specified."""
1374
1461
        if self.interface is not None:
1375
1462
            if SO_BINDTODEVICE is None:
1376
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1377
 
                             u" cannot bind to interface %s",
 
1463
                logger.error("SO_BINDTODEVICE does not exist;"
 
1464
                             " cannot bind to interface %s",
1378
1465
                             self.interface)
1379
1466
            else:
1380
1467
                try:
1381
1468
                    self.socket.setsockopt(socket.SOL_SOCKET,
1382
1469
                                           SO_BINDTODEVICE,
1383
1470
                                           str(self.interface
1384
 
                                               + u'\0'))
1385
 
                except socket.error, error:
 
1471
                                               + '\0'))
 
1472
                except socket.error as error:
1386
1473
                    if error[0] == errno.EPERM:
1387
 
                        logger.error(u"No permission to"
1388
 
                                     u" bind to interface %s",
 
1474
                        logger.error("No permission to"
 
1475
                                     " bind to interface %s",
1389
1476
                                     self.interface)
1390
1477
                    elif error[0] == errno.ENOPROTOOPT:
1391
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1392
 
                                     u" cannot bind to interface %s",
 
1478
                        logger.error("SO_BINDTODEVICE not available;"
 
1479
                                     " cannot bind to interface %s",
1393
1480
                                     self.interface)
1394
1481
                    else:
1395
1482
                        raise
1397
1484
        if self.server_address[0] or self.server_address[1]:
1398
1485
            if not self.server_address[0]:
1399
1486
                if self.address_family == socket.AF_INET6:
1400
 
                    any_address = u"::" # in6addr_any
 
1487
                    any_address = "::" # in6addr_any
1401
1488
                else:
1402
1489
                    any_address = socket.INADDR_ANY
1403
1490
                self.server_address = (any_address,
1452
1539
    def handle_ipc(self, source, condition, parent_pipe=None,
1453
1540
                   client_object=None):
1454
1541
        condition_names = {
1455
 
            gobject.IO_IN: u"IN",   # There is data to read.
1456
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1542
            gobject.IO_IN: "IN",   # There is data to read.
 
1543
            gobject.IO_OUT: "OUT", # Data can be written (without
1457
1544
                                    # blocking).
1458
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1459
 
            gobject.IO_ERR: u"ERR", # Error condition.
1460
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1545
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1546
            gobject.IO_ERR: "ERR", # Error condition.
 
1547
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1461
1548
                                    # broken, usually for pipes and
1462
1549
                                    # sockets).
1463
1550
            }
1465
1552
                                       for cond, name in
1466
1553
                                       condition_names.iteritems()
1467
1554
                                       if cond & condition)
1468
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1469
 
                     conditions_string)
1470
 
 
1471
1555
        # error or the other end of multiprocessing.Pipe has closed
1472
1556
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1473
1557
            return False
1474
1558
        
1475
1559
        # Read a request from the child
1476
1560
        request = parent_pipe.recv()
1477
 
        logger.debug(u"IPC request: %s", repr(request))
1478
1561
        command = request[0]
1479
1562
        
1480
1563
        if command == 'init':
1486
1569
                    client = c
1487
1570
                    break
1488
1571
            else:
1489
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
1490
 
                               u"dress: %s", fpr, address)
 
1572
                logger.info("Client not found for fingerprint: %s, ad"
 
1573
                            "dress: %s", fpr, address)
1491
1574
                if self.use_dbus:
1492
1575
                    # Emit D-Bus signal
1493
 
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1576
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1494
1577
                parent_pipe.send(False)
1495
1578
                return False
1496
1579
            
1527
1610
def string_to_delta(interval):
1528
1611
    """Parse a string and return a datetime.timedelta
1529
1612
    
1530
 
    >>> string_to_delta(u'7d')
 
1613
    >>> string_to_delta('7d')
1531
1614
    datetime.timedelta(7)
1532
 
    >>> string_to_delta(u'60s')
 
1615
    >>> string_to_delta('60s')
1533
1616
    datetime.timedelta(0, 60)
1534
 
    >>> string_to_delta(u'60m')
 
1617
    >>> string_to_delta('60m')
1535
1618
    datetime.timedelta(0, 3600)
1536
 
    >>> string_to_delta(u'24h')
 
1619
    >>> string_to_delta('24h')
1537
1620
    datetime.timedelta(1)
1538
 
    >>> string_to_delta(u'1w')
 
1621
    >>> string_to_delta('1w')
1539
1622
    datetime.timedelta(7)
1540
 
    >>> string_to_delta(u'5m 30s')
 
1623
    >>> string_to_delta('5m 30s')
1541
1624
    datetime.timedelta(0, 330)
1542
1625
    """
1543
1626
    timevalue = datetime.timedelta(0)
1545
1628
        try:
1546
1629
            suffix = unicode(s[-1])
1547
1630
            value = int(s[:-1])
1548
 
            if suffix == u"d":
 
1631
            if suffix == "d":
1549
1632
                delta = datetime.timedelta(value)
1550
 
            elif suffix == u"s":
 
1633
            elif suffix == "s":
1551
1634
                delta = datetime.timedelta(0, value)
1552
 
            elif suffix == u"m":
 
1635
            elif suffix == "m":
1553
1636
                delta = datetime.timedelta(0, 0, 0, 0, value)
1554
 
            elif suffix == u"h":
 
1637
            elif suffix == "h":
1555
1638
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1556
 
            elif suffix == u"w":
 
1639
            elif suffix == "w":
1557
1640
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1558
1641
            else:
1559
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1560
 
        except (ValueError, IndexError), e:
1561
 
            raise ValueError(e.message)
 
1642
                raise ValueError("Unknown suffix %r" % suffix)
 
1643
        except (ValueError, IndexError) as e:
 
1644
            raise ValueError(*(e.args))
1562
1645
        timevalue += delta
1563
1646
    return timevalue
1564
1647
 
1570
1653
    global if_nametoindex
1571
1654
    try:
1572
1655
        if_nametoindex = (ctypes.cdll.LoadLibrary
1573
 
                          (ctypes.util.find_library(u"c"))
 
1656
                          (ctypes.util.find_library("c"))
1574
1657
                          .if_nametoindex)
1575
1658
    except (OSError, AttributeError):
1576
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
1659
        logger.warning("Doing if_nametoindex the hard way")
1577
1660
        def if_nametoindex(interface):
1578
1661
            "Get an interface index the hard way, i.e. using fcntl()"
1579
1662
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1580
1663
            with contextlib.closing(socket.socket()) as s:
1581
1664
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1582
 
                                    struct.pack(str(u"16s16x"),
 
1665
                                    struct.pack(str("16s16x"),
1583
1666
                                                interface))
1584
 
            interface_index = struct.unpack(str(u"I"),
 
1667
            interface_index = struct.unpack(str("I"),
1585
1668
                                            ifreq[16:20])[0]
1586
1669
            return interface_index
1587
1670
    return if_nametoindex(interface)
1595
1678
        sys.exit()
1596
1679
    os.setsid()
1597
1680
    if not nochdir:
1598
 
        os.chdir(u"/")
 
1681
        os.chdir("/")
1599
1682
    if os.fork():
1600
1683
        sys.exit()
1601
1684
    if not noclose:
1603
1686
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1604
1687
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1605
1688
            raise OSError(errno.ENODEV,
1606
 
                          u"%s not a character device"
 
1689
                          "%s not a character device"
1607
1690
                          % os.path.devnull)
1608
1691
        os.dup2(null, sys.stdin.fileno())
1609
1692
        os.dup2(null, sys.stdout.fileno())
1617
1700
    ##################################################################
1618
1701
    # Parsing of options, both command line and config file
1619
1702
    
1620
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1621
 
    parser.add_option("-i", u"--interface", type=u"string",
1622
 
                      metavar="IF", help=u"Bind to interface IF")
1623
 
    parser.add_option("-a", u"--address", type=u"string",
1624
 
                      help=u"Address to listen for requests on")
1625
 
    parser.add_option("-p", u"--port", type=u"int",
1626
 
                      help=u"Port number to receive requests on")
1627
 
    parser.add_option("--check", action=u"store_true",
1628
 
                      help=u"Run self-test")
1629
 
    parser.add_option("--debug", action=u"store_true",
1630
 
                      help=u"Debug mode; run in foreground and log to"
1631
 
                      u" terminal")
1632
 
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
1633
 
                      help=u"Debug level for stdout output")
1634
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1635
 
                      u" priority string (see GnuTLS documentation)")
1636
 
    parser.add_option("--servicename", type=u"string",
1637
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1638
 
    parser.add_option("--configdir", type=u"string",
1639
 
                      default=u"/etc/mandos", metavar=u"DIR",
1640
 
                      help=u"Directory to search for configuration"
1641
 
                      u" files")
1642
 
    parser.add_option("--no-dbus", action=u"store_false",
1643
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1644
 
                      u" system bus interface")
1645
 
    parser.add_option("--no-ipv6", action=u"store_false",
1646
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1647
 
    options = parser.parse_args()[0]
 
1703
    parser = argparse.ArgumentParser()
 
1704
    parser.add_argument("-v", "--version", action="version",
 
1705
                        version = "%%(prog)s %s" % version,
 
1706
                        help="show version number and exit")
 
1707
    parser.add_argument("-i", "--interface", metavar="IF",
 
1708
                        help="Bind to interface IF")
 
1709
    parser.add_argument("-a", "--address",
 
1710
                        help="Address to listen for requests on")
 
1711
    parser.add_argument("-p", "--port", type=int,
 
1712
                        help="Port number to receive requests on")
 
1713
    parser.add_argument("--check", action="store_true",
 
1714
                        help="Run self-test")
 
1715
    parser.add_argument("--debug", action="store_true",
 
1716
                        help="Debug mode; run in foreground and log"
 
1717
                        " to terminal")
 
1718
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
1719
                        help="Debug level for stdout output")
 
1720
    parser.add_argument("--priority", help="GnuTLS"
 
1721
                        " priority string (see GnuTLS documentation)")
 
1722
    parser.add_argument("--servicename",
 
1723
                        metavar="NAME", help="Zeroconf service name")
 
1724
    parser.add_argument("--configdir",
 
1725
                        default="/etc/mandos", metavar="DIR",
 
1726
                        help="Directory to search for configuration"
 
1727
                        " files")
 
1728
    parser.add_argument("--no-dbus", action="store_false",
 
1729
                        dest="use_dbus", help="Do not provide D-Bus"
 
1730
                        " system bus interface")
 
1731
    parser.add_argument("--no-ipv6", action="store_false",
 
1732
                        dest="use_ipv6", help="Do not use IPv6")
 
1733
    options = parser.parse_args()
1648
1734
    
1649
1735
    if options.check:
1650
1736
        import doctest
1652
1738
        sys.exit()
1653
1739
    
1654
1740
    # Default values for config file for server-global settings
1655
 
    server_defaults = { u"interface": u"",
1656
 
                        u"address": u"",
1657
 
                        u"port": u"",
1658
 
                        u"debug": u"False",
1659
 
                        u"priority":
1660
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1661
 
                        u"servicename": u"Mandos",
1662
 
                        u"use_dbus": u"True",
1663
 
                        u"use_ipv6": u"True",
1664
 
                        u"debuglevel": u"",
 
1741
    server_defaults = { "interface": "",
 
1742
                        "address": "",
 
1743
                        "port": "",
 
1744
                        "debug": "False",
 
1745
                        "priority":
 
1746
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1747
                        "servicename": "Mandos",
 
1748
                        "use_dbus": "True",
 
1749
                        "use_ipv6": "True",
 
1750
                        "debuglevel": "",
1665
1751
                        }
1666
1752
    
1667
1753
    # Parse config file for server-global settings
1668
1754
    server_config = configparser.SafeConfigParser(server_defaults)
1669
1755
    del server_defaults
1670
1756
    server_config.read(os.path.join(options.configdir,
1671
 
                                    u"mandos.conf"))
 
1757
                                    "mandos.conf"))
1672
1758
    # Convert the SafeConfigParser object to a dict
1673
1759
    server_settings = server_config.defaults()
1674
1760
    # Use the appropriate methods on the non-string config options
1675
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1676
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
1761
    for option in ("debug", "use_dbus", "use_ipv6"):
 
1762
        server_settings[option] = server_config.getboolean("DEFAULT",
1677
1763
                                                           option)
1678
1764
    if server_settings["port"]:
1679
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1680
 
                                                       u"port")
 
1765
        server_settings["port"] = server_config.getint("DEFAULT",
 
1766
                                                       "port")
1681
1767
    del server_config
1682
1768
    
1683
1769
    # Override the settings from the config file with command line
1684
1770
    # options, if set.
1685
 
    for option in (u"interface", u"address", u"port", u"debug",
1686
 
                   u"priority", u"servicename", u"configdir",
1687
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
1771
    for option in ("interface", "address", "port", "debug",
 
1772
                   "priority", "servicename", "configdir",
 
1773
                   "use_dbus", "use_ipv6", "debuglevel"):
1688
1774
        value = getattr(options, option)
1689
1775
        if value is not None:
1690
1776
            server_settings[option] = value
1698
1784
    ##################################################################
1699
1785
    
1700
1786
    # For convenience
1701
 
    debug = server_settings[u"debug"]
1702
 
    debuglevel = server_settings[u"debuglevel"]
1703
 
    use_dbus = server_settings[u"use_dbus"]
1704
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
1787
    debug = server_settings["debug"]
 
1788
    debuglevel = server_settings["debuglevel"]
 
1789
    use_dbus = server_settings["use_dbus"]
 
1790
    use_ipv6 = server_settings["use_ipv6"]
1705
1791
 
1706
 
    if server_settings[u"servicename"] != u"Mandos":
 
1792
    if server_settings["servicename"] != "Mandos":
1707
1793
        syslogger.setFormatter(logging.Formatter
1708
 
                               (u'Mandos (%s) [%%(process)d]:'
1709
 
                                u' %%(levelname)s: %%(message)s'
1710
 
                                % server_settings[u"servicename"]))
 
1794
                               ('Mandos (%s) [%%(process)d]:'
 
1795
                                ' %%(levelname)s: %%(message)s'
 
1796
                                % server_settings["servicename"]))
1711
1797
    
1712
1798
    # Parse config file with clients
1713
 
    client_defaults = { u"timeout": u"1h",
1714
 
                        u"interval": u"5m",
1715
 
                        u"checker": u"fping -q -- %%(host)s",
1716
 
                        u"host": u"",
1717
 
                        u"approved_delay": u"0s",
1718
 
                        u"approved_duration": u"1s",
 
1799
    client_defaults = { "timeout": "1h",
 
1800
                        "interval": "5m",
 
1801
                        "checker": "fping -q -- %%(host)s",
 
1802
                        "host": "",
 
1803
                        "approval_delay": "0s",
 
1804
                        "approval_duration": "1s",
1719
1805
                        }
1720
1806
    client_config = configparser.SafeConfigParser(client_defaults)
1721
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1722
 
                                    u"clients.conf"))
 
1807
    client_config.read(os.path.join(server_settings["configdir"],
 
1808
                                    "clients.conf"))
1723
1809
    
1724
1810
    global mandos_dbus_service
1725
1811
    mandos_dbus_service = None
1726
1812
    
1727
 
    tcp_server = MandosServer((server_settings[u"address"],
1728
 
                               server_settings[u"port"]),
 
1813
    tcp_server = MandosServer((server_settings["address"],
 
1814
                               server_settings["port"]),
1729
1815
                              ClientHandler,
1730
 
                              interface=server_settings[u"interface"],
 
1816
                              interface=(server_settings["interface"]
 
1817
                                         or None),
1731
1818
                              use_ipv6=use_ipv6,
1732
1819
                              gnutls_priority=
1733
 
                              server_settings[u"priority"],
 
1820
                              server_settings["priority"],
1734
1821
                              use_dbus=use_dbus)
1735
 
    pidfilename = u"/var/run/mandos.pid"
1736
 
    try:
1737
 
        pidfile = open(pidfilename, u"w")
1738
 
    except IOError:
1739
 
        logger.error(u"Could not open file %r", pidfilename)
 
1822
    if not debug:
 
1823
        pidfilename = "/var/run/mandos.pid"
 
1824
        try:
 
1825
            pidfile = open(pidfilename, "w")
 
1826
        except IOError:
 
1827
            logger.error("Could not open file %r", pidfilename)
1740
1828
    
1741
1829
    try:
1742
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1743
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1830
        uid = pwd.getpwnam("_mandos").pw_uid
 
1831
        gid = pwd.getpwnam("_mandos").pw_gid
1744
1832
    except KeyError:
1745
1833
        try:
1746
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1747
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1834
            uid = pwd.getpwnam("mandos").pw_uid
 
1835
            gid = pwd.getpwnam("mandos").pw_gid
1748
1836
        except KeyError:
1749
1837
            try:
1750
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1751
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1838
                uid = pwd.getpwnam("nobody").pw_uid
 
1839
                gid = pwd.getpwnam("nobody").pw_gid
1752
1840
            except KeyError:
1753
1841
                uid = 65534
1754
1842
                gid = 65534
1755
1843
    try:
1756
1844
        os.setgid(gid)
1757
1845
        os.setuid(uid)
1758
 
    except OSError, error:
 
1846
    except OSError as error:
1759
1847
        if error[0] != errno.EPERM:
1760
1848
            raise error
1761
1849
    
1762
 
    # Enable all possible GnuTLS debugging
1763
 
 
1764
 
 
1765
1850
    if not debug and not debuglevel:
1766
1851
        syslogger.setLevel(logging.WARNING)
1767
1852
        console.setLevel(logging.WARNING)
1771
1856
        console.setLevel(level)
1772
1857
 
1773
1858
    if debug:
 
1859
        # Enable all possible GnuTLS debugging
 
1860
        
1774
1861
        # "Use a log level over 10 to enable all debugging options."
1775
1862
        # - GnuTLS manual
1776
1863
        gnutls.library.functions.gnutls_global_set_log_level(11)
1777
1864
        
1778
1865
        @gnutls.library.types.gnutls_log_func
1779
1866
        def debug_gnutls(level, string):
1780
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1867
            logger.debug("GnuTLS: %s", string[:-1])
1781
1868
        
1782
1869
        (gnutls.library.functions
1783
1870
         .gnutls_global_set_log_function(debug_gnutls))
1784
 
 
 
1871
        
1785
1872
        # Redirect stdin so all checkers get /dev/null
1786
1873
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1787
1874
        os.dup2(null, sys.stdin.fileno())
1790
1877
    else:
1791
1878
        # No console logging
1792
1879
        logger.removeHandler(console)
1793
 
 
 
1880
    
 
1881
    # Need to fork before connecting to D-Bus
 
1882
    if not debug:
 
1883
        # Close all input and output, do double fork, etc.
 
1884
        daemon()
1794
1885
    
1795
1886
    global main_loop
1796
1887
    # From the Avahi example code
1800
1891
    # End of Avahi example code
1801
1892
    if use_dbus:
1802
1893
        try:
1803
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
1894
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1804
1895
                                            bus, do_not_queue=True)
1805
 
        except dbus.exceptions.NameExistsException, e:
1806
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
1896
        except dbus.exceptions.NameExistsException as e:
 
1897
            logger.error(unicode(e) + ", disabling D-Bus")
1807
1898
            use_dbus = False
1808
 
            server_settings[u"use_dbus"] = False
 
1899
            server_settings["use_dbus"] = False
1809
1900
            tcp_server.use_dbus = False
1810
1901
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1811
 
    service = AvahiService(name = server_settings[u"servicename"],
1812
 
                           servicetype = u"_mandos._tcp",
 
1902
    service = AvahiService(name = server_settings["servicename"],
 
1903
                           servicetype = "_mandos._tcp",
1813
1904
                           protocol = protocol, bus = bus)
1814
1905
    if server_settings["interface"]:
1815
1906
        service.interface = (if_nametoindex
1816
 
                             (str(server_settings[u"interface"])))
1817
 
 
1818
 
    if not debug:
1819
 
        # Close all input and output, do double fork, etc.
1820
 
        daemon()
1821
 
        
 
1907
                             (str(server_settings["interface"])))
 
1908
    
1822
1909
    global multiprocessing_manager
1823
1910
    multiprocessing_manager = multiprocessing.Manager()
1824
1911
    
1843
1930
                        client_config, section)))
1844
1931
            for section in client_config.sections()))
1845
1932
    if not tcp_server.clients:
1846
 
        logger.warning(u"No clients defined")
 
1933
        logger.warning("No clients defined")
1847
1934
        
1848
 
    try:
1849
 
        with pidfile:
1850
 
            pid = os.getpid()
1851
 
            pidfile.write(str(pid) + "\n")
1852
 
        del pidfile
1853
 
    except IOError:
1854
 
        logger.error(u"Could not write to file %r with PID %d",
1855
 
                     pidfilename, pid)
1856
 
    except NameError:
1857
 
        # "pidfile" was never created
1858
 
        pass
1859
 
    del pidfilename
1860
 
    
1861
1935
    if not debug:
 
1936
        try:
 
1937
            with pidfile:
 
1938
                pid = os.getpid()
 
1939
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1940
            del pidfile
 
1941
        except IOError:
 
1942
            logger.error("Could not write to file %r with PID %d",
 
1943
                         pidfilename, pid)
 
1944
        except NameError:
 
1945
            # "pidfile" was never created
 
1946
            pass
 
1947
        del pidfilename
 
1948
        
1862
1949
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1950
 
1863
1951
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1864
1952
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1865
1953
    
1867
1955
        class MandosDBusService(dbus.service.Object):
1868
1956
            """A D-Bus proxy object"""
1869
1957
            def __init__(self):
1870
 
                dbus.service.Object.__init__(self, bus, u"/")
1871
 
            _interface = u"se.bsnet.fukt.Mandos"
 
1958
                dbus.service.Object.__init__(self, bus, "/")
 
1959
            _interface = "se.bsnet.fukt.Mandos"
1872
1960
            
1873
 
            @dbus.service.signal(_interface, signature=u"o")
 
1961
            @dbus.service.signal(_interface, signature="o")
1874
1962
            def ClientAdded(self, objpath):
1875
1963
                "D-Bus signal"
1876
1964
                pass
1877
1965
            
1878
 
            @dbus.service.signal(_interface, signature=u"ss")
 
1966
            @dbus.service.signal(_interface, signature="ss")
1879
1967
            def ClientNotFound(self, fingerprint, address):
1880
1968
                "D-Bus signal"
1881
1969
                pass
1882
1970
            
1883
 
            @dbus.service.signal(_interface, signature=u"os")
 
1971
            @dbus.service.signal(_interface, signature="os")
1884
1972
            def ClientRemoved(self, objpath, name):
1885
1973
                "D-Bus signal"
1886
1974
                pass
1887
1975
            
1888
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1976
            @dbus.service.method(_interface, out_signature="ao")
1889
1977
            def GetAllClients(self):
1890
1978
                "D-Bus method"
1891
1979
                return dbus.Array(c.dbus_object_path
1892
1980
                                  for c in tcp_server.clients)
1893
1981
            
1894
1982
            @dbus.service.method(_interface,
1895
 
                                 out_signature=u"a{oa{sv}}")
 
1983
                                 out_signature="a{oa{sv}}")
1896
1984
            def GetAllClientsWithProperties(self):
1897
1985
                "D-Bus method"
1898
1986
                return dbus.Dictionary(
1899
 
                    ((c.dbus_object_path, c.GetAll(u""))
 
1987
                    ((c.dbus_object_path, c.GetAll(""))
1900
1988
                     for c in tcp_server.clients),
1901
 
                    signature=u"oa{sv}")
 
1989
                    signature="oa{sv}")
1902
1990
            
1903
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1991
            @dbus.service.method(_interface, in_signature="o")
1904
1992
            def RemoveClient(self, object_path):
1905
1993
                "D-Bus method"
1906
1994
                for c in tcp_server.clients:
1948
2036
    # Find out what port we got
1949
2037
    service.port = tcp_server.socket.getsockname()[1]
1950
2038
    if use_ipv6:
1951
 
        logger.info(u"Now listening on address %r, port %d,"
 
2039
        logger.info("Now listening on address %r, port %d,"
1952
2040
                    " flowinfo %d, scope_id %d"
1953
2041
                    % tcp_server.socket.getsockname())
1954
2042
    else:                       # IPv4
1955
 
        logger.info(u"Now listening on address %r, port %d"
 
2043
        logger.info("Now listening on address %r, port %d"
1956
2044
                    % tcp_server.socket.getsockname())
1957
2045
    
1958
2046
    #service.interface = tcp_server.socket.getsockname()[3]
1961
2049
        # From the Avahi example code
1962
2050
        try:
1963
2051
            service.activate()
1964
 
        except dbus.exceptions.DBusException, error:
1965
 
            logger.critical(u"DBusException: %s", error)
 
2052
        except dbus.exceptions.DBusException as error:
 
2053
            logger.critical("DBusException: %s", error)
1966
2054
            cleanup()
1967
2055
            sys.exit(1)
1968
2056
        # End of Avahi example code
1972
2060
                             (tcp_server.handle_request
1973
2061
                              (*args[2:], **kwargs) or True))
1974
2062
        
1975
 
        logger.debug(u"Starting main loop")
 
2063
        logger.debug("Starting main loop")
1976
2064
        main_loop.run()
1977
 
    except AvahiError, error:
1978
 
        logger.critical(u"AvahiError: %s", error)
 
2065
    except AvahiError as error:
 
2066
        logger.critical("AvahiError: %s", error)
1979
2067
        cleanup()
1980
2068
        sys.exit(1)
1981
2069
    except KeyboardInterrupt:
1982
2070
        if debug:
1983
 
            print >> sys.stderr
1984
 
        logger.debug(u"Server received KeyboardInterrupt")
1985
 
    logger.debug(u"Server exiting")
 
2071
            print("", file=sys.stderr)
 
2072
        logger.debug("Server received KeyboardInterrupt")
 
2073
    logger.debug("Server exiting")
1986
2074
    # Must run before the D-Bus bus name gets deregistered
1987
2075
    cleanup()
1988
2076