/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 03:03:33 UTC
  • Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.

The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string.  This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:

SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256

* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
  (/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
                                      instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 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
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
import SocketServer as socketserver
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
69
78
import tempfile
70
79
import itertools
71
80
import collections
 
81
import codecs
72
82
 
73
83
import dbus
74
84
import dbus.service
75
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
76
89
import avahi
77
90
from dbus.mainloop.glib import DBusGMainLoop
78
91
import ctypes
88
101
    except ImportError:
89
102
        SO_BINDTODEVICE = None
90
103
 
91
 
version = "1.6.2"
 
104
if sys.version_info.major == 2:
 
105
    str = unicode
 
106
 
 
107
version = "1.6.9"
92
108
stored_state_file = "clients.pickle"
93
109
 
94
110
logger = logging.getLogger()
95
 
syslogger = (logging.handlers.SysLogHandler
96
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
 
              address = str("/dev/log")))
 
111
syslogger = None
98
112
 
99
113
try:
100
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
101
 
                      (ctypes.util.find_library("c"))
102
 
                      .if_nametoindex)
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
103
116
except (OSError, AttributeError):
 
117
    
104
118
    def if_nametoindex(interface):
105
119
        "Get an interface index the hard way, i.e. using fcntl()"
106
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
107
121
        with contextlib.closing(socket.socket()) as s:
108
122
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
 
                                struct.pack(str("16s16x"),
110
 
                                            interface))
111
 
        interface_index = struct.unpack(str("I"),
112
 
                                        ifreq[16:20])[0]
 
123
                                struct.pack(b"16s16x", interface))
 
124
        interface_index = struct.unpack("I", ifreq[16:20])[0]
113
125
        return interface_index
114
126
 
115
127
 
116
128
def initlogger(debug, level=logging.WARNING):
117
129
    """init logger and add loglevel"""
118
130
    
 
131
    global syslogger
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
119
135
    syslogger.setFormatter(logging.Formatter
120
136
                           ('Mandos [%(process)d]: %(levelname)s:'
121
137
                            ' %(message)s'))
138
154
 
139
155
class PGPEngine(object):
140
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
141
158
    def __init__(self):
142
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
160
        self.gnupgargs = ['--batch',
182
199
    
183
200
    def encrypt(self, data, password):
184
201
        passphrase = self.password_encode(password)
185
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
186
 
                                         ) as passfile:
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
187
204
            passfile.write(passphrase)
188
205
            passfile.flush()
189
206
            proc = subprocess.Popen(['gpg', '--symmetric',
200
217
    
201
218
    def decrypt(self, data, password):
202
219
        passphrase = self.password_encode(password)
203
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
204
 
                                         ) as passfile:
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
205
222
            passfile.write(passphrase)
206
223
            passfile.flush()
207
224
            proc = subprocess.Popen(['gpg', '--decrypt',
211
228
                                    stdin = subprocess.PIPE,
212
229
                                    stdout = subprocess.PIPE,
213
230
                                    stderr = subprocess.PIPE)
214
 
            decrypted_plaintext, err = proc.communicate(input
215
 
                                                        = data)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
216
232
        if proc.returncode != 0:
217
233
            raise PGPError(err)
218
234
        return decrypted_plaintext
221
237
class AvahiError(Exception):
222
238
    def __init__(self, value, *args, **kwargs):
223
239
        self.value = value
224
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
225
 
    def __unicode__(self):
226
 
        return unicode(repr(self.value))
 
240
        return super(AvahiError, self).__init__(value, *args,
 
241
                                                **kwargs)
 
242
 
227
243
 
228
244
class AvahiServiceError(AvahiError):
229
245
    pass
230
246
 
 
247
 
231
248
class AvahiGroupError(AvahiError):
232
249
    pass
233
250
 
253
270
    bus: dbus.SystemBus()
254
271
    """
255
272
    
256
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
 
                 servicetype = None, port = None, TXT = None,
258
 
                 domain = "", host = "", max_renames = 32768,
259
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
273
    def __init__(self,
 
274
                 interface = avahi.IF_UNSPEC,
 
275
                 name = None,
 
276
                 servicetype = None,
 
277
                 port = None,
 
278
                 TXT = None,
 
279
                 domain = "",
 
280
                 host = "",
 
281
                 max_renames = 32768,
 
282
                 protocol = avahi.PROTO_UNSPEC,
 
283
                 bus = None):
260
284
        self.interface = interface
261
285
        self.name = name
262
286
        self.type = servicetype
272
296
        self.bus = bus
273
297
        self.entry_group_state_changed_match = None
274
298
    
275
 
    def rename(self):
 
299
    def rename(self, remove=True):
276
300
        """Derived from the Avahi example code"""
277
301
        if self.rename_count >= self.max_renames:
278
302
            logger.critical("No suitable Zeroconf service name found"
279
303
                            " after %i retries, exiting.",
280
304
                            self.rename_count)
281
305
            raise AvahiServiceError("Too many renames")
282
 
        self.name = unicode(self.server
283
 
                            .GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
 
308
        self.rename_count += 1
284
309
        logger.info("Changing Zeroconf service name to %r ...",
285
310
                    self.name)
286
 
        self.remove()
 
311
        if remove:
 
312
            self.remove()
287
313
        try:
288
314
            self.add()
289
315
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
291
 
            self.cleanup()
292
 
            os._exit(1)
293
 
        self.rename_count += 1
 
316
            if (error.get_dbus_name()
 
317
                == "org.freedesktop.Avahi.CollisionError"):
 
318
                logger.info("Local Zeroconf service name collision.")
 
319
                return self.rename(remove=False)
 
320
            else:
 
321
                logger.critical("D-Bus Exception", exc_info=error)
 
322
                self.cleanup()
 
323
                os._exit(1)
294
324
    
295
325
    def remove(self):
296
326
        """Derived from the Avahi example code"""
334
364
            self.rename()
335
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
366
            logger.critical("Avahi: Error in group state changed %s",
337
 
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {0!s}"
339
 
                                  .format(error))
 
367
                            str(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
340
369
    
341
370
    def cleanup(self):
342
371
        """Derived from the Avahi example code"""
352
381
    def server_state_changed(self, state, error=None):
353
382
        """Derived from the Avahi example code"""
354
383
        logger.debug("Avahi server state change: %i", state)
355
 
        bad_states = { avahi.SERVER_INVALID:
356
 
                           "Zeroconf server invalid",
357
 
                       avahi.SERVER_REGISTERING: None,
358
 
                       avahi.SERVER_COLLISION:
359
 
                           "Zeroconf server name collision",
360
 
                       avahi.SERVER_FAILURE:
361
 
                           "Zeroconf server failure" }
 
384
        bad_states = {
 
385
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
386
            avahi.SERVER_REGISTERING: None,
 
387
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
388
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
389
        }
362
390
        if state in bad_states:
363
391
            if bad_states[state] is not None:
364
392
                if error is None:
367
395
                    logger.error(bad_states[state] + ": %r", error)
368
396
            self.cleanup()
369
397
        elif state == avahi.SERVER_RUNNING:
370
 
            self.add()
 
398
            try:
 
399
                self.add()
 
400
            except dbus.exceptions.DBusException as error:
 
401
                if (error.get_dbus_name()
 
402
                    == "org.freedesktop.Avahi.CollisionError"):
 
403
                    logger.info("Local Zeroconf service name"
 
404
                                " collision.")
 
405
                    return self.rename(remove=False)
 
406
                else:
 
407
                    logger.critical("D-Bus Exception", exc_info=error)
 
408
                    self.cleanup()
 
409
                    os._exit(1)
371
410
        else:
372
411
            if error is None:
373
412
                logger.debug("Unknown state: %r", state)
383
422
                                    follow_name_owner_changes=True),
384
423
                avahi.DBUS_INTERFACE_SERVER)
385
424
        self.server.connect_to_signal("StateChanged",
386
 
                                 self.server_state_changed)
 
425
                                      self.server_state_changed)
387
426
        self.server_state_changed(self.server.GetState())
388
427
 
389
428
 
390
429
class AvahiServiceToSyslog(AvahiService):
391
 
    def rename(self):
 
430
    def rename(self, *args, **kwargs):
392
431
        """Add the new name to the syslog messages"""
393
 
        ret = AvahiService.rename(self)
394
 
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({0}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
432
        ret = AvahiService.rename(self, *args, **kwargs)
 
433
        syslogger.setFormatter(logging.Formatter(
 
434
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
435
            .format(self.name)))
398
436
        return ret
399
437
 
400
 
 
401
 
def timedelta_to_milliseconds(td):
402
 
    "Convert a datetime.timedelta() to milliseconds"
403
 
    return ((td.days * 24 * 60 * 60 * 1000)
404
 
            + (td.seconds * 1000)
405
 
            + (td.microseconds // 1000))
406
 
 
 
438
def call_pipe(connection,       # : multiprocessing.Connection
 
439
              func, *args, **kwargs):
 
440
    """This function is meant to be called by multiprocessing.Process
 
441
    
 
442
    This function runs func(*args, **kwargs), and writes the resulting
 
443
    return value on the provided multiprocessing.Connection.
 
444
    """
 
445
    connection.send(func(*args, **kwargs))
 
446
    connection.close()
407
447
 
408
448
class Client(object):
409
449
    """A representation of a client host served by this server.
436
476
    last_checker_status: integer between 0 and 255 reflecting exit
437
477
                         status of last checker. -1 reflects crashed
438
478
                         checker, -2 means no checker completed yet.
 
479
    last_checker_signal: The signal which killed the last checker, if
 
480
                         last_checker_status is -1
439
481
    last_enabled: datetime.datetime(); (UTC) or None
440
482
    name:       string; from the config file, used in log messages and
441
483
                        D-Bus identifiers
454
496
                          "fingerprint", "host", "interval",
455
497
                          "last_approval_request", "last_checked_ok",
456
498
                          "last_enabled", "name", "timeout")
457
 
    client_defaults = { "timeout": "PT5M",
458
 
                        "extended_timeout": "PT15M",
459
 
                        "interval": "PT2M",
460
 
                        "checker": "fping -q -- %%(host)s",
461
 
                        "host": "",
462
 
                        "approval_delay": "PT0S",
463
 
                        "approval_duration": "PT1S",
464
 
                        "approved_by_default": "True",
465
 
                        "enabled": "True",
466
 
                        }
467
 
    
468
 
    def timeout_milliseconds(self):
469
 
        "Return the 'timeout' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.timeout)
471
 
    
472
 
    def extended_timeout_milliseconds(self):
473
 
        "Return the 'extended_timeout' attribute in milliseconds"
474
 
        return timedelta_to_milliseconds(self.extended_timeout)
475
 
    
476
 
    def interval_milliseconds(self):
477
 
        "Return the 'interval' attribute in milliseconds"
478
 
        return timedelta_to_milliseconds(self.interval)
479
 
    
480
 
    def approval_delay_milliseconds(self):
481
 
        return timedelta_to_milliseconds(self.approval_delay)
 
499
    client_defaults = {
 
500
        "timeout": "PT5M",
 
501
        "extended_timeout": "PT15M",
 
502
        "interval": "PT2M",
 
503
        "checker": "fping -q -- %%(host)s",
 
504
        "host": "",
 
505
        "approval_delay": "PT0S",
 
506
        "approval_duration": "PT1S",
 
507
        "approved_by_default": "True",
 
508
        "enabled": "True",
 
509
    }
482
510
    
483
511
    @staticmethod
484
512
    def config_parser(config):
500
528
            client["enabled"] = config.getboolean(client_name,
501
529
                                                  "enabled")
502
530
            
 
531
            # Uppercase and remove spaces from fingerprint for later
 
532
            # comparison purposes with return value from the
 
533
            # fingerprint() function
503
534
            client["fingerprint"] = (section["fingerprint"].upper()
504
535
                                     .replace(" ", ""))
505
536
            if "secret" in section:
510
541
                          "rb") as secfile:
