/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

* plugins.d/password-prompt.c (conflict_detection): Check for both
                                                    "plymouth" and
                                                    "plymouthd".

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