511
542
                    client["secret"] = secfile.read()
512
543
            else:
513
 
                raise TypeError("No secret or secfile for section {0}"
 
544
                raise TypeError("No secret or secfile for section {}"
514
545
                                .format(section))
515
546
            client["timeout"] = string_to_delta(section["timeout"])
516
547
            client["extended_timeout"] = string_to_delta(
533
564
            server_settings = {}
534
565
        self.server_settings = server_settings
535
566
        # adding all client settings
536
 
        for setting, value in settings.iteritems():
 
567
        for setting, value in settings.items():
537
568
            setattr(self, setting, value)
538
569
        
539
570
        if self.enabled:
547
578
            self.expires = None
548
579
        
549
580
        logger.debug("Creating client %r", self.name)
550
 
        # Uppercase and remove spaces from fingerprint for later
551
 
        # comparison purposes with return value from the fingerprint()
552
 
        # function
553
581
        logger.debug("  Fingerprint: %s", self.fingerprint)
554
582
        self.created = settings.get("created",
555
583
                                    datetime.datetime.utcnow())
562
590
        self.current_checker_command = None
563
591
        self.approved = None
564
592
        self.approvals_pending = 0
565
 
        self.changedstate = (multiprocessing_manager
566
 
                             .Condition(multiprocessing_manager
567
 
                                        .Lock()))
568
 
        self.client_structure = [attr for attr in
569
 
                                 self.__dict__.iterkeys()
 
593
        self.changedstate = multiprocessing_manager.Condition(
 
594
            multiprocessing_manager.Lock())
 
595
        self.client_structure = [attr
 
596
                                 for attr in self.__dict__.iterkeys()
570
597
                                 if not attr.startswith("_")]
571
598
        self.client_structure.append("client_structure")
572
599
        
573
 
        for name, t in inspect.getmembers(type(self),
574
 
                                          lambda obj:
575
 
                                              isinstance(obj,
576
 
                                                         property)):
 
600
        for name, t in inspect.getmembers(
 
601
                type(self), lambda obj: isinstance(obj, property)):
577
602
            if not name.startswith("_"):
578
603
                self.client_structure.append(name)
579
604
    
621
646
        # and every interval from then on.
622
647
        if self.checker_initiator_tag is not None:
623
648
            gobject.source_remove(self.checker_initiator_tag)
624
 
        self.checker_initiator_tag = (gobject.timeout_add
625
 
                                      (self.interval_milliseconds(),
626
 
                                       self.start_checker))
 
649
        self.checker_initiator_tag = gobject.timeout_add(
 
650
            int(self.interval.total_seconds() * 1000),
 
651
            self.start_checker)
627
652
        # Schedule a disable() when 'timeout' has passed
628
653
        if self.disable_initiator_tag is not None:
629
654
            gobject.source_remove(self.disable_initiator_tag)
630
 
        self.disable_initiator_tag = (gobject.timeout_add
631
 
                                   (self.timeout_milliseconds(),
632
 
                                    self.disable))
 
655
        self.disable_initiator_tag = gobject.timeout_add(
 
656
            int(self.timeout.total_seconds() * 1000), self.disable)
633
657
        # Also start a new checker *right now*.
634
658
        self.start_checker()
635
659
    
636
 
    def checker_callback(self, pid, condition, command):
 
660
    def checker_callback(self, source, condition, connection,
 
661
                         command):
637
662
        """The checker has completed, so take appropriate actions."""
638
663
        self.checker_callback_tag = None
639
664
        self.checker = None
640
 
        if os.WIFEXITED(condition):
641
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
665
        # Read return code from connection (see call_pipe)
 
666
        returncode = connection.recv()
 
667
        connection.close()
 
668
        
 
669
        if returncode >= 0:
 
670
            self.last_checker_status = returncode
 
671
            self.last_checker_signal = None
642
672
            if self.last_checker_status == 0:
643
673
                logger.info("Checker for %(name)s succeeded",
644
674
                            vars(self))
645
675
                self.checked_ok()
646
676
            else:
647
 
                logger.info("Checker for %(name)s failed",
648
 
                            vars(self))
 
677
                logger.info("Checker for %(name)s failed", vars(self))
649
678
        else:
650
679
            self.last_checker_status = -1
 
680
            self.last_checker_signal = -returncode
651
681
            logger.warning("Checker for %(name)s crashed?",
652
682
                           vars(self))
 
683
        return False
653
684
    
654
685
    def checked_ok(self):
655
686
        """Assert that the client has been seen, alive and well."""
656
687
        self.last_checked_ok = datetime.datetime.utcnow()
657
688
        self.last_checker_status = 0
 
689
        self.last_checker_signal = None
658
690
        self.bump_timeout()
659
691
    
660
692
    def bump_timeout(self, timeout=None):
665
697
            gobject.source_remove(self.disable_initiator_tag)
666
698
            self.disable_initiator_tag = None
667
699
        if getattr(self, "enabled", False):
668
 
            self.disable_initiator_tag = (gobject.timeout_add
669
 
                                          (timedelta_to_milliseconds
670
 
                                           (timeout), self.disable))
 
700
            self.disable_initiator_tag = gobject.timeout_add(
 
701
                int(timeout.total_seconds() * 1000), self.disable)
671
702
            self.expires = datetime.datetime.utcnow() + timeout
672
703
    
673
704
    def need_approval(self):
687
718
        # than 'timeout' for the client to be disabled, which is as it
688
719
        # should be.
689
720
        
690
 
        # If a checker exists, make sure it is not a zombie
691
 
        try:
692
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
 
        except AttributeError:
694
 
            pass
695
 
        except OSError as error:
696
 
            if error.errno != errno.ECHILD:
697
 
                raise
698
 
        else:
699
 
            if pid:
700
 
                logger.warning("Checker was a zombie")
701
 
                gobject.source_remove(self.checker_callback_tag)
702
 
                self.checker_callback(pid, status,
703
 
                                      self.current_checker_command)
 
721
        if self.checker is not None and not self.checker.is_alive():
 
722
            logger.warning("Checker was not alive; joining")
 
723
            self.checker.join()
 
724
            self.checker = None
704
725
        # Start a new checker if needed
705
726
        if self.checker is None:
706
727
            # Escape attributes for the shell
707
 
            escaped_attrs = dict(
708
 
                (attr, re.escape(unicode(getattr(self, attr))))
709
 
                for attr in
710
 
                self.runtime_expansions)
 
728
            escaped_attrs = {
 
729
                attr: re.escape(str(getattr(self, attr)))
 
730
                for attr in self.runtime_expansions }
711
731
            try:
712
732
                command = self.checker_command % escaped_attrs
713
733
            except TypeError as error:
714
734
                logger.error('Could not format string "%s"',
715
 
                             self.checker_command, exc_info=error)
716
 
                return True # Try again later
 
735
                             self.checker_command,
 
736
                             exc_info=error)
 
737
                return True     # Try again later
717
738
            self.current_checker_command = command
718
 
            try:
719
 
                logger.info("Starting checker %r for %s",
720
 
                            command, self.name)
721
 
                # We don't need to redirect stdout and stderr, since
722
 
                # in normal mode, that is already done by daemon(),
723
 
                # and in debug mode we don't want to.  (Stdin is
724
 
                # always replaced by /dev/null.)
725
 
                # The exception is when not debugging but nevertheless
726
 
                # running in the foreground; use the previously
727
 
                # created wnull.
728
 
                popen_args = {}
729
 
                if (not self.server_settings["debug"]
730
 
                    and self.server_settings["foreground"]):
731
 
                    popen_args.update({"stdout": wnull,
732
 
                                       "stderr": wnull })
733
 
                self.checker = subprocess.Popen(command,
734
 
                                                close_fds=True,
735
 
                                                shell=True, cwd="/",
736
 
                                                **popen_args)
737
 
            except OSError as error:
738
 
                logger.error("Failed to start subprocess",
739
 
                             exc_info=error)
740
 
                return True
741
 
            self.checker_callback_tag = (gobject.child_watch_add
742
 
                                         (self.checker.pid,
743
 
                                          self.checker_callback,
744
 
                                          data=command))
745
 
            # The checker may have completed before the gobject
746
 
            # watch was added.  Check for this.
747
 
            try:
748
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
749
 
            except OSError as error:
750
 
                if error.errno == errno.ECHILD:
751
 
                    # This should never happen
752
 
                    logger.error("Child process vanished",
753
 
                                 exc_info=error)
754
 
                    return True
755
 
                raise
756
 
            if pid:
757
 
                gobject.source_remove(self.checker_callback_tag)
758
 
                self.checker_callback(pid, status, command)
 
739
            logger.info("Starting checker %r for %s", command,
 
740
                        self.name)
 
741
            # We don't need to redirect stdout and stderr, since
 
742
            # in normal mode, that is already done by daemon(),
 
743
            # and in debug mode we don't want to.  (Stdin is
 
744
            # always replaced by /dev/null.)
 
745
            # The exception is when not debugging but nevertheless
 
746
            # running in the foreground; use the previously
 
747
            # created wnull.
 
748
            popen_args = { "close_fds": True,
 
749
                           "shell": True,
 
750
                           "cwd": "/" }
 
751
            if (not self.server_settings["debug"]
 
752
                and self.server_settings["foreground"]):
 
753
                popen_args.update({"stdout": wnull,
 
754
                                   "stderr": wnull })
 
755
            pipe = multiprocessing.Pipe(duplex = False)
 
756
            self.checker = multiprocessing.Process(
 
757
                target = call_pipe,
 
758
                args = (pipe[1], subprocess.call, command),
 
759
                kwargs = popen_args)
 
760
            self.checker.start()
 
761
            self.checker_callback_tag = gobject.io_add_watch(
 
762
                pipe[0].fileno(), gobject.IO_IN,
 
763
                self.checker_callback, pipe[0], command)
759
764
        # Re-run this periodically if run by gobject.timeout_add
760
765
        return True
761
766
    
767
772
        if getattr(self, "checker", None) is None:
768
773
            return
769
774
        logger.debug("Stopping checker for %(name)s", vars(self))
770
 
        try:
771
 
            self.checker.terminate()
772
 
            #time.sleep(0.5)
773
 
            #if self.checker.poll() is None:
774
 
            #    self.checker.kill()
775
 
        except OSError as error:
776
 
            if error.errno != errno.ESRCH: # No such process
777
 
                raise
 
775
        self.checker.terminate()
778
776
        self.checker = None
779
777
 
780
778
 
781
 
def dbus_service_property(dbus_interface, signature="v",
782
 
                          access="readwrite", byte_arrays=False):
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
783
783
    """Decorators for marking methods of a DBusObjectWithProperties to
784
784
    become properties on the D-Bus.
785
785
    
794
794
    # "Set" method, so we fail early here:
795
795
    if byte_arrays and signature != "ay":
796
796
        raise ValueError("Byte arrays not supported for non-'ay'"
797
 
                         " signature {0!r}".format(signature))
 
797
                         " signature {!r}".format(signature))
 
798
    
798
799
    def decorator(func):
799
800
        func._dbus_is_property = True
800
801
        func._dbus_interface = dbus_interface
805
806
            func._dbus_name = func._dbus_name[:-14]
806
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
807
808
        return func
 
809
    
808
810
    return decorator
809
811
 
810
812
 
819
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
820
822
                    "false"}
821
823
    """
 
824
    
822
825
    def decorator(func):
823
826
        func._dbus_is_interface = True
824
827
        func._dbus_interface = dbus_interface
825
828
        func._dbus_name = dbus_interface
826
829
        return func
 
830
    
827
831
    return decorator
828
832
 
829
833
 
831
835
    """Decorator to annotate D-Bus methods, signals or properties
832
836
    Usage:
833
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
834
841
    @dbus_service_property("org.example.Interface", signature="b",
835
842
                           access="r")
836
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
 
                        "org.freedesktop.DBus.Property."
838
 
                        "EmitsChangedSignal": "false"})
839
843
    def Property_dbus_property(self):
840
844
        return dbus.Boolean(False)
841
845
    """
 
846
    
842
847
    def decorator(func):
843
848
        func._dbus_annotations = annotations
844
849
        return func
 
850
    
845
851
    return decorator
846
852
 
847
853
 
848
854
class DBusPropertyException(dbus.exceptions.DBusException):
849
855
    """A base class for D-Bus property-related exceptions
850
856
    """
851
 
    def __unicode__(self):
852
 
        return unicode(str(self))
 
857
    pass
853
858
 
854
859
 
855
860
class DBusPropertyAccessException(DBusPropertyException):
879
884
        If called like _is_dbus_thing("method") it returns a function
880
885
        suitable for use as predicate to inspect.getmembers().
881
886
        """
882
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
887
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
883
888
                                   False)
884
889
    
885
890
    def _get_all_dbus_things(self, thing):
886
891
        """Returns a generator of (name, attribute) pairs
887
892
        """
888
 
        return ((getattr(athing.__get__(self), "_dbus_name",
889
 
                         name),
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
890
894
                 athing.__get__(self))
891
895
                for cls in self.__class__.__mro__
892
896
                for name, athing in
893
 
                inspect.getmembers(cls,
894
 
                                   self._is_dbus_thing(thing)))
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
895
898
    
896
899
    def _get_dbus_property(self, interface_name, property_name):
897
900
        """Returns a bound method if one exists which is a D-Bus
898
901
        property with the specified name and interface.
899
902
        """
900
 
        for cls in  self.__class__.__mro__:
901
 
            for name, value in (inspect.getmembers
902
 
                                (cls,
903
 
                                 self._is_dbus_thing("property"))):
 
903
        for cls in self.__class__.__mro__:
 
904
            for name, value in inspect.getmembers(
 
905
                    cls, self._is_dbus_thing("property")):
904
906
                if (value._dbus_name == property_name
905
907
                    and value._dbus_interface == interface_name):
906
908
                    return value.__get__(self)
907
909
        
908
910
        # No such property
909
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
 
                                   + interface_name + "."
911
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
912
913
    
913
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
914
916
                         out_signature="v")
915
917
    def Get(self, interface_name, property_name):
916
918
        """Standard D-Bus property Get() method, see D-Bus standard.
935
937
            # signatures other than "ay".
936
938
            if prop._dbus_signature != "ay":
937
939
                raise ValueError("Byte arrays not supported for non-"
938
 
                                 "'ay' signature {0!r}"
 
940
                                 "'ay' signature {!r}"
939
941
                                 .format(prop._dbus_signature))
940
942
            value = dbus.ByteArray(b''.join(chr(byte)
941
943
                                            for byte in value))
942
944
        prop(value)
943
945
    
944
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
945
948
                         out_signature="a{sv}")
946
949
    def GetAll(self, interface_name):
947
950
        """Standard D-Bus property GetAll() method, see D-Bus
962
965
            if not hasattr(value, "variant_level"):
963
966
                properties[name] = value
964
967
                continue
965
 
            properties[name] = type(value)(value, variant_level=
966
 
                                           value.variant_level+1)
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
967
970
        return dbus.Dictionary(properties, signature="sv")
968
971
    
 
972
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
973
    def PropertiesChanged(self, interface_name, changed_properties,
 
974
                          invalidated_properties):
 
975
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
976
        standard.
 
977
        """
 
978
        pass
 
979
    
969
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
981
                         out_signature="s",
971
982
                         path_keyword='object_path',
979
990
                                                   connection)
980
991
        try:
981
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
982
994
            def make_tag(document, name, prop):
983
995
                e = document.createElement("property")
984
996
                e.setAttribute("name", name)
985
997
                e.setAttribute("type", prop._dbus_signature)
986
998
                e.setAttribute("access", prop._dbus_access)
987
999
                return e
 
1000
            
988
1001
            for if_tag in document.getElementsByTagName("interface"):
989
1002
                # Add property tags
990
1003
                for tag in (make_tag(document, name, prop)
1002
1015
                            if (name == tag.getAttribute("name")
1003
1016
                                and prop._dbus_interface
1004
1017
                                == if_tag.getAttribute("name")):
1005
 
                                annots.update(getattr
1006
 
                                              (prop,
1007
 
                                               "_dbus_annotations",
1008
 
                                               {}))
1009
 
                        for name, value in annots.iteritems():
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
 
1020
                        for name, value in annots.items():
1010
1021
                            ann_tag = document.createElement(
1011
1022
                                "annotation")
1012
1023
                            ann_tag.setAttribute("name", name)
1015
1026
                # Add interface annotation tags
1016
1027
                for annotation, value in dict(
1017
1028
                    itertools.chain.from_iterable(
1018
 
                        annotations().iteritems()
1019
 
                        for name, annotations in
1020
 
                        self._get_all_dbus_things("interface")
 
1029
                        annotations().items()
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
1021
1032
                        if name == if_tag.getAttribute("name")
1022
 
                        )).iteritems():
 
1033
                        )).items():
1023
1034
                    ann_tag = document.createElement("annotation")
1024
1035
                    ann_tag.setAttribute("name", annotation)
1025
1036
                    ann_tag.setAttribute("value", value)
1052
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1053
1064
    if dt is None:
1054
1065
        return dbus.String("", variant_level = variant_level)
1055
 
    return dbus.String(dt.isoformat(),
1056
 
                       variant_level=variant_level)
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
1067
 
1058
1068
 
1059
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1079
1089
    (from DBusObjectWithProperties) and interfaces (from the
1080
1090
    dbus_interface_annotations decorator).
1081
1091
    """
 
1092
    
1082
1093
    def wrapper(cls):
1083
1094
        for orig_interface_name, alt_interface_name in (
1084
 
            alt_interface_names.iteritems()):
 
1095
                alt_interface_names.items()):
1085
1096
            attr = {}
1086
1097
            interface_names = set()
1087
1098
            # Go though all attributes of the class
1089
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
1090
1101
                # with the wrong interface name
1091
1102
                if (not hasattr(attribute, "_dbus_interface")
1092
 
                    or not attribute._dbus_interface
1093
 
                    .startswith(orig_interface_name)):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
1094
1105
                    continue
1095
1106
                # Create an alternate D-Bus interface name based on
1096
1107
                # the current name
1097
 
                alt_interface = (attribute._dbus_interface
1098
 
                                 .replace(orig_interface_name,
1099
 
                                          alt_interface_name))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
1100
1110
                interface_names.add(alt_interface)
1101
1111
                # Is this a D-Bus signal?
1102
1112
                if getattr(attribute, "_dbus_is_signal", False):
1103
 
                    # Extract the original non-method undecorated
1104
 
                    # function by black magic
1105
 
                    nonmethod_func = (dict(
 
1113
                    if sys.version_info.major == 2:
 
1114
                        # Extract the original non-method undecorated
 
1115
                        # function by black magic
 
1116
                        nonmethod_func = (dict(
1106
1117
                            zip(attribute.func_code.co_freevars,
1107
 
                                attribute.__closure__))["func"]
1108
 
                                      .cell_contents)
 
1118
                                attribute.__closure__))
 
1119
                                          ["func"].cell_contents)
 
1120
                    else:
 
1121
                        nonmethod_func = attribute
1109
1122
                    # Create a new, but exactly alike, function
1110
1123
                    # object, and decorate it to be a new D-Bus signal
1111
1124
                    # with the alternate D-Bus interface name
1112
 
                    new_function = (dbus.service.signal
1113
 
                                    (alt_interface,
1114
 
                                     attribute._dbus_signature)
1115
 
                                    (types.FunctionType(
1116
 
                                nonmethod_func.func_code,
1117
 
                                nonmethod_func.func_globals,
1118
 
                                nonmethod_func.func_name,
1119
 
                                nonmethod_func.func_defaults,
1120
 
                                nonmethod_func.func_closure)))
 
1125
                    if sys.version_info.major == 2:
 
1126
                        new_function = types.FunctionType(
 
1127
                            nonmethod_func.func_code,
 
1128
                            nonmethod_func.func_globals,
 
1129
                            nonmethod_func.func_name,
 
1130
                            nonmethod_func.func_defaults,
 
1131
                            nonmethod_func.func_closure)
 
1132
                    else:
 
1133
                        new_function = types.FunctionType(
 
1134
                            nonmethod_func.__code__,
 
1135
                            nonmethod_func.__globals__,
 
1136
                            nonmethod_func.__name__,
 
1137
                            nonmethod_func.__defaults__,
 
1138
                            nonmethod_func.__closure__)
 
1139
                    new_function = (dbus.service.signal(
 
1140
                        alt_interface,
 
1141
                        attribute._dbus_signature)(new_function))
1121
1142
                    # Copy annotations, if any
1122
1143
                    try:
1123
 
                        new_function._dbus_annotations = (
1124
 
                            dict(attribute._dbus_annotations))
 
1144
                        new_function._dbus_annotations = dict(
 
1145
                            attribute._dbus_annotations)
1125
1146
                    except AttributeError:
1126
1147
                        pass
1127
1148
                    # Define a creator of a function to call both the
1132
1153
                        """This function is a scope container to pass
1133
1154
                        func1 and func2 to the "call_both" function
1134
1155
                        outside of its arguments"""
 
1156
                        
1135
1157
                        def call_both(*args, **kwargs):
1136
1158
                            """This function will emit two D-Bus
1137
1159
                            signals by calling func1 and func2"""
1138
1160
                            func1(*args, **kwargs)
1139
1161
                            func2(*args, **kwargs)
 
1162
                        
1140
1163
                        return call_both
1141
1164
                    # Create the "call_both" function and add it to
1142
1165
                    # the class
1147
1170
                    # object.  Decorate it to be a new D-Bus method
1148
1171
                    # with the alternate D-Bus interface name.  Add it
1149
1172
                    # to the class.
1150
 
                    attr[attrname] = (dbus.service.method
1151
 
                                      (alt_interface,
1152
 
                                       attribute._dbus_in_signature,
1153
 
                                       attribute._dbus_out_signature)
1154
 
                                      (types.FunctionType
1155
 
                                       (attribute.func_code,
1156
 
                                        attribute.func_globals,
1157
 
                                        attribute.func_name,
1158
 
                                        attribute.func_defaults,
1159
 
                                        attribute.func_closure)))
 
1173
                    attr[attrname] = (
 
1174
                        dbus.service.method(
 
1175
                            alt_interface,
 
1176
                            attribute._dbus_in_signature,
 
1177
                            attribute._dbus_out_signature)
 
1178
                        (types.FunctionType(attribute.func_code,
 
1179
                                            attribute.func_globals,
 
1180
                                            attribute.func_name,
 
1181
                                            attribute.func_defaults,
 
1182
                                            attribute.func_closure)))
1160
1183
                    # Copy annotations, if any
1161
1184
                    try:
1162
 
                        attr[attrname]._dbus_annotations = (
1163
 
                            dict(attribute._dbus_annotations))
 
1185
                        attr[attrname]._dbus_annotations = dict(
 
1186
                            attribute._dbus_annotations)
1164
1187
                    except AttributeError:
1165
1188
                        pass
1166
1189
                # Is this a D-Bus property?
1169
1192
                    # object, and decorate it to be a new D-Bus
1170
1193
                    # property with the alternate D-Bus interface
1171
1194
                    # name.  Add it to the class.
1172
 
                    attr[attrname] = (dbus_service_property
1173
 
                                      (alt_interface,
1174
 
                                       attribute._dbus_signature,
1175
 
                                       attribute._dbus_access,
1176
 
                                       attribute
1177
 
                                       ._dbus_get_args_options
1178
 
                                       ["byte_arrays"])
1179
 
                                      (types.FunctionType
1180
 
                                       (attribute.func_code,
1181
 
                                        attribute.func_globals,
1182
 
                                        attribute.func_name,
1183
 
                                        attribute.func_defaults,
1184
 
                                        attribute.func_closure)))
 
1195
                    attr[attrname] = (dbus_service_property(
 
1196
                        alt_interface, attribute._dbus_signature,
 
1197
                        attribute._dbus_access,
 
1198
                        attribute._dbus_get_args_options
 
1199
                        ["byte_arrays"])
 
1200
                                      (types.FunctionType(
 
1201
                                          attribute.func_code,
 
1202
                                          attribute.func_globals,
 
1203
                                          attribute.func_name,
 
1204
                                          attribute.func_defaults,
 
1205
                                          attribute.func_closure)))
1185
1206
                    # Copy annotations, if any
1186
1207
                    try:
1187
 
                        attr[attrname]._dbus_annotations = (
1188
 
                            dict(attribute._dbus_annotations))
 
1208
                        attr[attrname]._dbus_annotations = dict(
 
1209
                            attribute._dbus_annotations)
1189
1210
                    except AttributeError:
1190
1211
                        pass
1191
1212
                # Is this a D-Bus interface?
1194
1215
                    # object.  Decorate it to be a new D-Bus interface
1195
1216
                    # with the alternate D-Bus interface name.  Add it
1196
1217
                    # to the class.
1197
 
                    attr[attrname] = (dbus_interface_annotations
1198
 
                                      (alt_interface)
1199
 
                                      (types.FunctionType
1200
 
                                       (attribute.func_code,
1201
 
                                        attribute.func_globals,
1202
 
                                        attribute.func_name,
1203
 
                                        attribute.func_defaults,
1204
 
                                        attribute.func_closure)))
 
1218
                    attr[attrname] = (
 
1219
                        dbus_interface_annotations(alt_interface)
 
1220
                        (types.FunctionType(attribute.func_code,
 
1221
                                            attribute.func_globals,
 
1222
                                            attribute.func_name,
 
1223
                                            attribute.func_defaults,
 
1224
                                            attribute.func_closure)))
1205
1225
            if deprecate:
1206
1226
                # Deprecate all alternate interfaces
1207
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1227
                iname="_AlternateDBusNames_interface_annotation{}"
1208
1228
                for interface_name in interface_names:
 
1229
                    
1209
1230
                    @dbus_interface_annotations(interface_name)
1210
1231
                    def func(self):
1211
1232
                        return { "org.freedesktop.DBus.Deprecated":
1212
 
                                     "true" }
 
1233
                                 "true" }
1213
1234
                    # Find an unused name
1214
1235
                    for aname in (iname.format(i)
1215
1236
                                  for i in itertools.count()):
1219
1240
            if interface_names:
1220
1241
                # Replace the class with a new subclass of it with
1221
1242
                # methods, signals, etc. as created above.
1222
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1223
 
                           (cls,), attr)
 
1243
                cls = type(b"{}Alternate".format(cls.__name__),
 
1244
                           (cls, ), attr)
1224
1245
        return cls
 
1246
    
1225
1247
    return wrapper
1226
1248
 
1227
1249
 
1228
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1229
 
                                "se.bsnet.fukt.Mandos"})
 
1251
                            "se.bsnet.fukt.Mandos"})
1230
1252
class ClientDBus(Client, DBusObjectWithProperties):
1231
1253
    """A Client class using D-Bus
1232
1254
    
1236
1258
    """
1237
1259
    
1238
1260
    runtime_expansions = (Client.runtime_expansions
1239
 
                          + ("dbus_object_path",))
 
1261
                          + ("dbus_object_path", ))
 
1262
    
 
1263
    _interface = "se.recompile.Mandos.Client"
1240
1264
    
1241
1265
    # dbus.service.Object doesn't use super(), so we can't either.
1242
1266
    
1245
1269
        Client.__init__(self, *args, **kwargs)
1246
1270
        # Only now, when this client is initialized, can it show up on
1247
1271
        # the D-Bus
1248
 
        client_object_name = unicode(self.name).translate(
 
1272
        client_object_name = str(self.name).translate(
1249
1273
            {ord("."): ord("_"),
1250
1274
             ord("-"): ord("_")})
1251
 
        self.dbus_object_path = (dbus.ObjectPath
1252
 
                                 ("/clients/" + client_object_name))
 
1275
        self.dbus_object_path = dbus.ObjectPath(
 
1276
            "/clients/" + client_object_name)
1253
1277
        DBusObjectWithProperties.__init__(self, self.bus,
1254
1278
                                          self.dbus_object_path)
1255
1279
    
1256
 
    def notifychangeproperty(transform_func,
1257
 
                             dbus_name, type_func=lambda x: x,
1258
 
                             variant_level=1):
 
1280
    def notifychangeproperty(transform_func, dbus_name,
 
1281
                             type_func=lambda x: x,
 
1282
                             variant_level=1,
 
1283
                             invalidate_only=False,
 
1284
                             _interface=_interface):
1259
1285
        """ Modify a variable so that it's a property which announces
1260
1286
        its changes to DBus.
1261
1287
        
1266
1292
                   to the D-Bus.  Default: no transform
1267
1293
        variant_level: D-Bus variant level.  Default: 1
1268
1294
        """
1269
 
        attrname = "_{0}".format(dbus_name)
 
1295
        attrname = "_{}".format(dbus_name)
 
1296
        
1270
1297
        def setter(self, value):
1271
1298
            if hasattr(self, "dbus_object_path"):
1272
1299
                if (not hasattr(self, attrname) or
1273
1300
                    type_func(getattr(self, attrname, None))
1274
1301
                    != type_func(value)):
1275
 
                    dbus_value = transform_func(type_func(value),
1276
 
                                                variant_level
1277
 
                                                =variant_level)
1278
 
                    self.PropertyChanged(dbus.String(dbus_name),
1279
 
                                         dbus_value)
 
1302
                    if invalidate_only:
 
1303
                        self.PropertiesChanged(
 
1304
                            _interface, dbus.Dictionary(),
 
1305
                            dbus.Array((dbus_name, )))
 
1306
                    else:
 
1307
                        dbus_value = transform_func(
 
1308
                            type_func(value),
 
1309
                            variant_level = variant_level)
 
1310
                        self.PropertyChanged(dbus.String(dbus_name),
 
1311
                                             dbus_value)
 
1312
                        self.PropertiesChanged(
 
1313
                            _interface,
 
1314
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1315
                                              dbus_value }),
 
1316
                            dbus.Array())
1280
1317
            setattr(self, attrname, value)
1281
1318
        
1282
1319
        return property(lambda self: getattr(self, attrname), setter)
1288
1325
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1289
1326
    last_enabled = notifychangeproperty(datetime_to_dbus,
1290
1327
                                        "LastEnabled")
1291
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1292
 
                                   type_func = lambda checker:
1293
 
                                       checker is not None)
 
1328
    checker = notifychangeproperty(
 
1329
        dbus.Boolean, "CheckerRunning",
 
1330
        type_func = lambda checker: checker is not None)
1294
1331
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1295
1332
                                           "LastCheckedOK")
1296
1333
    last_checker_status = notifychangeproperty(dbus.Int16,
1299
1336
        datetime_to_dbus, "LastApprovalRequest")
1300
1337
    approved_by_default = notifychangeproperty(dbus.Boolean,
1301
1338
                                               "ApprovedByDefault")
1302
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1303
 
                                          "ApprovalDelay",
1304
 
                                          type_func =
1305
 
                                          timedelta_to_milliseconds)
 
1339
    approval_delay = notifychangeproperty(
 
1340
        dbus.UInt64, "ApprovalDelay",
 
1341
        type_func = lambda td: td.total_seconds() * 1000)
1306
1342
    approval_duration = notifychangeproperty(
1307
1343
        dbus.UInt64, "ApprovalDuration",
1308
 
        type_func = timedelta_to_milliseconds)
 
1344
        type_func = lambda td: td.total_seconds() * 1000)
1309
1345
    host = notifychangeproperty(dbus.String, "Host")
1310
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1311
 
                                   type_func =
1312
 
                                   timedelta_to_milliseconds)
 
1346
    timeout = notifychangeproperty(
 
1347
        dbus.UInt64, "Timeout",
 
1348
        type_func = lambda td: td.total_seconds() * 1000)
1313
1349
    extended_timeout = notifychangeproperty(
1314
1350
        dbus.UInt64, "ExtendedTimeout",
1315
 
        type_func = timedelta_to_milliseconds)
1316
 
    interval = notifychangeproperty(dbus.UInt64,
1317
 
                                    "Interval",
1318
 
                                    type_func =
1319
 
                                    timedelta_to_milliseconds)
 
1351
        type_func = lambda td: td.total_seconds() * 1000)
 
1352
    interval = notifychangeproperty(
 
1353
        dbus.UInt64, "Interval",
 
1354
        type_func = lambda td: td.total_seconds() * 1000)
1320
1355
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1356
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1357
                                  invalidate_only=True)
1321
1358
    
1322
1359
    del notifychangeproperty
1323
1360
    
1330
1367
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1331
1368
        Client.__del__(self, *args, **kwargs)
1332
1369
    
1333
 
    def checker_callback(self, pid, condition, command,
1334
 
                         *args, **kwargs):
1335
 
        self.checker_callback_tag = None
1336
 
        self.checker = None
1337
 
        if os.WIFEXITED(condition):
1338
 
            exitstatus = os.WEXITSTATUS(condition)
 
1370
    def checker_callback(self, source, condition,
 
1371
                         connection, command, *args, **kwargs):
 
1372
        ret = Client.checker_callback(self, source, condition,
 
1373
                                      connection, command, *args,
 
1374
                                      **kwargs)
 
1375
        exitstatus = self.last_checker_status
 
1376
        if exitstatus >= 0:
1339
1377
            # Emit D-Bus signal
1340
1378
            self.CheckerCompleted(dbus.Int16(exitstatus),
1341
 
                                  dbus.Int64(condition),
 
1379
                                  dbus.Int64(0),
1342
1380
                                  dbus.String(command))
1343
1381
        else:
1344
1382
            # Emit D-Bus signal
1345
1383
            self.CheckerCompleted(dbus.Int16(-1),
1346
 
                                  dbus.Int64(condition),
 
1384
                                  dbus.Int64(
 
1385
                                      self.last_checker_signal),
1347
1386
                                  dbus.String(command))
1348
 
        
1349
 
        return Client.checker_callback(self, pid, condition, command,
1350
 
                                       *args, **kwargs)
 
1387
        return ret
1351
1388
    
1352
1389
    def start_checker(self, *args, **kwargs):
1353
 
        old_checker = self.checker
1354
 
        if self.checker is not None:
1355
 
            old_checker_pid = self.checker.pid
1356
 
        else:
1357
 
            old_checker_pid = None
 
1390
        old_checker_pid = getattr(self.checker, "pid", None)
1358
1391
        r = Client.start_checker(self, *args, **kwargs)
1359
1392
        # Only if new checker process was started
1360
1393
        if (self.checker is not None
1369
1402
    
1370
1403
    def approve(self, value=True):
1371
1404
        self.approved = value
1372
 
        gobject.timeout_add(timedelta_to_milliseconds
1373
 
                            (self.approval_duration),
1374
 
                            self._reset_approved)
 
1405
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1406
                                * 1000), self._reset_approved)
1375
1407
        self.send_changedstate()
1376
1408
    
1377
1409
    ## D-Bus methods, signals & properties
1378
 
    _interface = "se.recompile.Mandos.Client"
1379
1410
    
1380
1411
    ## Interfaces
1381
1412
    
1382
 
    @dbus_interface_annotations(_interface)
1383
 
    def _foo(self):
1384
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1385
 
                     "false"}
1386
 
    
1387
1413
    ## Signals
1388
1414
    
1389
1415
    # CheckerCompleted - signal
1399
1425
        pass
1400
1426
    
1401
1427
    # PropertyChanged - signal
 
1428
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1402
1429
    @dbus.service.signal(_interface, signature="sv")
1403
1430
    def PropertyChanged(self, property, value):
1404
1431
        "D-Bus signal"
1468
1495
        return dbus.Boolean(bool(self.approvals_pending))
1469
1496
    
1470
1497
    # ApprovedByDefault - property
1471
 
    @dbus_service_property(_interface, signature="b",
 
1498
    @dbus_service_property(_interface,
 
1499
                           signature="b",
1472
1500
                           access="readwrite")
1473
1501
    def ApprovedByDefault_dbus_property(self, value=None):
1474
1502
        if value is None:       # get
1476
1504
        self.approved_by_default = bool(value)
1477
1505
    
1478
1506
    # ApprovalDelay - property
1479
 
    @dbus_service_property(_interface, signature="t",
 
1507
    @dbus_service_property(_interface,
 
1508
                           signature="t",
1480
1509
                           access="readwrite")
1481
1510
    def ApprovalDelay_dbus_property(self, value=None):
1482
1511
        if value is None:       # get
1483
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1512
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1513
                               * 1000)
1484
1514
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1485
1515
    
1486
1516
    # ApprovalDuration - property
1487
 
    @dbus_service_property(_interface, signature="t",
 
1517
    @dbus_service_property(_interface,
 
1518
                           signature="t",
1488
1519
                           access="readwrite")
1489
1520
    def ApprovalDuration_dbus_property(self, value=None):
1490
1521
        if value is None:       # get
1491
 
            return dbus.UInt64(timedelta_to_milliseconds(
1492
 
                    self.approval_duration))
 
1522
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1523
                               * 1000)
1493
1524
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1494
1525
    
1495
1526
    # Name - property
1503
1534
        return dbus.String(self.fingerprint)
1504
1535
    
1505
1536
    # Host - property
1506
 
    @dbus_service_property(_interface, signature="s",
 
1537
    @dbus_service_property(_interface,
 
1538
                           signature="s",
1507
1539
                           access="readwrite")
1508
1540
    def Host_dbus_property(self, value=None):
1509
1541
        if value is None:       # get
1510
1542
            return dbus.String(self.host)
1511
 
        self.host = unicode(value)
 
1543
        self.host = str(value)
1512
1544
    
1513
1545
    # Created - property
1514
1546
    @dbus_service_property(_interface, signature="s", access="read")
1521
1553
        return datetime_to_dbus(self.last_enabled)
1522
1554
    
1523
1555
    # Enabled - property
1524
 
    @dbus_service_property(_interface, signature="b",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="b",
1525
1558
                           access="readwrite")
1526
1559
    def Enabled_dbus_property(self, value=None):
1527
1560
        if value is None:       # get
1532
1565
            self.disable()
1533
1566
    
1534
1567
    # LastCheckedOK - property
1535
 
    @dbus_service_property(_interface, signature="s",
 
1568
    @dbus_service_property(_interface,
 
1569
                           signature="s",
1536
1570
                           access="readwrite")
1537
1571
    def LastCheckedOK_dbus_property(self, value=None):
1538
1572
        if value is not None:
1541
1575
        return datetime_to_dbus(self.last_checked_ok)
1542
1576
    
1543
1577
    # LastCheckerStatus - property
1544
 
    @dbus_service_property(_interface, signature="n",
1545
 
                           access="read")
 
1578
    @dbus_service_property(_interface, signature="n", access="read")
1546
1579
    def LastCheckerStatus_dbus_property(self):
1547
1580
        return dbus.Int16(self.last_checker_status)
1548
1581
    
1557
1590
        return datetime_to_dbus(self.last_approval_request)
1558
1591
    
1559
1592
    # Timeout - property
1560
 
    @dbus_service_property(_interface, signature="t",
 
1593
    @dbus_service_property(_interface,
 
1594
                           signature="t",
1561
1595
                           access="readwrite")
1562
1596
    def Timeout_dbus_property(self, value=None):
1563
1597
        if value is None:       # get
1564
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1598
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1565
1599
        old_timeout = self.timeout
1566
1600
        self.timeout = datetime.timedelta(0, 0, 0, value)
1567
1601
        # Reschedule disabling
1576
1610
                    is None):
1577
1611
                    return
1578
1612
                gobject.source_remove(self.disable_initiator_tag)
1579
 
                self.disable_initiator_tag = (
1580
 
                    gobject.timeout_add(
1581
 
                        timedelta_to_milliseconds(self.expires - now),
1582
 
                        self.disable))
 
1613
                self.disable_initiator_tag = gobject.timeout_add(
 
1614
                    int((self.expires - now).total_seconds() * 1000),
 
1615
                    self.disable)
1583
1616
    
1584
1617
    # ExtendedTimeout - property
1585
 
    @dbus_service_property(_interface, signature="t",
 
1618
    @dbus_service_property(_interface,
 
1619
                           signature="t",
1586
1620
                           access="readwrite")
1587
1621
    def ExtendedTimeout_dbus_property(self, value=None):
1588
1622
        if value is None:       # get
1589
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1623
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1624
                               * 1000)
1590
1625
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1591
1626
    
1592
1627
    # Interval - property
1593
 
    @dbus_service_property(_interface, signature="t",
 
1628
    @dbus_service_property(_interface,
 
1629
                           signature="t",
1594
1630
                           access="readwrite")
1595
1631
    def Interval_dbus_property(self, value=None):
1596
1632
        if value is None:       # get
1597
 
            return dbus.UInt64(self.interval_milliseconds())
 
1633
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1598
1634
        self.interval = datetime.timedelta(0, 0, 0, value)
1599
1635
        if getattr(self, "checker_initiator_tag", None) is None:
1600
1636
            return
1601
1637
        if self.enabled:
1602
1638
            # Reschedule checker run
1603
1639
            gobject.source_remove(self.checker_initiator_tag)
1604
 
            self.checker_initiator_tag = (gobject.timeout_add
1605
 
                                          (value, self.start_checker))
1606
 
            self.start_checker()    # Start one now, too
 
1640
            self.checker_initiator_tag = gobject.timeout_add(
 
1641
                value, self.start_checker)
 
1642
            self.start_checker() # Start one now, too
1607
1643
    
1608
1644
    # Checker - property
1609
 
    @dbus_service_property(_interface, signature="s",
 
1645
    @dbus_service_property(_interface,
 
1646
                           signature="s",
1610
1647
                           access="readwrite")
1611
1648
    def Checker_dbus_property(self, value=None):
1612
1649
        if value is None:       # get
1613
1650
            return dbus.String(self.checker_command)
1614
 
        self.checker_command = unicode(value)
 
1651
        self.checker_command = str(value)
1615
1652
    
1616
1653
    # CheckerRunning - property
1617
 
    @dbus_service_property(_interface, signature="b",
 
1654
    @dbus_service_property(_interface,
 
1655
                           signature="b",
1618
1656
                           access="readwrite")
1619
1657
    def CheckerRunning_dbus_property(self, value=None):
1620
1658
        if value is None:       # get
1630
1668
        return self.dbus_object_path # is already a dbus.ObjectPath
1631
1669
    
1632
1670
    # Secret = property
1633
 
    @dbus_service_property(_interface, signature="ay",
1634
 
                           access="write", byte_arrays=True)
 
1671
    @dbus_service_property(_interface,
 
1672
                           signature="ay",
 
1673
                           access="write",
 
1674
                           byte_arrays=True)
1635
1675
    def Secret_dbus_property(self, value):
1636
 
        self.secret = str(value)
 
1676
        self.secret = bytes(value)
1637
1677
    
1638
1678
    del _interface
1639
1679
 
1643
1683
        self._pipe = child_pipe
1644
1684
        self._pipe.send(('init', fpr, address))
1645
1685
        if not self._pipe.recv():
1646
 
            raise KeyError()
 
1686
            raise KeyError(fpr)
1647
1687
    
1648
1688
    def __getattribute__(self, name):
1649
1689
        if name == '_pipe':
1653
1693
        if data[0] == 'data':
1654
1694
            return data[1]
1655
1695
        if data[0] == 'function':
 
1696
            
1656
1697
            def func(*args, **kwargs):
1657
1698
                self._pipe.send(('funcall', name, args, kwargs))
1658
1699
                return self._pipe.recv()[1]
 
1700
            
1659
1701
            return func
1660
1702
    
1661
1703
    def __setattr__(self, name, value):
1673
1715
    def handle(self):
1674
1716
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1675
1717
            logger.info("TCP connection from: %s",
1676
 
                        unicode(self.client_address))
 
1718
                        str(self.client_address))
1677
1719
            logger.debug("Pipe FD: %d",
1678
1720
                         self.server.child_pipe.fileno())
1679
1721
            
1680
 
            session = (gnutls.connection
1681
 
                       .ClientSession(self.request,
1682
 
                                      gnutls.connection
1683
 
                                      .X509Credentials()))
 
1722
            session = gnutls.connection.ClientSession(
 
1723
                self.request, gnutls.connection .X509Credentials())
1684
1724
            
1685
1725
            # Note: gnutls.connection.X509Credentials is really a
1686
1726
            # generic GnuTLS certificate credentials object so long as
1695
1735
            priority = self.server.gnutls_priority
1696
1736
            if priority is None:
1697
1737
                priority = "NORMAL"
1698
 
            (gnutls.library.functions
1699
 
             .gnutls_priority_set_direct(session._c_object,
1700
 
                                         priority, None))
 
1738
            gnutls.library.functions.gnutls_priority_set_direct(
 
1739
                session._c_object, priority, None)
1701
1740
            
1702
1741
            # Start communication using the Mandos protocol
1703
1742
            # Get protocol number
1723
1762
            approval_required = False
1724
1763
            try:
1725
1764
                try:
1726
 
                    fpr = self.fingerprint(self.peer_certificate
1727
 
                                           (session))
 
1765
                    fpr = self.fingerprint(
 
1766
                        self.peer_certificate(session))
1728
1767
                except (TypeError,
1729
1768
                        gnutls.errors.GNUTLSError) as error:
1730
1769
                    logger.warning("Bad certificate: %s", error)
1745
1784
                while True:
1746
1785
                    if not client.enabled:
1747
1786
                        logger.info("Client %s is disabled",
1748
 
                                       client.name)
 
1787
                                    client.name)
1749
1788
                        if self.server.use_dbus:
1750
1789
                            # Emit D-Bus signal
1751
1790
                            client.Rejected("Disabled")
1760
1799
                        if self.server.use_dbus:
1761
1800
                            # Emit D-Bus signal
1762
1801
                            client.NeedApproval(
1763
 
                                client.approval_delay_milliseconds(),
1764
 
                                client.approved_by_default)
 
1802
                                client.approval_delay.total_seconds()
 
1803
                                * 1000, client.approved_by_default)
1765
1804
                    else:
1766
1805
                        logger.warning("Client %s was not approved",
1767
1806
                                       client.name)
1773
1812
                    #wait until timeout or approved
1774
1813
                    time = datetime.datetime.now()
1775
1814
                    client.changedstate.acquire()
1776
 
                    client.changedstate.wait(
1777
 
                        float(timedelta_to_milliseconds(delay)
1778
 
                              / 1000))
 
1815
                    client.changedstate.wait(delay.total_seconds())
1779
1816
                    client.changedstate.release()
1780
1817
                    time2 = datetime.datetime.now()
1781
1818
                    if (time2 - time) >= delay:
1800
1837
                        logger.warning("gnutls send failed",
1801
1838
                                       exc_info=error)
1802
1839
                        return
1803
 
                    logger.debug("Sent: %d, remaining: %d",
1804
 
                                 sent, len(client.secret)
1805
 
                                 - (sent_size + sent))
 
1840
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1841
                                 len(client.secret) - (sent_size
 
1842
                                                       + sent))
1806
1843
                    sent_size += sent
1807
1844
                
1808
1845
                logger.info("Sending secret to %s", client.name)
1825
1862
    def peer_certificate(session):
1826
1863
        "Return the peer's OpenPGP certificate as a bytestring"
1827
1864
        # If not an OpenPGP certificate...
1828
 
        if (gnutls.library.functions
1829
 
            .gnutls_certificate_type_get(session._c_object)
 
1865
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1866
                session._c_object)
1830
1867
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1831
1868
            # ...do the normal thing
1832
1869
            return session.peer_certificate
1846
1883
    def fingerprint(openpgp):
1847
1884
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1848
1885
        # New GnuTLS "datum" with the OpenPGP public key
1849
 
        datum = (gnutls.library.types
1850
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1851
 
                                             ctypes.POINTER
1852
 
                                             (ctypes.c_ubyte)),
1853
 
                                 ctypes.c_uint(len(openpgp))))
 
1886
        datum = gnutls.library.types.gnutls_datum_t(
 
1887
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1888
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1889
            ctypes.c_uint(len(openpgp)))
1854
1890
        # New empty GnuTLS certificate
1855
1891
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1856
 
        (gnutls.library.functions
1857
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1892
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1893
            ctypes.byref(crt))
1858
1894
        # Import the OpenPGP public key into the certificate
1859
 
        (gnutls.library.functions
1860
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1861
 
                                    gnutls.library.constants
1862
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1895
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1896
            crt, ctypes.byref(datum),
 
1897
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1863
1898
        # Verify the self signature in the key
1864
1899
        crtverify = ctypes.c_uint()
1865
 
        (gnutls.library.functions
1866
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1867
 
                                         ctypes.byref(crtverify)))
 
1900
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1901
            crt, 0, ctypes.byref(crtverify))
1868
1902
        if crtverify.value != 0:
1869
1903
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1870
 
            raise (gnutls.errors.CertificateSecurityError
1871
 
                   ("Verify failed"))
 
1904
            raise gnutls.errors.CertificateSecurityError(
 
1905
                "Verify failed")
1872
1906
        # New buffer for the fingerprint
1873
1907
        buf = ctypes.create_string_buffer(20)
1874
1908
        buf_len = ctypes.c_size_t()
1875
1909
        # Get the fingerprint from the certificate into the buffer
1876
 
        (gnutls.library.functions
1877
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1878
 
                                             ctypes.byref(buf_len)))
 
1910
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1911
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1879
1912
        # Deinit the certificate
1880
1913
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1881
1914
        # Convert the buffer to a Python bytestring
1887
1920
 
1888
1921
class MultiprocessingMixIn(object):
1889
1922
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1923
    
1890
1924
    def sub_process_main(self, request, address):
1891
1925
        try:
1892
1926
            self.finish_request(request, address)
1904
1938
 
1905
1939
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1906
1940
    """ adds a pipe to the MixIn """
 
1941
    
1907
1942
    def process_request(self, request, client_address):
1908
1943
        """Overrides and wraps the original process_request().
1909
1944
        
1930
1965
        interface:      None or a network interface name (string)
1931
1966
        use_ipv6:       Boolean; to use IPv6 or not
1932
1967
    """
 
1968
    
1933
1969
    def __init__(self, server_address, RequestHandlerClass,
1934
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1970
                 interface=None,
 
1971
                 use_ipv6=True,
 
1972
                 socketfd=None):
1935
1973
        """If socketfd is set, use that file descriptor instead of
1936
1974
        creating a new one with socket.socket().
1937
1975
        """
1978
2016
                             self.interface)
1979
2017
            else:
1980
2018
                try:
1981
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1982
 
                                           SO_BINDTODEVICE,
1983
 
                                           str(self.interface + '\0'))
 
2019
                    self.socket.setsockopt(
 
2020
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2021
                        (self.interface + "\0").encode("utf-8"))
1984
2022
                except socket.error as error:
1985
2023
                    if error.errno == errno.EPERM:
1986
2024
                        logger.error("No permission to bind to"
2004
2042
                self.server_address = (any_address,
2005
2043
                                       self.server_address[1])
2006
2044
            elif not self.server_address[1]:
2007
 
                self.server_address = (self.server_address[0],
2008
 
                                       0)
 
2045
                self.server_address = (self.server_address[0], 0)
2009
2046
#                 if self.interface:
2010
2047
#                     self.server_address = (self.server_address[0],
2011
2048
#                                            0, # port
2025
2062
    
2026
2063
    Assumes a gobject.MainLoop event loop.
2027
2064
    """
 
2065
    
2028
2066
    def __init__(self, server_address, RequestHandlerClass,
2029
 
                 interface=None, use_ipv6=True, clients=None,
2030
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2067
                 interface=None,
 
2068
                 use_ipv6=True,
 
2069
                 clients=None,
 
2070
                 gnutls_priority=None,
 
2071
                 use_dbus=True,
 
2072
                 socketfd=None):
2031
2073
        self.enabled = False
2032
2074
        self.clients = clients
2033
2075
        if self.clients is None:
2039
2081
                                interface = interface,
2040
2082
                                use_ipv6 = use_ipv6,
2041
2083
                                socketfd = socketfd)
 
2084
    
2042
2085
    def server_activate(self):
2043
2086
        if self.enabled:
2044
2087
            return socketserver.TCPServer.server_activate(self)
2048
2091
    
2049
2092
    def add_pipe(self, parent_pipe, proc):
2050
2093
        # Call "handle_ipc" for both data and EOF events
2051
 
        gobject.io_add_watch(parent_pipe.fileno(),
2052
 
                             gobject.IO_IN | gobject.IO_HUP,
2053
 
                             functools.partial(self.handle_ipc,
2054
 
                                               parent_pipe =
2055
 
                                               parent_pipe,
2056
 
                                               proc = proc))
 
2094
        gobject.io_add_watch(
 
2095
            parent_pipe.fileno(),
 
2096
            gobject.IO_IN | gobject.IO_HUP,
 
2097
            functools.partial(self.handle_ipc,
 
2098
                              parent_pipe = parent_pipe,
 
2099
                              proc = proc))
2057
2100
    
2058
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2059
 
                   proc = None, client_object=None):
 
2101
    def handle_ipc(self, source, condition,
 
2102
                   parent_pipe=None,
 
2103
                   proc = None,
 
2104
                   client_object=None):
2060
2105
        # error, or the other end of multiprocessing.Pipe has closed
2061
2106
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2062
2107
            # Wait for other process to exit
2085
2130
                parent_pipe.send(False)
2086
2131
                return False
2087
2132
            
2088
 
            gobject.io_add_watch(parent_pipe.fileno(),
2089
 
                                 gobject.IO_IN | gobject.IO_HUP,
2090
 
                                 functools.partial(self.handle_ipc,
2091
 
                                                   parent_pipe =
2092
 
                                                   parent_pipe,
2093
 
                                                   proc = proc,
2094
 
                                                   client_object =
2095
 
                                                   client))
 
2133
            gobject.io_add_watch(
 
2134
                parent_pipe.fileno(),
 
2135
                gobject.IO_IN | gobject.IO_HUP,
 
2136
                functools.partial(self.handle_ipc,
 
2137
                                  parent_pipe = parent_pipe,
 
2138
                                  proc = proc,
 
2139
                                  client_object = client))
2096
2140
            parent_pipe.send(True)
2097
2141
            # remove the old hook in favor of the new above hook on
2098
2142
            # same fileno
2104
2148
            
2105
2149
            parent_pipe.send(('data', getattr(client_object,
2106
2150
                                              funcname)(*args,
2107
 
                                                         **kwargs)))
 
2151
                                                        **kwargs)))
2108
2152
        
2109
2153
        if command == 'getattr':
2110
2154
            attrname = request[1]
2111
 
            if callable(client_object.__getattribute__(attrname)):
2112
 
                parent_pipe.send(('function',))
 
2155
            if isinstance(client_object.__getattribute__(attrname),
 
2156
                          collections.Callable):
 
2157
                parent_pipe.send(('function', ))
2113
2158
            else:
2114
 
                parent_pipe.send(('data', client_object
2115
 
                                  .__getattribute__(attrname)))
 
2159
                parent_pipe.send((
 
2160
                    'data', client_object.__getattribute__(attrname)))
2116
2161
        
2117
2162
        if command == 'setattr':
2118
2163
            attrname = request[1]
2149
2194
    # avoid excessive use of external libraries.
2150
2195
    
2151
2196
    # New type for defining tokens, syntax, and semantics all-in-one
2152
 
    Token = collections.namedtuple("Token",
2153
 
                                   ("regexp", # To match token; if
2154
 
                                              # "value" is not None,
2155
 
                                              # must have a "group"
2156
 
                                              # containing digits
2157
 
                                    "value",  # datetime.timedelta or
2158
 
                                              # None
2159
 
                                    "followers")) # Tokens valid after
2160
 
                                                  # this token
 
2197
    Token = collections.namedtuple("Token", (
 
2198
        "regexp",  # To match token; if "value" is not None, must have
 
2199
                   # a "group" containing digits
 
2200
        "value",   # datetime.timedelta or None
 
2201
        "followers"))           # Tokens valid after this token
2161
2202
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2162
2203
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2163
2204
    token_end = Token(re.compile(r"$"), None, frozenset())
2164
2205
    token_second = Token(re.compile(r"(\d+)S"),
2165
2206
                         datetime.timedelta(seconds=1),
2166
 
                         frozenset((token_end,)))
 
2207
                         frozenset((token_end, )))
2167
2208
    token_minute = Token(re.compile(r"(\d+)M"),
2168
2209
                         datetime.timedelta(minutes=1),
2169
2210
                         frozenset((token_second, token_end)))
2185
2226
                       frozenset((token_month, token_end)))
2186
2227
    token_week = Token(re.compile(r"(\d+)W"),
2187
2228
                       datetime.timedelta(weeks=1),
2188
 
                       frozenset((token_end,)))
 
2229
                       frozenset((token_end, )))
2189
2230
    token_duration = Token(re.compile(r"P"), None,
2190
2231
                           frozenset((token_year, token_month,
2191
2232
                                      token_day, token_time,
2192
 
                                      token_week))),
 
2233
                                      token_week)))
2193
2234
    # Define starting values
2194
2235
    value = datetime.timedelta() # Value so far
2195
2236
    found_token = None
2196
 
    followers = frozenset(token_duration,) # Following valid tokens
 
2237
    followers = frozenset((token_duration, )) # Following valid tokens
2197
2238
    s = duration                # String left to parse
2198
2239
    # Loop until end token is found
2199
2240
    while found_token is not token_end:
2216
2257
                break
2217
2258
        else:
2218
2259
            # No currently valid tokens were found
2219
 
            raise ValueError("Invalid RFC 3339 duration")
 
2260
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2261
                             .format(duration))
2220
2262
    # End token found
2221
2263
    return value
2222
2264
 
2246
2288
    timevalue = datetime.timedelta(0)
2247
2289
    for s in interval.split():
2248
2290
        try:
2249
 
            suffix = unicode(s[-1])
 
2291
            suffix = s[-1]
2250
2292
            value = int(s[:-1])
2251
2293
            if suffix == "d":
2252
2294
                delta = datetime.timedelta(value)
2259
2301
            elif suffix == "w":
2260
2302
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2261
2303
            else:
2262
 
                raise ValueError("Unknown suffix {0!r}"
2263
 
                                 .format(suffix))
 
2304
                raise ValueError("Unknown suffix {!r}".format(suffix))
2264
2305
        except IndexError as e:
2265
2306
            raise ValueError(*(e.args))
2266
2307
        timevalue += delta
2283
2324
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2284
2325
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2285
2326
            raise OSError(errno.ENODEV,
2286
 
                          "{0} not a character device"
 
2327
                          "{} not a character device"
2287
2328
                          .format(os.devnull))
2288
2329
        os.dup2(null, sys.stdin.fileno())
2289
2330
        os.dup2(null, sys.stdout.fileno())
2299
2340
    
2300
2341
    parser = argparse.ArgumentParser()
2301
2342
    parser.add_argument("-v", "--version", action="version",
2302
 
                        version = "%(prog)s {0}".format(version),
 
2343
                        version = "%(prog)s {}".format(version),
2303
2344
                        help="show version number and exit")
2304
2345
    parser.add_argument("-i", "--interface", metavar="IF",
2305
2346
                        help="Bind to interface IF")
2338
2379
                        help="Directory to save/restore state in")
2339
2380
    parser.add_argument("--foreground", action="store_true",
2340
2381
                        help="Run in foreground", default=None)
 
2382
    parser.add_argument("--no-zeroconf", action="store_false",
 
2383
                        dest="zeroconf", help="Do not use Zeroconf",
 
2384
                        default=None)
2341
2385
    
2342
2386
    options = parser.parse_args()
2343
2387
    
2344
2388
    if options.check:
2345
2389
        import doctest
2346
 
        doctest.testmod()
2347
 
        sys.exit()
 
2390
        fail_count, test_count = doctest.testmod()
 
2391
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2348
2392
    
2349
2393
    # Default values for config file for server-global settings
2350
2394
    server_defaults = { "interface": "",
2352
2396
                        "port": "",
2353
2397
                        "debug": "False",
2354
2398
                        "priority":
2355
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2399
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2400
                        ":+SIGN-DSA-SHA256",
2356
2401
                        "servicename": "Mandos",
2357
2402
                        "use_dbus": "True",
2358
2403
                        "use_ipv6": "True",
2361
2406
                        "socket": "",
2362
2407
                        "statedir": "/var/lib/mandos",
2363
2408
                        "foreground": "False",
2364
 
                        }
 
2409
                        "zeroconf": "True",
 
2410
                    }
2365
2411
    
2366
2412
    # Parse config file for server-global settings
2367
2413
    server_config = configparser.SafeConfigParser(server_defaults)
2368
2414
    del server_defaults
2369
 
    server_config.read(os.path.join(options.configdir,
2370
 
                                    "mandos.conf"))
 
2415
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2371
2416
    # Convert the SafeConfigParser object to a dict
2372
2417
    server_settings = server_config.defaults()
2373
2418
    # Use the appropriate methods on the non-string config options
2391
2436
    # Override the settings from the config file with command line
2392
2437
    # options, if set.
2393
2438
    for option in ("interface", "address", "port", "debug",
2394
 
                   "priority", "servicename", "configdir",
2395
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2396
 
                   "statedir", "socket", "foreground"):
 
2439
                   "priority", "servicename", "configdir", "use_dbus",
 
2440
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2441
                   "socket", "foreground", "zeroconf"):
2397
2442
        value = getattr(options, option)
2398
2443
        if value is not None:
2399
2444
            server_settings[option] = value
2400
2445
    del options
2401
2446
    # Force all strings to be unicode
2402
2447
    for option in server_settings.keys():
2403
 
        if type(server_settings[option]) is str:
2404
 
            server_settings[option] = unicode(server_settings[option])
 
2448
        if isinstance(server_settings[option], bytes):
 
2449
            server_settings[option] = (server_settings[option]
 
2450
                                       .decode("utf-8"))
2405
2451
    # Force all boolean options to be boolean
2406
2452
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
 
                   "foreground"):
 
2453
                   "foreground", "zeroconf"):
2408
2454
        server_settings[option] = bool(server_settings[option])
2409
2455
    # Debug implies foreground
2410
2456
    if server_settings["debug"]:
2413
2459
    
2414
2460
    ##################################################################
2415
2461
    
 
2462
    if (not server_settings["zeroconf"]
 
2463
        and not (server_settings["port"]
 
2464
                 or server_settings["socket"] != "")):
 
2465
        parser.error("Needs port or socket to work without Zeroconf")
 
2466
    
2416
2467
    # For convenience
2417
2468
    debug = server_settings["debug"]
2418
2469
    debuglevel = server_settings["debuglevel"]
2421
2472
    stored_state_path = os.path.join(server_settings["statedir"],
2422
2473
                                     stored_state_file)
2423
2474
    foreground = server_settings["foreground"]
 
2475
    zeroconf = server_settings["zeroconf"]
2424
2476
    
2425
2477
    if debug:
2426
2478
        initlogger(debug, logging.DEBUG)
2432
2484
            initlogger(debug, level)
2433
2485
    
2434
2486
    if server_settings["servicename"] != "Mandos":
2435
 
        syslogger.setFormatter(logging.Formatter
2436
 
                               ('Mandos ({0}) [%(process)d]:'
2437
 
                                ' %(levelname)s: %(message)s'
2438
 
                                .format(server_settings
2439
 
                                        ["servicename"])))
 
2487
        syslogger.setFormatter(
 
2488
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2489
                              ' %(levelname)s: %(message)s'.format(
 
2490
                                  server_settings["servicename"])))
2440
2491
    
2441
2492
    # Parse config file with clients
2442
2493
    client_config = configparser.SafeConfigParser(Client
2447
2498
    global mandos_dbus_service
2448
2499
    mandos_dbus_service = None
2449
2500
    
2450
 
    tcp_server = MandosServer((server_settings["address"],
2451
 
                               server_settings["port"]),
2452
 
                              ClientHandler,
2453
 
                              interface=(server_settings["interface"]
2454
 
                                         or None),
2455
 
                              use_ipv6=use_ipv6,
2456
 
                              gnutls_priority=
2457
 
                              server_settings["priority"],
2458
 
                              use_dbus=use_dbus,
2459
 
                              socketfd=(server_settings["socket"]
2460
 
                                        or None))
 
2501
    socketfd = None
 
2502
    if server_settings["socket"] != "":
 
2503
        socketfd = server_settings["socket"]
 
2504
    tcp_server = MandosServer(
 
2505
        (server_settings["address"], server_settings["port"]),
 
2506
        ClientHandler,
 
2507
        interface=(server_settings["interface"] or None),
 
2508
        use_ipv6=use_ipv6,
 
2509
        gnutls_priority=server_settings["priority"],
 
2510
        use_dbus=use_dbus,
 
2511
        socketfd=socketfd)
2461
2512
    if not foreground:
2462
2513
        pidfilename = "/run/mandos.pid"
2463
2514
        if not os.path.isdir("/run/."):
2464
2515
            pidfilename = "/var/run/mandos.pid"
2465
2516
        pidfile = None
2466
2517
        try:
2467
 
            pidfile = open(pidfilename, "w")
 
2518
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2468
2519
        except IOError as e:
2469
2520
            logger.error("Could not open file %r", pidfilename,
2470
2521
                         exc_info=e)
2497
2548
        def debug_gnutls(level, string):
2498
2549
            logger.debug("GnuTLS: %s", string[:-1])
2499
2550
        
2500
 
        (gnutls.library.functions
2501
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2551
        gnutls.library.functions.gnutls_global_set_log_function(
 
2552
            debug_gnutls)
2502
2553
        
2503
2554
        # Redirect stdin so all checkers get /dev/null
2504
2555
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2524
2575
    if use_dbus:
2525
2576
        try:
2526
2577
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2527
 
                                            bus, do_not_queue=True)
2528
 
            old_bus_name = (dbus.service.BusName
2529
 
                            ("se.bsnet.fukt.Mandos", bus,
2530
 
                             do_not_queue=True))
2531
 
        except dbus.exceptions.NameExistsException as e:
 
2578
                                            bus,
 
2579
                                            do_not_queue=True)
 
2580
            old_bus_name = dbus.service.BusName(
 
2581
                "se.bsnet.fukt.Mandos", bus,
 
2582
                do_not_queue=True)
 
2583
        except dbus.exceptions.DBusException as e:
2532
2584
            logger.error("Disabling D-Bus:", exc_info=e)
2533
2585
            use_dbus = False
2534
2586
            server_settings["use_dbus"] = False
2535
2587
            tcp_server.use_dbus = False
2536
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2537
 
    service = AvahiServiceToSyslog(name =
2538
 
                                   server_settings["servicename"],
2539
 
                                   servicetype = "_mandos._tcp",
2540
 
                                   protocol = protocol, bus = bus)
2541
 
    if server_settings["interface"]:
2542
 
        service.interface = (if_nametoindex
2543
 
                             (str(server_settings["interface"])))
 
2588
    if zeroconf:
 
2589
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2590
        service = AvahiServiceToSyslog(
 
2591
            name = server_settings["servicename"],
 
2592
            servicetype = "_mandos._tcp",
 
2593
            protocol = protocol,
 
2594
            bus = bus)
 
2595
        if server_settings["interface"]:
 
2596
            service.interface = if_nametoindex(
 
2597
                server_settings["interface"].encode("utf-8"))
2544
2598
    
2545
2599
    global multiprocessing_manager
2546
2600
    multiprocessing_manager = multiprocessing.Manager()
2565
2619
    if server_settings["restore"]:
2566
2620
        try:
2567
2621
            with open(stored_state_path, "rb") as stored_state:
2568
 
                clients_data, old_client_settings = (pickle.load
2569
 
                                                     (stored_state))
 
2622
                clients_data, old_client_settings = pickle.load(
 
2623
                    stored_state)
2570
2624
            os.remove(stored_state_path)
2571
2625
        except IOError as e:
2572
2626
            if e.errno == errno.ENOENT:
2573
 
                logger.warning("Could not load persistent state: {0}"
2574
 
                                .format(os.strerror(e.errno)))
 
2627
                logger.warning("Could not load persistent state:"
 
2628
                               " {}".format(os.strerror(e.errno)))
2575
2629
            else:
2576
2630
                logger.critical("Could not load persistent state:",
2577
2631
                                exc_info=e)
2578
2632
                raise
2579
2633
        except EOFError as e:
2580
2634
            logger.warning("Could not load persistent state: "
2581
 
                           "EOFError:", exc_info=e)
 
2635
                           "EOFError:",
 
2636
                           exc_info=e)
2582
2637
    
2583
2638
    with PGPEngine() as pgp:
2584
 
        for client_name, client in clients_data.iteritems():
 
2639
        for client_name, client in clients_data.items():
2585
2640
            # Skip removed clients
2586
2641
            if client_name not in client_settings:
2587
2642
                continue
2596
2651
                    # For each value in new config, check if it
2597
2652
                    # differs from the old config value (Except for
2598
2653
                    # the "secret" attribute)
2599
 
                    if (name != "secret" and
2600
 
                        value != old_client_settings[client_name]
2601
 
                        [name]):
 
2654
                    if (name != "secret"
 
2655
                        and (value !=
 
2656
                             old_client_settings[client_name][name])):
2602
2657
                        client[name] = value
2603
2658
                except KeyError:
2604
2659
                    pass
2605
2660
            
2606
2661
            # Clients who has passed its expire date can still be
2607
 
            # enabled if its last checker was successful.  Clients
 
2662
            # enabled if its last checker was successful.  A Client
2608
2663
            # whose checker succeeded before we stored its state is
2609
2664
            # assumed to have successfully run all checkers during
2610
2665
            # downtime.
2612
2667
                if datetime.datetime.utcnow() >= client["expires"]:
2613
2668
                    if not client["last_checked_ok"]:
2614
2669
                        logger.warning(
2615
 
                            "disabling client {0} - Client never "
2616
 
                            "performed a successful checker"
2617
 
                            .format(client_name))
 
2670
                            "disabling client {} - Client never "
 
2671
                            "performed a successful checker".format(
 
2672
                                client_name))
2618
2673
                        client["enabled"] = False
2619
2674
                    elif client["last_checker_status"] != 0:
2620
2675
                        logger.warning(
2621
 
                            "disabling client {0} - Client "
2622
 
                            "last checker failed with error code {1}"
2623
 
                            .format(client_name,
2624
 
                                    client["last_checker_status"]))
 
2676
                            "disabling client {} - Client last"
 
2677
                            " checker failed with error code"
 
2678
                            " {}".format(
 
2679
                                client_name,
 
2680
                                client["last_checker_status"]))
2625
2681
                        client["enabled"] = False
2626
2682
                    else:
2627
 
                        client["expires"] = (datetime.datetime
2628
 
                                             .utcnow()
2629
 
                                             + client["timeout"])
 
2683
                        client["expires"] = (
 
2684
                            datetime.datetime.utcnow()
 
2685
                            + client["timeout"])
2630
2686
                        logger.debug("Last checker succeeded,"
2631
 
                                     " keeping {0} enabled"
2632
 
                                     .format(client_name))
 
2687
                                     " keeping {} enabled".format(
 
2688
                                         client_name))
2633
2689
            try:
2634
 
                client["secret"] = (
2635
 
                    pgp.decrypt(client["encrypted_secret"],
2636
 
                                client_settings[client_name]
2637
 
                                ["secret"]))
 
2690
                client["secret"] = pgp.decrypt(
 
2691
                    client["encrypted_secret"],
 
2692
                    client_settings[client_name]["secret"])
2638
2693
            except PGPError:
2639
2694
                # If decryption fails, we use secret from new settings
2640
 
                logger.debug("Failed to decrypt {0} old secret"
2641
 
                             .format(client_name))
2642
 
                client["secret"] = (
2643
 
                    client_settings[client_name]["secret"])
 
2695
                logger.debug("Failed to decrypt {} old secret".format(
 
2696
                    client_name))
 
2697
                client["secret"] = (client_settings[client_name]
 
2698
                                    ["secret"])
2644
2699
    
2645
2700
    # Add/remove clients based on new changes made to config
2646
2701
    for client_name in (set(old_client_settings)
2651
2706
        clients_data[client_name] = client_settings[client_name]
2652
2707
    
2653
2708
    # Create all client objects
2654
 
    for client_name, client in clients_data.iteritems():
 
2709
    for client_name, client in clients_data.items():
2655
2710
        tcp_server.clients[client_name] = client_class(
2656
 
            name = client_name, settings = client,
 
2711
            name = client_name,
 
2712
            settings = client,
2657
2713
            server_settings = server_settings)
2658
2714
    
2659
2715
    if not tcp_server.clients:
2661
2717
    
2662
2718
    if not foreground:
2663
2719
        if pidfile is not None:
 
2720
            pid = os.getpid()
2664
2721
            try:
2665
2722
                with pidfile:
2666
 
                    pid = os.getpid()
2667
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2723
                    print(pid, file=pidfile)
2668
2724
            except IOError:
2669
2725
                logger.error("Could not write to file %r with PID %d",
2670
2726
                             pidfilename, pid)
2675
2731
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2676
2732
    
2677
2733
    if use_dbus:
2678
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2679
 
                                        "se.bsnet.fukt.Mandos"})
 
2734
        
 
2735
        @alternate_dbus_interfaces(
 
2736
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2680
2737
        class MandosDBusService(DBusObjectWithProperties):
2681
2738
            """A D-Bus proxy object"""
 
2739
            
2682
2740
            def __init__(self):
2683
2741
                dbus.service.Object.__init__(self, bus, "/")
 
2742
            
2684
2743
            _interface = "se.recompile.Mandos"
2685
2744
            
2686
2745
            @dbus_interface_annotations(_interface)
2687
2746
            def _foo(self):
2688
 
                return { "org.freedesktop.DBus.Property"
2689
 
                         ".EmitsChangedSignal":
2690
 
                             "false"}
 
2747
                return {
 
2748
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2749
                    "false" }
2691
2750
            
2692
2751
            @dbus.service.signal(_interface, signature="o")
2693
2752
            def ClientAdded(self, objpath):
2707
2766
            @dbus.service.method(_interface, out_signature="ao")
2708
2767
            def GetAllClients(self):
2709
2768
                "D-Bus method"
2710
 
                return dbus.Array(c.dbus_object_path
2711
 
                                  for c in
 
2769
                return dbus.Array(c.dbus_object_path for c in
2712
2770
                                  tcp_server.clients.itervalues())
2713
2771
            
2714
2772
            @dbus.service.method(_interface,
2716
2774
            def GetAllClientsWithProperties(self):
2717
2775
                "D-Bus method"
2718
2776
                return dbus.Dictionary(
2719
 
                    ((c.dbus_object_path, c.GetAll(""))
2720
 
                     for c in tcp_server.clients.itervalues()),
 
2777
                    { c.dbus_object_path: c.GetAll("")
 
2778
                      for c in tcp_server.clients.itervalues() },
2721
2779
                    signature="oa{sv}")
2722
2780
            
2723
2781
            @dbus.service.method(_interface, in_signature="o")
2740
2798
    
2741
2799
    def cleanup():
2742
2800
        "Cleanup function; run on exit"
2743
 
        service.cleanup()
 
2801
        if zeroconf:
 
2802
            service.cleanup()
2744
2803
        
2745
2804
        multiprocessing.active_children()
2746
2805
        wnull.close()
2760
2819
                
2761
2820
                # A list of attributes that can not be pickled
2762
2821
                # + secret.
2763
 
                exclude = set(("bus", "changedstate", "secret",
2764
 
                               "checker", "server_settings"))
2765
 
                for name, typ in (inspect.getmembers
2766
 
                                  (dbus.service.Object)):
 
2822
                exclude = { "bus", "changedstate", "secret",
 
2823
                            "checker", "server_settings" }
 
2824
                for name, typ in inspect.getmembers(dbus.service
 
2825
                                                    .Object):
2767
2826
                    exclude.add(name)
2768
2827
                
2769
2828
                client_dict["encrypted_secret"] = (client
2776
2835
                del client_settings[client.name]["secret"]
2777
2836
        
2778
2837
        try:
2779
 
            with (tempfile.NamedTemporaryFile
2780
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2781
 
                   dir=os.path.dirname(stored_state_path),
2782
 
                   delete=False)) as stored_state:
 
2838
            with tempfile.NamedTemporaryFile(
 
2839
                    mode='wb',
 
2840
                    suffix=".pickle",
 
2841
                    prefix='clients-',
 
2842
                    dir=os.path.dirname(stored_state_path),
 
2843
                    delete=False) as stored_state:
2783
2844
                pickle.dump((clients, client_settings), stored_state)
2784
 
                tempname=stored_state.name
 
2845
                tempname = stored_state.name
2785
2846
            os.rename(tempname, stored_state_path)
2786
2847
        except (IOError, OSError) as e:
2787
2848
            if not debug:
2790
2851
                except NameError:
2791
2852
                    pass
2792
2853
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2793
 
                logger.warning("Could not save persistent state: {0}"
 
2854
                logger.warning("Could not save persistent state: {}"
2794
2855
                               .format(os.strerror(e.errno)))
2795
2856
            else:
2796
2857
                logger.warning("Could not save persistent state:",
2806
2867
            client.disable(quiet=True)
2807
2868
            if use_dbus:
2808
2869
                # Emit D-Bus signal
2809
 
                mandos_dbus_service.ClientRemoved(client
2810
 
                                                  .dbus_object_path,
2811
 
                                                  client.name)
 
2870
                mandos_dbus_service.ClientRemoved(
 
2871
                    client.dbus_object_path, client.name)
2812
2872
        client_settings.clear()
2813
2873
    
2814
2874
    atexit.register(cleanup)
2825
2885
    tcp_server.server_activate()
2826
2886
    
2827
2887
    # Find out what port we got
2828
 
    service.port = tcp_server.socket.getsockname()[1]
 
2888
    if zeroconf:
 
2889
        service.port = tcp_server.socket.getsockname()[1]
2829
2890
    if use_ipv6:
2830
2891
        logger.info("Now listening on address %r, port %d,"
2831
2892
                    " flowinfo %d, scope_id %d",
2837
2898
    #service.interface = tcp_server.socket.getsockname()[3]
2838
2899
    
2839
2900
    try:
2840
 
        # From the Avahi example code
2841
 
        try:
2842
 
            service.activate()
2843
 
        except dbus.exceptions.DBusException as error:
2844
 
            logger.critical("D-Bus Exception", exc_info=error)
2845
 
            cleanup()
2846
 
            sys.exit(1)
2847
 
        # End of Avahi example code
 
2901
        if zeroconf:
 
2902
            # From the Avahi example code
 
2903
            try:
 
2904
                service.activate()
 
2905
            except dbus.exceptions.DBusException as error:
 
2906
                logger.critical("D-Bus Exception", exc_info=error)
 
2907
                cleanup()
 
2908
                sys.exit(1)
 
2909
            # End of Avahi example code
2848
2910
        
2849
2911
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2850
2912
                             lambda *args, **kwargs:
2865
2927
    # Must run before the D-Bus bus name gets deregistered
2866
2928
    cleanup()
2867
2929
 
 
2930
 
2868
2931
if __name__ == '__main__':
2869
2932
    main()