/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-03-10 18:03:38 UTC
  • Revision ID: teddy@recompile.se-20150310180338-pcxw6r2qmw9k6br9
Add ":!RSA" to GnuTLS priority string, to disallow non-DHE kx.

If Mandos was somehow made to use a non-ephemeral Diffie-Hellman key
exchange algorithm in the TLS handshake, any saved network traffic
could then be decrypted later if the Mandos client key was obtained.
By default, Mandos uses ephemeral DH key exchanges which does not have
this problem, but a non-ephemeral key exchange algorithm was still
enabled by default.  The simplest solution is to simply turn that off,
which ensures that Mandos will always use ephemeral DH key exchanges.

There is a "PFS" priority string specifier, but we can't use it because:

1. Security-wise, it is a mix between "NORMAL" and "SECURE128" - it
   enables a lot more algorithms than "SECURE256".

2. It is only available since GnuTLS 3.2.4.

Thanks to Andreas Fischer <af@bantuX.org> for reporting this issue.

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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
66
68
import binascii
67
69
import tempfile
68
70
import itertools
 
71
import collections
69
72
 
70
73
import dbus
71
74
import dbus.service
76
79
import ctypes.util
77
80
import xml.dom.minidom
78
81
import inspect
79
 
import GnuPGInterface
80
82
 
81
83
try:
82
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
88
    except ImportError:
87
89
        SO_BINDTODEVICE = None
88
90
 
89
 
version = "1.5.3"
 
91
if sys.version_info.major == 2:
 
92
    str = unicode
 
93
 
 
94
version = "1.6.9"
90
95
stored_state_file = "clients.pickle"
91
96
 
92
97
logger = logging.getLogger()
93
 
syslogger = (logging.handlers.SysLogHandler
94
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
 
              address = str("/dev/log")))
 
98
syslogger = None
96
99
 
97
100
try:
98
101
    if_nametoindex = (ctypes.cdll.LoadLibrary
104
107
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
108
        with contextlib.closing(socket.socket()) as s:
106
109
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
 
110
                                struct.pack(b"16s16x", interface))
 
111
        interface_index = struct.unpack("I", ifreq[16:20])[0]
111
112
        return interface_index
112
113
 
113
114
 
114
115
def initlogger(debug, level=logging.WARNING):
115
116
    """init logger and add loglevel"""
116
117
    
 
118
    global syslogger
 
119
    syslogger = (logging.handlers.SysLogHandler
 
120
                 (facility =
 
121
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
122
                  address = "/dev/log"))
117
123
    syslogger.setFormatter(logging.Formatter
118
124
                           ('Mandos [%(process)d]: %(levelname)s:'
119
125
                            ' %(message)s'))
137
143
class PGPEngine(object):
138
144
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
145
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
146
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
 
147
        self.gnupgargs = ['--batch',
 
148
                          '--home', self.tempdir,
 
149
                          '--force-mdc',
 
150
                          '--quiet',
 
151
                          '--no-use-agent']
148
152
    
149
153
    def __enter__(self):
150
154
        return self
151
155
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
156
    def __exit__(self, exc_type, exc_value, traceback):
153
157
        self._cleanup()
154
158
        return False
155
159
    
172
176
    def password_encode(self, password):
173
177
        # Passphrase can not be empty and can not contain newlines or
174
178
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
 
179
        encoded = b"mandos" + binascii.hexlify(password)
 
180
        if len(encoded) > 2048:
 
181
            # GnuPG can't handle long passwords, so encode differently
 
182
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
183
                       .replace(b"\n", b"\\n")
 
184
                       .replace(b"\0", b"\\x00"))
 
185
        return encoded
176
186
    
177
187
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
 
188
        passphrase = self.password_encode(password)
 
189
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
190
                                         ) as passfile:
 
191
            passfile.write(passphrase)
 
192
            passfile.flush()
 
193
            proc = subprocess.Popen(['gpg', '--symmetric',
 
194
                                     '--passphrase-file',
 
195
                                     passfile.name]
 
196
                                    + self.gnupgargs,
 
197
                                    stdin = subprocess.PIPE,
 
198
                                    stdout = subprocess.PIPE,
 
199
                                    stderr = subprocess.PIPE)
 
200
            ciphertext, err = proc.communicate(input = data)
 
201
        if proc.returncode != 0:
 
202
            raise PGPError(err)
192
203
        return ciphertext
193
204
    
194
205
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
 
206
        passphrase = self.password_encode(password)
 
207
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
208
                                         ) as passfile:
 
209
            passfile.write(passphrase)
 
210
            passfile.flush()
 
211
            proc = subprocess.Popen(['gpg', '--decrypt',
 
212
                                     '--passphrase-file',
 
213
                                     passfile.name]
 
214
                                    + self.gnupgargs,
 
215
                                    stdin = subprocess.PIPE,
 
216
                                    stdout = subprocess.PIPE,
 
217
                                    stderr = subprocess.PIPE)
 
218
            decrypted_plaintext, err = proc.communicate(input
 
219
                                                        = data)
 
220
        if proc.returncode != 0:
 
221
            raise PGPError(err)
209
222
        return decrypted_plaintext
210
223
 
211
224
 
212
225
class AvahiError(Exception):
213
226
    def __init__(self, value, *args, **kwargs):
214
227
        self.value = value
215
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
216
 
    def __unicode__(self):
217
 
        return unicode(repr(self.value))
 
228
        return super(AvahiError, self).__init__(value, *args,
 
229
                                                **kwargs)
218
230
 
219
231
class AvahiServiceError(AvahiError):
220
232
    pass
231
243
               Used to optionally bind to the specified interface.
232
244
    name: string; Example: 'Mandos'
233
245
    type: string; Example: '_mandos._tcp'.
234
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
246
     See <https://www.iana.org/assignments/service-names-port-numbers>
235
247
    port: integer; what port to announce
236
248
    TXT: list of strings; TXT record for the service
237
249
    domain: string; Domain to publish on, default to .local if empty.
263
275
        self.bus = bus
264
276
        self.entry_group_state_changed_match = None
265
277
    
266
 
    def rename(self):
 
278
    def rename(self, remove=True):
267
279
        """Derived from the Avahi example code"""
268
280
        if self.rename_count >= self.max_renames:
269
281
            logger.critical("No suitable Zeroconf service name found"
270
282
                            " after %i retries, exiting.",
271
283
                            self.rename_count)
272
284
            raise AvahiServiceError("Too many renames")
273
 
        self.name = unicode(self.server
274
 
                            .GetAlternativeServiceName(self.name))
 
285
        self.name = str(self.server
 
286
                        .GetAlternativeServiceName(self.name))
 
287
        self.rename_count += 1
275
288
        logger.info("Changing Zeroconf service name to %r ...",
276
289
                    self.name)
277
 
        self.remove()
 
290
        if remove:
 
291
            self.remove()
278
292
        try:
279
293
            self.add()
280
294
        except dbus.exceptions.DBusException as error:
281
 
            logger.critical("D-Bus Exception", exc_info=error)
282
 
            self.cleanup()
283
 
            os._exit(1)
284
 
        self.rename_count += 1
 
295
            if (error.get_dbus_name()
 
296
                == "org.freedesktop.Avahi.CollisionError"):
 
297
                logger.info("Local Zeroconf service name collision.")
 
298
                return self.rename(remove=False)
 
299
            else:
 
300
                logger.critical("D-Bus Exception", exc_info=error)
 
301
                self.cleanup()
 
302
                os._exit(1)
285
303
    
286
304
    def remove(self):
287
305
        """Derived from the Avahi example code"""
325
343
            self.rename()
326
344
        elif state == avahi.ENTRY_GROUP_FAILURE:
327
345
            logger.critical("Avahi: Error in group state changed %s",
328
 
                            unicode(error))
329
 
            raise AvahiGroupError("State changed: {0!s}"
 
346
                            str(error))
 
347
            raise AvahiGroupError("State changed: {!s}"
330
348
                                  .format(error))
331
349
    
332
350
    def cleanup(self):
377
395
                                 self.server_state_changed)
378
396
        self.server_state_changed(self.server.GetState())
379
397
 
 
398
 
380
399
class AvahiServiceToSyslog(AvahiService):
381
 
    def rename(self):
 
400
    def rename(self, *args, **kwargs):
382
401
        """Add the new name to the syslog messages"""
383
 
        ret = AvahiService.rename(self)
 
402
        ret = AvahiService.rename(self, *args, **kwargs)
384
403
        syslogger.setFormatter(logging.Formatter
385
 
                               ('Mandos ({0}) [%(process)d]:'
 
404
                               ('Mandos ({}) [%(process)d]:'
386
405
                                ' %(levelname)s: %(message)s'
387
406
                                .format(self.name)))
388
407
        return ret
389
408
 
390
 
def timedelta_to_milliseconds(td):
391
 
    "Convert a datetime.timedelta() to milliseconds"
392
 
    return ((td.days * 24 * 60 * 60 * 1000)
393
 
            + (td.seconds * 1000)
394
 
            + (td.microseconds // 1000))
395
409
 
396
410
class Client(object):
397
411
    """A representation of a client host served by this server.
434
448
    runtime_expansions: Allowed attributes for runtime expansion.
435
449
    expires:    datetime.datetime(); time (UTC) when a client will be
436
450
                disabled, or None
 
451
    server_settings: The server_settings dict from main()
437
452
    """
438
453
    
439
454
    runtime_expansions = ("approval_delay", "approval_duration",
440
 
                          "created", "enabled", "fingerprint",
441
 
                          "host", "interval", "last_checked_ok",
 
455
                          "created", "enabled", "expires",
 
456
                          "fingerprint", "host", "interval",
 
457
                          "last_approval_request", "last_checked_ok",
442
458
                          "last_enabled", "name", "timeout")
443
 
    client_defaults = { "timeout": "5m",
444
 
                        "extended_timeout": "15m",
445
 
                        "interval": "2m",
 
459
    client_defaults = { "timeout": "PT5M",
 
460
                        "extended_timeout": "PT15M",
 
461
                        "interval": "PT2M",
446
462
                        "checker": "fping -q -- %%(host)s",
447
463
                        "host": "",
448
 
                        "approval_delay": "0s",
449
 
                        "approval_duration": "1s",
 
464
                        "approval_delay": "PT0S",
 
465
                        "approval_duration": "PT1S",
450
466
                        "approved_by_default": "True",
451
467
                        "enabled": "True",
452
468
                        }
453
469
    
454
 
    def timeout_milliseconds(self):
455
 
        "Return the 'timeout' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.timeout)
457
 
    
458
 
    def extended_timeout_milliseconds(self):
459
 
        "Return the 'extended_timeout' attribute in milliseconds"
460
 
        return timedelta_to_milliseconds(self.extended_timeout)
461
 
    
462
 
    def interval_milliseconds(self):
463
 
        "Return the 'interval' attribute in milliseconds"
464
 
        return timedelta_to_milliseconds(self.interval)
465
 
    
466
 
    def approval_delay_milliseconds(self):
467
 
        return timedelta_to_milliseconds(self.approval_delay)
468
 
    
469
470
    @staticmethod
470
471
    def config_parser(config):
471
472
        """Construct a new dict of client settings of this form:
486
487
            client["enabled"] = config.getboolean(client_name,
487
488
                                                  "enabled")
488
489
            
 
490
            # Uppercase and remove spaces from fingerprint for later
 
491
            # comparison purposes with return value from the
 
492
            # fingerprint() function
489
493
            client["fingerprint"] = (section["fingerprint"].upper()
490
494
                                     .replace(" ", ""))
491
495
            if "secret" in section:
496
500
                          "rb") as secfile:
497
501
                    client["secret"] = secfile.read()
498
502
            else:
499
 
                raise TypeError("No secret or secfile for section {0}"
 
503
                raise TypeError("No secret or secfile for section {}"
500
504
                                .format(section))
501
505
            client["timeout"] = string_to_delta(section["timeout"])
502
506
            client["extended_timeout"] = string_to_delta(
513
517
        
514
518
        return settings
515
519
    
516
 
    def __init__(self, settings, name = None):
 
520
    def __init__(self, settings, name = None, server_settings=None):
517
521
        self.name = name
 
522
        if server_settings is None:
 
523
            server_settings = {}
 
524
        self.server_settings = server_settings
518
525
        # adding all client settings
519
 
        for setting, value in settings.iteritems():
 
526
        for setting, value in settings.items():
520
527
            setattr(self, setting, value)
521
528
        
522
529
        if self.enabled:
530
537
            self.expires = None
531
538
        
532
539
        logger.debug("Creating client %r", self.name)
533
 
        # Uppercase and remove spaces from fingerprint for later
534
 
        # comparison purposes with return value from the fingerprint()
535
 
        # function
536
540
        logger.debug("  Fingerprint: %s", self.fingerprint)
537
541
        self.created = settings.get("created",
538
542
                                    datetime.datetime.utcnow())
570
574
        if getattr(self, "enabled", False):
571
575
            # Already enabled
572
576
            return
573
 
        self.send_changedstate()
574
577
        self.expires = datetime.datetime.utcnow() + self.timeout
575
578
        self.enabled = True
576
579
        self.last_enabled = datetime.datetime.utcnow()
577
580
        self.init_checker()
 
581
        self.send_changedstate()
578
582
    
579
583
    def disable(self, quiet=True):
580
584
        """Disable this client."""
581
585
        if not getattr(self, "enabled", False):
582
586
            return False
583
587
        if not quiet:
584
 
            self.send_changedstate()
585
 
        if not quiet:
586
588
            logger.info("Disabling client %s", self.name)
587
 
        if getattr(self, "disable_initiator_tag", False):
 
589
        if getattr(self, "disable_initiator_tag", None) is not None:
588
590
            gobject.source_remove(self.disable_initiator_tag)
589
591
            self.disable_initiator_tag = None
590
592
        self.expires = None
591
 
        if getattr(self, "checker_initiator_tag", False):
 
593
        if getattr(self, "checker_initiator_tag", None) is not None:
592
594
            gobject.source_remove(self.checker_initiator_tag)
593
595
            self.checker_initiator_tag = None
594
596
        self.stop_checker()
595
597
        self.enabled = False
 
598
        if not quiet:
 
599
            self.send_changedstate()
596
600
        # Do not run this again if called by a gobject.timeout_add
597
601
        return False
598
602
    
602
606
    def init_checker(self):
603
607
        # Schedule a new checker to be started an 'interval' from now,
604
608
        # and every interval from then on.
 
609
        if self.checker_initiator_tag is not None:
 
610
            gobject.source_remove(self.checker_initiator_tag)
605
611
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (self.interval_milliseconds(),
 
612
                                      (int(self.interval
 
613
                                           .total_seconds() * 1000),
607
614
                                       self.start_checker))
608
615
        # Schedule a disable() when 'timeout' has passed
 
616
        if self.disable_initiator_tag is not None:
 
617
            gobject.source_remove(self.disable_initiator_tag)
609
618
        self.disable_initiator_tag = (gobject.timeout_add
610
 
                                   (self.timeout_milliseconds(),
611
 
                                    self.disable))
 
619
                                      (int(self.timeout
 
620
                                           .total_seconds() * 1000),
 
621
                                       self.disable))
612
622
        # Also start a new checker *right now*.
613
623
        self.start_checker()
614
624
    
642
652
            timeout = self.timeout
643
653
        if self.disable_initiator_tag is not None:
644
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
            self.disable_initiator_tag = None
645
656
        if getattr(self, "enabled", False):
646
657
            self.disable_initiator_tag = (gobject.timeout_add
647
 
                                          (timedelta_to_milliseconds
648
 
                                           (timeout), self.disable))
 
658
                                          (int(timeout.total_seconds()
 
659
                                               * 1000), self.disable))
649
660
            self.expires = datetime.datetime.utcnow() + timeout
650
661
    
651
662
    def need_approval(self):
668
679
        # If a checker exists, make sure it is not a zombie
669
680
        try:
670
681
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
 
        except (AttributeError, OSError) as error:
672
 
            if (isinstance(error, OSError)
673
 
                and error.errno != errno.ECHILD):
674
 
                raise error
 
682
        except AttributeError:
 
683
            pass
 
684
        except OSError as error:
 
685
            if error.errno != errno.ECHILD:
 
686
                raise
675
687
        else:
676
688
            if pid:
677
689
                logger.warning("Checker was a zombie")
680
692
                                      self.current_checker_command)
681
693
        # Start a new checker if needed
682
694
        if self.checker is None:
 
695
            # Escape attributes for the shell
 
696
            escaped_attrs = { attr:
 
697
                                  re.escape(str(getattr(self, attr)))
 
698
                              for attr in self.runtime_expansions }
683
699
            try:
684
 
                # In case checker_command has exactly one % operator
685
 
                command = self.checker_command % self.host
686
 
            except TypeError:
687
 
                # Escape attributes for the shell
688
 
                escaped_attrs = dict(
689
 
                    (attr,
690
 
                     re.escape(unicode(str(getattr(self, attr, "")),
691
 
                                       errors=
692
 
                                       'replace')))
693
 
                    for attr in
694
 
                    self.runtime_expansions)
695
 
                
696
 
                try:
697
 
                    command = self.checker_command % escaped_attrs
698
 
                except TypeError as error:
699
 
                    logger.error('Could not format string "%s"',
700
 
                                 self.checker_command, exc_info=error)
701
 
                    return True # Try again later
 
700
                command = self.checker_command % escaped_attrs
 
701
            except TypeError as error:
 
702
                logger.error('Could not format string "%s"',
 
703
                             self.checker_command, exc_info=error)
 
704
                return True # Try again later
702
705
            self.current_checker_command = command
703
706
            try:
704
707
                logger.info("Starting checker %r for %s",
707
710
                # in normal mode, that is already done by daemon(),
708
711
                # and in debug mode we don't want to.  (Stdin is
709
712
                # always replaced by /dev/null.)
 
713
                # The exception is when not debugging but nevertheless
 
714
                # running in the foreground; use the previously
 
715
                # created wnull.
 
716
                popen_args = {}
 
717
                if (not self.server_settings["debug"]
 
718
                    and self.server_settings["foreground"]):
 
719
                    popen_args.update({"stdout": wnull,
 
720
                                       "stderr": wnull })
710
721
                self.checker = subprocess.Popen(command,
711
722
                                                close_fds=True,
712
 
                                                shell=True, cwd="/")
713
 
                self.checker_callback_tag = (gobject.child_watch_add
714
 
                                             (self.checker.pid,
715
 
                                              self.checker_callback,
716
 
                                              data=command))
717
 
                # The checker may have completed before the gobject
718
 
                # watch was added.  Check for this.
719
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
720
 
                if pid:
721
 
                    gobject.source_remove(self.checker_callback_tag)
722
 
                    self.checker_callback(pid, status, command)
 
723
                                                shell=True, cwd="/",
 
724
                                                **popen_args)
723
725
            except OSError as error:
724
726
                logger.error("Failed to start subprocess",
725
727
                             exc_info=error)
 
728
                return True
 
729
            self.checker_callback_tag = (gobject.child_watch_add
 
730
                                         (self.checker.pid,
 
731
                                          self.checker_callback,
 
732
                                          data=command))
 
733
            # The checker may have completed before the gobject
 
734
            # watch was added.  Check for this.
 
735
            try:
 
736
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
737
            except OSError as error:
 
738
                if error.errno == errno.ECHILD:
 
739
                    # This should never happen
 
740
                    logger.error("Child process vanished",
 
741
                                 exc_info=error)
 
742
                    return True
 
743
                raise
 
744
            if pid:
 
745
                gobject.source_remove(self.checker_callback_tag)
 
746
                self.checker_callback(pid, status, command)
726
747
        # Re-run this periodically if run by gobject.timeout_add
727
748
        return True
728
749
    
761
782
    # "Set" method, so we fail early here:
762
783
    if byte_arrays and signature != "ay":
763
784
        raise ValueError("Byte arrays not supported for non-'ay'"
764
 
                         " signature {0!r}".format(signature))
 
785
                         " signature {!r}".format(signature))
765
786
    def decorator(func):
766
787
        func._dbus_is_property = True
767
788
        func._dbus_interface = dbus_interface
798
819
    """Decorator to annotate D-Bus methods, signals or properties
799
820
    Usage:
800
821
    
 
822
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
823
                       "org.freedesktop.DBus.Property."
 
824
                       "EmitsChangedSignal": "false"})
801
825
    @dbus_service_property("org.example.Interface", signature="b",
802
826
                           access="r")
803
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
804
 
                        "org.freedesktop.DBus.Property."
805
 
                        "EmitsChangedSignal": "false"})
806
827
    def Property_dbus_property(self):
807
828
        return dbus.Boolean(False)
808
829
    """
815
836
class DBusPropertyException(dbus.exceptions.DBusException):
816
837
    """A base class for D-Bus property-related exceptions
817
838
    """
818
 
    def __unicode__(self):
819
 
        return unicode(str(self))
820
 
 
 
839
    pass
821
840
 
822
841
class DBusPropertyAccessException(DBusPropertyException):
823
842
    """A property's access permissions disallows an operation.
846
865
        If called like _is_dbus_thing("method") it returns a function
847
866
        suitable for use as predicate to inspect.getmembers().
848
867
        """
849
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
868
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
850
869
                                   False)
851
870
    
852
871
    def _get_all_dbus_things(self, thing):
901
920
            # The byte_arrays option is not supported yet on
902
921
            # signatures other than "ay".
903
922
            if prop._dbus_signature != "ay":
904
 
                raise ValueError
 
923
                raise ValueError("Byte arrays not supported for non-"
 
924
                                 "'ay' signature {!r}"
 
925
                                 .format(prop._dbus_signature))
905
926
            value = dbus.ByteArray(b''.join(chr(byte)
906
927
                                            for byte in value))
907
928
        prop(value)
931
952
                                           value.variant_level+1)
932
953
        return dbus.Dictionary(properties, signature="sv")
933
954
    
 
955
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
956
    def PropertiesChanged(self, interface_name, changed_properties,
 
957
                          invalidated_properties):
 
958
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
959
        standard.
 
960
        """
 
961
        pass
 
962
    
934
963
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
935
964
                         out_signature="s",
936
965
                         path_keyword='object_path',
971
1000
                                              (prop,
972
1001
                                               "_dbus_annotations",
973
1002
                                               {}))
974
 
                        for name, value in annots.iteritems():
 
1003
                        for name, value in annots.items():
975
1004
                            ann_tag = document.createElement(
976
1005
                                "annotation")
977
1006
                            ann_tag.setAttribute("name", name)
980
1009
                # Add interface annotation tags
981
1010
                for annotation, value in dict(
982
1011
                    itertools.chain.from_iterable(
983
 
                        annotations().iteritems()
 
1012
                        annotations().items()
984
1013
                        for name, annotations in
985
1014
                        self._get_all_dbus_things("interface")
986
1015
                        if name == if_tag.getAttribute("name")
987
 
                        )).iteritems():
 
1016
                        )).items():
988
1017
                    ann_tag = document.createElement("annotation")
989
1018
                    ann_tag.setAttribute("name", annotation)
990
1019
                    ann_tag.setAttribute("value", value)
1013
1042
        return xmlstring
1014
1043
 
1015
1044
 
1016
 
def datetime_to_dbus (dt, variant_level=0):
 
1045
def datetime_to_dbus(dt, variant_level=0):
1017
1046
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1018
1047
    if dt is None:
1019
1048
        return dbus.String("", variant_level = variant_level)
1027
1056
    interface names according to the "alt_interface_names" mapping.
1028
1057
    Usage:
1029
1058
    
1030
 
    @alternate_dbus_names({"org.example.Interface":
1031
 
                               "net.example.AlternateInterface"})
 
1059
    @alternate_dbus_interfaces({"org.example.Interface":
 
1060
                                    "net.example.AlternateInterface"})
1032
1061
    class SampleDBusObject(dbus.service.Object):
1033
1062
        @dbus.service.method("org.example.Interface")
1034
1063
        def SampleDBusMethod():
1046
1075
    """
1047
1076
    def wrapper(cls):
1048
1077
        for orig_interface_name, alt_interface_name in (
1049
 
            alt_interface_names.iteritems()):
 
1078
            alt_interface_names.items()):
1050
1079
            attr = {}
1051
1080
            interface_names = set()
1052
1081
            # Go though all attributes of the class
1065
1094
                interface_names.add(alt_interface)
1066
1095
                # Is this a D-Bus signal?
1067
1096
                if getattr(attribute, "_dbus_is_signal", False):
1068
 
                    # Extract the original non-method function by
1069
 
                    # black magic
 
1097
                    # Extract the original non-method undecorated
 
1098
                    # function by black magic
1070
1099
                    nonmethod_func = (dict(
1071
1100
                            zip(attribute.func_code.co_freevars,
1072
1101
                                attribute.__closure__))["func"]
1169
1198
                                        attribute.func_closure)))
1170
1199
            if deprecate:
1171
1200
                # Deprecate all alternate interfaces
1172
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1201
                iname="_AlternateDBusNames_interface_annotation{}"
1173
1202
                for interface_name in interface_names:
1174
1203
                    @dbus_interface_annotations(interface_name)
1175
1204
                    def func(self):
1184
1213
            if interface_names:
1185
1214
                # Replace the class with a new subclass of it with
1186
1215
                # methods, signals, etc. as created above.
1187
 
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1216
                cls = type(b"{}Alternate".format(cls.__name__),
1188
1217
                           (cls,), attr)
1189
1218
        return cls
1190
1219
    return wrapper
1203
1232
    runtime_expansions = (Client.runtime_expansions
1204
1233
                          + ("dbus_object_path",))
1205
1234
    
 
1235
    _interface = "se.recompile.Mandos.Client"
 
1236
    
1206
1237
    # dbus.service.Object doesn't use super(), so we can't either.
1207
1238
    
1208
1239
    def __init__(self, bus = None, *args, **kwargs):
1210
1241
        Client.__init__(self, *args, **kwargs)
1211
1242
        # Only now, when this client is initialized, can it show up on
1212
1243
        # the D-Bus
1213
 
        client_object_name = unicode(self.name).translate(
 
1244
        client_object_name = str(self.name).translate(
1214
1245
            {ord("."): ord("_"),
1215
1246
             ord("-"): ord("_")})
1216
1247
        self.dbus_object_path = (dbus.ObjectPath
1220
1251
    
1221
1252
    def notifychangeproperty(transform_func,
1222
1253
                             dbus_name, type_func=lambda x: x,
1223
 
                             variant_level=1):
 
1254
                             variant_level=1, invalidate_only=False,
 
1255
                             _interface=_interface):
1224
1256
        """ Modify a variable so that it's a property which announces
1225
1257
        its changes to DBus.
1226
1258
        
1231
1263
                   to the D-Bus.  Default: no transform
1232
1264
        variant_level: D-Bus variant level.  Default: 1
1233
1265
        """
1234
 
        attrname = "_{0}".format(dbus_name)
 
1266
        attrname = "_{}".format(dbus_name)
1235
1267
        def setter(self, value):
1236
1268
            if hasattr(self, "dbus_object_path"):
1237
1269
                if (not hasattr(self, attrname) or
1238
1270
                    type_func(getattr(self, attrname, None))
1239
1271
                    != type_func(value)):
1240
 
                    dbus_value = transform_func(type_func(value),
1241
 
                                                variant_level
1242
 
                                                =variant_level)
1243
 
                    self.PropertyChanged(dbus.String(dbus_name),
1244
 
                                         dbus_value)
 
1272
                    if invalidate_only:
 
1273
                        self.PropertiesChanged(_interface,
 
1274
                                               dbus.Dictionary(),
 
1275
                                               dbus.Array
 
1276
                                               ((dbus_name,)))
 
1277
                    else:
 
1278
                        dbus_value = transform_func(type_func(value),
 
1279
                                                    variant_level
 
1280
                                                    =variant_level)
 
1281
                        self.PropertyChanged(dbus.String(dbus_name),
 
1282
                                             dbus_value)
 
1283
                        self.PropertiesChanged(_interface,
 
1284
                                               dbus.Dictionary({
 
1285
                                    dbus.String(dbus_name):
 
1286
                                        dbus_value }), dbus.Array())
1245
1287
            setattr(self, attrname, value)
1246
1288
        
1247
1289
        return property(lambda self: getattr(self, attrname), setter)
1267
1309
    approval_delay = notifychangeproperty(dbus.UInt64,
1268
1310
                                          "ApprovalDelay",
1269
1311
                                          type_func =
1270
 
                                          timedelta_to_milliseconds)
 
1312
                                          lambda td: td.total_seconds()
 
1313
                                          * 1000)
1271
1314
    approval_duration = notifychangeproperty(
1272
1315
        dbus.UInt64, "ApprovalDuration",
1273
 
        type_func = timedelta_to_milliseconds)
 
1316
        type_func = lambda td: td.total_seconds() * 1000)
1274
1317
    host = notifychangeproperty(dbus.String, "Host")
1275
1318
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1276
 
                                   type_func =
1277
 
                                   timedelta_to_milliseconds)
 
1319
                                   type_func = lambda td:
 
1320
                                       td.total_seconds() * 1000)
1278
1321
    extended_timeout = notifychangeproperty(
1279
1322
        dbus.UInt64, "ExtendedTimeout",
1280
 
        type_func = timedelta_to_milliseconds)
 
1323
        type_func = lambda td: td.total_seconds() * 1000)
1281
1324
    interval = notifychangeproperty(dbus.UInt64,
1282
1325
                                    "Interval",
1283
1326
                                    type_func =
1284
 
                                    timedelta_to_milliseconds)
 
1327
                                    lambda td: td.total_seconds()
 
1328
                                    * 1000)
1285
1329
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1330
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1331
                                  invalidate_only=True)
1286
1332
    
1287
1333
    del notifychangeproperty
1288
1334
    
1315
1361
                                       *args, **kwargs)
1316
1362
    
1317
1363
    def start_checker(self, *args, **kwargs):
1318
 
        old_checker = self.checker
1319
 
        if self.checker is not None:
1320
 
            old_checker_pid = self.checker.pid
1321
 
        else:
1322
 
            old_checker_pid = None
 
1364
        old_checker_pid = getattr(self.checker, "pid", None)
1323
1365
        r = Client.start_checker(self, *args, **kwargs)
1324
1366
        # Only if new checker process was started
1325
1367
        if (self.checker is not None
1333
1375
        return False
1334
1376
    
1335
1377
    def approve(self, value=True):
1336
 
        self.send_changedstate()
1337
1378
        self.approved = value
1338
 
        gobject.timeout_add(timedelta_to_milliseconds
1339
 
                            (self.approval_duration),
1340
 
                            self._reset_approved)
 
1379
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1380
                                * 1000), self._reset_approved)
 
1381
        self.send_changedstate()
1341
1382
    
1342
1383
    ## D-Bus methods, signals & properties
1343
 
    _interface = "se.recompile.Mandos.Client"
1344
1384
    
1345
1385
    ## Interfaces
1346
1386
    
1347
 
    @dbus_interface_annotations(_interface)
1348
 
    def _foo(self):
1349
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1350
 
                     "false"}
1351
 
    
1352
1387
    ## Signals
1353
1388
    
1354
1389
    # CheckerCompleted - signal
1364
1399
        pass
1365
1400
    
1366
1401
    # PropertyChanged - signal
 
1402
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1367
1403
    @dbus.service.signal(_interface, signature="sv")
1368
1404
    def PropertyChanged(self, property, value):
1369
1405
        "D-Bus signal"
1445
1481
                           access="readwrite")
1446
1482
    def ApprovalDelay_dbus_property(self, value=None):
1447
1483
        if value is None:       # get
1448
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1484
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1485
                               * 1000)
1449
1486
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1450
1487
    
1451
1488
    # ApprovalDuration - property
1453
1490
                           access="readwrite")
1454
1491
    def ApprovalDuration_dbus_property(self, value=None):
1455
1492
        if value is None:       # get
1456
 
            return dbus.UInt64(timedelta_to_milliseconds(
1457
 
                    self.approval_duration))
 
1493
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1494
                               * 1000)
1458
1495
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1459
1496
    
1460
1497
    # Name - property
1473
1510
    def Host_dbus_property(self, value=None):
1474
1511
        if value is None:       # get
1475
1512
            return dbus.String(self.host)
1476
 
        self.host = unicode(value)
 
1513
        self.host = str(value)
1477
1514
    
1478
1515
    # Created - property
1479
1516
    @dbus_service_property(_interface, signature="s", access="read")
1526
1563
                           access="readwrite")
1527
1564
    def Timeout_dbus_property(self, value=None):
1528
1565
        if value is None:       # get
1529
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1566
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1567
        old_timeout = self.timeout
1530
1568
        self.timeout = datetime.timedelta(0, 0, 0, value)
1531
 
        # Reschedule timeout
 
1569
        # Reschedule disabling
1532
1570
        if self.enabled:
1533
1571
            now = datetime.datetime.utcnow()
1534
 
            time_to_die = timedelta_to_milliseconds(
1535
 
                (self.last_checked_ok + self.timeout) - now)
1536
 
            if time_to_die <= 0:
 
1572
            self.expires += self.timeout - old_timeout
 
1573
            if self.expires <= now:
1537
1574
                # The timeout has passed
1538
1575
                self.disable()
1539
1576
            else:
1540
 
                self.expires = (now +
1541
 
                                datetime.timedelta(milliseconds =
1542
 
                                                   time_to_die))
1543
1577
                if (getattr(self, "disable_initiator_tag", None)
1544
1578
                    is None):
1545
1579
                    return
1546
1580
                gobject.source_remove(self.disable_initiator_tag)
1547
 
                self.disable_initiator_tag = (gobject.timeout_add
1548
 
                                              (time_to_die,
1549
 
                                               self.disable))
 
1581
                self.disable_initiator_tag = (
 
1582
                    gobject.timeout_add(
 
1583
                        int((self.expires - now).total_seconds()
 
1584
                            * 1000), self.disable))
1550
1585
    
1551
1586
    # ExtendedTimeout - property
1552
1587
    @dbus_service_property(_interface, signature="t",
1553
1588
                           access="readwrite")
1554
1589
    def ExtendedTimeout_dbus_property(self, value=None):
1555
1590
        if value is None:       # get
1556
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1591
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1592
                               * 1000)
1557
1593
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1558
1594
    
1559
1595
    # Interval - property
1561
1597
                           access="readwrite")
1562
1598
    def Interval_dbus_property(self, value=None):
1563
1599
        if value is None:       # get
1564
 
            return dbus.UInt64(self.interval_milliseconds())
 
1600
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1565
1601
        self.interval = datetime.timedelta(0, 0, 0, value)
1566
1602
        if getattr(self, "checker_initiator_tag", None) is None:
1567
1603
            return
1578
1614
    def Checker_dbus_property(self, value=None):
1579
1615
        if value is None:       # get
1580
1616
            return dbus.String(self.checker_command)
1581
 
        self.checker_command = unicode(value)
 
1617
        self.checker_command = str(value)
1582
1618
    
1583
1619
    # CheckerRunning - property
1584
1620
    @dbus_service_property(_interface, signature="b",
1600
1636
    @dbus_service_property(_interface, signature="ay",
1601
1637
                           access="write", byte_arrays=True)
1602
1638
    def Secret_dbus_property(self, value):
1603
 
        self.secret = str(value)
 
1639
        self.secret = bytes(value)
1604
1640
    
1605
1641
    del _interface
1606
1642
 
1640
1676
    def handle(self):
1641
1677
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1642
1678
            logger.info("TCP connection from: %s",
1643
 
                        unicode(self.client_address))
 
1679
                        str(self.client_address))
1644
1680
            logger.debug("Pipe FD: %d",
1645
1681
                         self.server.child_pipe.fileno())
1646
1682
            
1672
1708
            logger.debug("Protocol version: %r", line)
1673
1709
            try:
1674
1710
                if int(line.strip().split()[0]) > 1:
1675
 
                    raise RuntimeError
 
1711
                    raise RuntimeError(line)
1676
1712
            except (ValueError, IndexError, RuntimeError) as error:
1677
1713
                logger.error("Unknown protocol version: %s", error)
1678
1714
                return
1727
1763
                        if self.server.use_dbus:
1728
1764
                            # Emit D-Bus signal
1729
1765
                            client.NeedApproval(
1730
 
                                client.approval_delay_milliseconds(),
1731
 
                                client.approved_by_default)
 
1766
                                client.approval_delay.total_seconds()
 
1767
                                * 1000, client.approved_by_default)
1732
1768
                    else:
1733
1769
                        logger.warning("Client %s was not approved",
1734
1770
                                       client.name)
1740
1776
                    #wait until timeout or approved
1741
1777
                    time = datetime.datetime.now()
1742
1778
                    client.changedstate.acquire()
1743
 
                    (client.changedstate.wait
1744
 
                     (float(client.timedelta_to_milliseconds(delay)
1745
 
                            / 1000)))
 
1779
                    client.changedstate.wait(delay.total_seconds())
1746
1780
                    client.changedstate.release()
1747
1781
                    time2 = datetime.datetime.now()
1748
1782
                    if (time2 - time) >= delay:
1864
1898
    def process_request(self, request, address):
1865
1899
        """Start a new process to process the request."""
1866
1900
        proc = multiprocessing.Process(target = self.sub_process_main,
1867
 
                                       args = (request,
1868
 
                                               address))
 
1901
                                       args = (request, address))
1869
1902
        proc.start()
1870
1903
        return proc
1871
1904
 
1886
1919
    
1887
1920
    def add_pipe(self, parent_pipe, proc):
1888
1921
        """Dummy function; override as necessary"""
1889
 
        raise NotImplementedError
 
1922
        raise NotImplementedError()
1890
1923
 
1891
1924
 
1892
1925
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1899
1932
        use_ipv6:       Boolean; to use IPv6 or not
1900
1933
    """
1901
1934
    def __init__(self, server_address, RequestHandlerClass,
1902
 
                 interface=None, use_ipv6=True):
 
1935
                 interface=None, use_ipv6=True, socketfd=None):
 
1936
        """If socketfd is set, use that file descriptor instead of
 
1937
        creating a new one with socket.socket().
 
1938
        """
1903
1939
        self.interface = interface
1904
1940
        if use_ipv6:
1905
1941
            self.address_family = socket.AF_INET6
 
1942
        if socketfd is not None:
 
1943
            # Save the file descriptor
 
1944
            self.socketfd = socketfd
 
1945
            # Save the original socket.socket() function
 
1946
            self.socket_socket = socket.socket
 
1947
            # To implement --socket, we monkey patch socket.socket.
 
1948
            # 
 
1949
            # (When socketserver.TCPServer is a new-style class, we
 
1950
            # could make self.socket into a property instead of monkey
 
1951
            # patching socket.socket.)
 
1952
            # 
 
1953
            # Create a one-time-only replacement for socket.socket()
 
1954
            @functools.wraps(socket.socket)
 
1955
            def socket_wrapper(*args, **kwargs):
 
1956
                # Restore original function so subsequent calls are
 
1957
                # not affected.
 
1958
                socket.socket = self.socket_socket
 
1959
                del self.socket_socket
 
1960
                # This time only, return a new socket object from the
 
1961
                # saved file descriptor.
 
1962
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1963
            # Replace socket.socket() function with wrapper
 
1964
            socket.socket = socket_wrapper
 
1965
        # The socketserver.TCPServer.__init__ will call
 
1966
        # socket.socket(), which might be our replacement,
 
1967
        # socket_wrapper(), if socketfd was set.
1906
1968
        socketserver.TCPServer.__init__(self, server_address,
1907
1969
                                        RequestHandlerClass)
 
1970
    
1908
1971
    def server_bind(self):
1909
1972
        """This overrides the normal server_bind() function
1910
1973
        to bind to an interface if one was specified, and also NOT to
1918
1981
                try:
1919
1982
                    self.socket.setsockopt(socket.SOL_SOCKET,
1920
1983
                                           SO_BINDTODEVICE,
1921
 
                                           str(self.interface
1922
 
                                               + '\0'))
 
1984
                                           (self.interface + "\0")
 
1985
                                           .encode("utf-8"))
1923
1986
                except socket.error as error:
1924
 
                    if error[0] == errno.EPERM:
1925
 
                        logger.error("No permission to"
1926
 
                                     " bind to interface %s",
1927
 
                                     self.interface)
1928
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1987
                    if error.errno == errno.EPERM:
 
1988
                        logger.error("No permission to bind to"
 
1989
                                     " interface %s", self.interface)
 
1990
                    elif error.errno == errno.ENOPROTOOPT:
1929
1991
                        logger.error("SO_BINDTODEVICE not available;"
1930
1992
                                     " cannot bind to interface %s",
1931
1993
                                     self.interface)
 
1994
                    elif error.errno == errno.ENODEV:
 
1995
                        logger.error("Interface %s does not exist,"
 
1996
                                     " cannot bind", self.interface)
1932
1997
                    else:
1933
1998
                        raise
1934
1999
        # Only bind(2) the socket if we really need to.
1937
2002
                if self.address_family == socket.AF_INET6:
1938
2003
                    any_address = "::" # in6addr_any
1939
2004
                else:
1940
 
                    any_address = socket.INADDR_ANY
 
2005
                    any_address = "0.0.0.0" # INADDR_ANY
1941
2006
                self.server_address = (any_address,
1942
2007
                                       self.server_address[1])
1943
2008
            elif not self.server_address[1]:
1964
2029
    """
1965
2030
    def __init__(self, server_address, RequestHandlerClass,
1966
2031
                 interface=None, use_ipv6=True, clients=None,
1967
 
                 gnutls_priority=None, use_dbus=True):
 
2032
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1968
2033
        self.enabled = False
1969
2034
        self.clients = clients
1970
2035
        if self.clients is None:
1974
2039
        IPv6_TCPServer.__init__(self, server_address,
1975
2040
                                RequestHandlerClass,
1976
2041
                                interface = interface,
1977
 
                                use_ipv6 = use_ipv6)
 
2042
                                use_ipv6 = use_ipv6,
 
2043
                                socketfd = socketfd)
1978
2044
    def server_activate(self):
1979
2045
        if self.enabled:
1980
2046
            return socketserver.TCPServer.server_activate(self)
2058
2124
        return True
2059
2125
 
2060
2126
 
 
2127
def rfc3339_duration_to_delta(duration):
 
2128
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2129
    
 
2130
    >>> rfc3339_duration_to_delta("P7D")
 
2131
    datetime.timedelta(7)
 
2132
    >>> rfc3339_duration_to_delta("PT60S")
 
2133
    datetime.timedelta(0, 60)
 
2134
    >>> rfc3339_duration_to_delta("PT60M")
 
2135
    datetime.timedelta(0, 3600)
 
2136
    >>> rfc3339_duration_to_delta("PT24H")
 
2137
    datetime.timedelta(1)
 
2138
    >>> rfc3339_duration_to_delta("P1W")
 
2139
    datetime.timedelta(7)
 
2140
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2141
    datetime.timedelta(0, 330)
 
2142
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2143
    datetime.timedelta(1, 200)
 
2144
    """
 
2145
    
 
2146
    # Parsing an RFC 3339 duration with regular expressions is not
 
2147
    # possible - there would have to be multiple places for the same
 
2148
    # values, like seconds.  The current code, while more esoteric, is
 
2149
    # cleaner without depending on a parsing library.  If Python had a
 
2150
    # built-in library for parsing we would use it, but we'd like to
 
2151
    # avoid excessive use of external libraries.
 
2152
    
 
2153
    # New type for defining tokens, syntax, and semantics all-in-one
 
2154
    Token = collections.namedtuple("Token",
 
2155
                                   ("regexp", # To match token; if
 
2156
                                              # "value" is not None,
 
2157
                                              # must have a "group"
 
2158
                                              # containing digits
 
2159
                                    "value",  # datetime.timedelta or
 
2160
                                              # None
 
2161
                                    "followers")) # Tokens valid after
 
2162
                                                  # this token
 
2163
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2164
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2165
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2166
    token_second = Token(re.compile(r"(\d+)S"),
 
2167
                         datetime.timedelta(seconds=1),
 
2168
                         frozenset((token_end,)))
 
2169
    token_minute = Token(re.compile(r"(\d+)M"),
 
2170
                         datetime.timedelta(minutes=1),
 
2171
                         frozenset((token_second, token_end)))
 
2172
    token_hour = Token(re.compile(r"(\d+)H"),
 
2173
                       datetime.timedelta(hours=1),
 
2174
                       frozenset((token_minute, token_end)))
 
2175
    token_time = Token(re.compile(r"T"),
 
2176
                       None,
 
2177
                       frozenset((token_hour, token_minute,
 
2178
                                  token_second)))
 
2179
    token_day = Token(re.compile(r"(\d+)D"),
 
2180
                      datetime.timedelta(days=1),
 
2181
                      frozenset((token_time, token_end)))
 
2182
    token_month = Token(re.compile(r"(\d+)M"),
 
2183
                        datetime.timedelta(weeks=4),
 
2184
                        frozenset((token_day, token_end)))
 
2185
    token_year = Token(re.compile(r"(\d+)Y"),
 
2186
                       datetime.timedelta(weeks=52),
 
2187
                       frozenset((token_month, token_end)))
 
2188
    token_week = Token(re.compile(r"(\d+)W"),
 
2189
                       datetime.timedelta(weeks=1),
 
2190
                       frozenset((token_end,)))
 
2191
    token_duration = Token(re.compile(r"P"), None,
 
2192
                           frozenset((token_year, token_month,
 
2193
                                      token_day, token_time,
 
2194
                                      token_week)))
 
2195
    # Define starting values
 
2196
    value = datetime.timedelta() # Value so far
 
2197
    found_token = None
 
2198
    followers = frozenset((token_duration,)) # Following valid tokens
 
2199
    s = duration                # String left to parse
 
2200
    # Loop until end token is found
 
2201
    while found_token is not token_end:
 
2202
        # Search for any currently valid tokens
 
2203
        for token in followers:
 
2204
            match = token.regexp.match(s)
 
2205
            if match is not None:
 
2206
                # Token found
 
2207
                if token.value is not None:
 
2208
                    # Value found, parse digits
 
2209
                    factor = int(match.group(1), 10)
 
2210
                    # Add to value so far
 
2211
                    value += factor * token.value
 
2212
                # Strip token from string
 
2213
                s = token.regexp.sub("", s, 1)
 
2214
                # Go to found token
 
2215
                found_token = token
 
2216
                # Set valid next tokens
 
2217
                followers = found_token.followers
 
2218
                break
 
2219
        else:
 
2220
            # No currently valid tokens were found
 
2221
            raise ValueError("Invalid RFC 3339 duration")
 
2222
    # End token found
 
2223
    return value
 
2224
 
 
2225
 
2061
2226
def string_to_delta(interval):
2062
2227
    """Parse a string and return a datetime.timedelta
2063
2228
    
2074
2239
    >>> string_to_delta('5m 30s')
2075
2240
    datetime.timedelta(0, 330)
2076
2241
    """
 
2242
    
 
2243
    try:
 
2244
        return rfc3339_duration_to_delta(interval)
 
2245
    except ValueError:
 
2246
        pass
 
2247
    
2077
2248
    timevalue = datetime.timedelta(0)
2078
2249
    for s in interval.split():
2079
2250
        try:
2080
 
            suffix = unicode(s[-1])
 
2251
            suffix = s[-1]
2081
2252
            value = int(s[:-1])
2082
2253
            if suffix == "d":
2083
2254
                delta = datetime.timedelta(value)
2090
2261
            elif suffix == "w":
2091
2262
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2092
2263
            else:
2093
 
                raise ValueError("Unknown suffix {0!r}"
 
2264
                raise ValueError("Unknown suffix {!r}"
2094
2265
                                 .format(suffix))
2095
 
        except (ValueError, IndexError) as e:
 
2266
        except IndexError as e:
2096
2267
            raise ValueError(*(e.args))
2097
2268
        timevalue += delta
2098
2269
    return timevalue
2113
2284
        # Close all standard open file descriptors
2114
2285
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2115
2286
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2116
 
            raise OSError(errno.ENODEV,
2117
 
                          "{0} not a character device"
 
2287
            raise OSError(errno.ENODEV, "{} not a character device"
2118
2288
                          .format(os.devnull))
2119
2289
        os.dup2(null, sys.stdin.fileno())
2120
2290
        os.dup2(null, sys.stdout.fileno())
2130
2300
    
2131
2301
    parser = argparse.ArgumentParser()
2132
2302
    parser.add_argument("-v", "--version", action="version",
2133
 
                        version = "%(prog)s {0}".format(version),
 
2303
                        version = "%(prog)s {}".format(version),
2134
2304
                        help="show version number and exit")
2135
2305
    parser.add_argument("-i", "--interface", metavar="IF",
2136
2306
                        help="Bind to interface IF")
2142
2312
                        help="Run self-test")
2143
2313
    parser.add_argument("--debug", action="store_true",
2144
2314
                        help="Debug mode; run in foreground and log"
2145
 
                        " to terminal")
 
2315
                        " to terminal", default=None)
2146
2316
    parser.add_argument("--debuglevel", metavar="LEVEL",
2147
2317
                        help="Debug level for stdout output")
2148
2318
    parser.add_argument("--priority", help="GnuTLS"
2155
2325
                        " files")
2156
2326
    parser.add_argument("--no-dbus", action="store_false",
2157
2327
                        dest="use_dbus", help="Do not provide D-Bus"
2158
 
                        " system bus interface")
 
2328
                        " system bus interface", default=None)
2159
2329
    parser.add_argument("--no-ipv6", action="store_false",
2160
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2330
                        dest="use_ipv6", help="Do not use IPv6",
 
2331
                        default=None)
2161
2332
    parser.add_argument("--no-restore", action="store_false",
2162
2333
                        dest="restore", help="Do not restore stored"
2163
 
                        " state")
 
2334
                        " state", default=None)
 
2335
    parser.add_argument("--socket", type=int,
 
2336
                        help="Specify a file descriptor to a network"
 
2337
                        " socket to use instead of creating one")
2164
2338
    parser.add_argument("--statedir", metavar="DIR",
2165
2339
                        help="Directory to save/restore state in")
 
2340
    parser.add_argument("--foreground", action="store_true",
 
2341
                        help="Run in foreground", default=None)
 
2342
    parser.add_argument("--no-zeroconf", action="store_false",
 
2343
                        dest="zeroconf", help="Do not use Zeroconf",
 
2344
                        default=None)
2166
2345
    
2167
2346
    options = parser.parse_args()
2168
2347
    
2169
2348
    if options.check:
2170
2349
        import doctest
2171
 
        doctest.testmod()
2172
 
        sys.exit()
 
2350
        fail_count, test_count = doctest.testmod()
 
2351
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2173
2352
    
2174
2353
    # Default values for config file for server-global settings
2175
2354
    server_defaults = { "interface": "",
2177
2356
                        "port": "",
2178
2357
                        "debug": "False",
2179
2358
                        "priority":
2180
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2359
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2360
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2181
2361
                        "servicename": "Mandos",
2182
2362
                        "use_dbus": "True",
2183
2363
                        "use_ipv6": "True",
2184
2364
                        "debuglevel": "",
2185
2365
                        "restore": "True",
2186
 
                        "statedir": "/var/lib/mandos"
 
2366
                        "socket": "",
 
2367
                        "statedir": "/var/lib/mandos",
 
2368
                        "foreground": "False",
 
2369
                        "zeroconf": "True",
2187
2370
                        }
2188
2371
    
2189
2372
    # Parse config file for server-global settings
2194
2377
    # Convert the SafeConfigParser object to a dict
2195
2378
    server_settings = server_config.defaults()
2196
2379
    # Use the appropriate methods on the non-string config options
2197
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2380
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2198
2381
        server_settings[option] = server_config.getboolean("DEFAULT",
2199
2382
                                                           option)
2200
2383
    if server_settings["port"]:
2201
2384
        server_settings["port"] = server_config.getint("DEFAULT",
2202
2385
                                                       "port")
 
2386
    if server_settings["socket"]:
 
2387
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2388
                                                         "socket")
 
2389
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2390
        # over with an opened os.devnull.  But we don't want this to
 
2391
        # happen with a supplied network socket.
 
2392
        if 0 <= server_settings["socket"] <= 2:
 
2393
            server_settings["socket"] = os.dup(server_settings
 
2394
                                               ["socket"])
2203
2395
    del server_config
2204
2396
    
2205
2397
    # Override the settings from the config file with command line
2207
2399
    for option in ("interface", "address", "port", "debug",
2208
2400
                   "priority", "servicename", "configdir",
2209
2401
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2210
 
                   "statedir"):
 
2402
                   "statedir", "socket", "foreground", "zeroconf"):
2211
2403
        value = getattr(options, option)
2212
2404
        if value is not None:
2213
2405
            server_settings[option] = value
2214
2406
    del options
2215
2407
    # Force all strings to be unicode
2216
2408
    for option in server_settings.keys():
2217
 
        if type(server_settings[option]) is str:
2218
 
            server_settings[option] = unicode(server_settings[option])
 
2409
        if isinstance(server_settings[option], bytes):
 
2410
            server_settings[option] = (server_settings[option]
 
2411
                                       .decode("utf-8"))
 
2412
    # Force all boolean options to be boolean
 
2413
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2414
                   "foreground", "zeroconf"):
 
2415
        server_settings[option] = bool(server_settings[option])
 
2416
    # Debug implies foreground
 
2417
    if server_settings["debug"]:
 
2418
        server_settings["foreground"] = True
2219
2419
    # Now we have our good server settings in "server_settings"
2220
2420
    
2221
2421
    ##################################################################
2222
2422
    
 
2423
    if (not server_settings["zeroconf"] and
 
2424
        not (server_settings["port"]
 
2425
             or server_settings["socket"] != "")):
 
2426
            parser.error("Needs port or socket to work without"
 
2427
                         " Zeroconf")
 
2428
    
2223
2429
    # For convenience
2224
2430
    debug = server_settings["debug"]
2225
2431
    debuglevel = server_settings["debuglevel"]
2227
2433
    use_ipv6 = server_settings["use_ipv6"]
2228
2434
    stored_state_path = os.path.join(server_settings["statedir"],
2229
2435
                                     stored_state_file)
 
2436
    foreground = server_settings["foreground"]
 
2437
    zeroconf = server_settings["zeroconf"]
2230
2438
    
2231
2439
    if debug:
2232
2440
        initlogger(debug, logging.DEBUG)
2239
2447
    
2240
2448
    if server_settings["servicename"] != "Mandos":
2241
2449
        syslogger.setFormatter(logging.Formatter
2242
 
                               ('Mandos ({0}) [%(process)d]:'
 
2450
                               ('Mandos ({}) [%(process)d]:'
2243
2451
                                ' %(levelname)s: %(message)s'
2244
2452
                                .format(server_settings
2245
2453
                                        ["servicename"])))
2253
2461
    global mandos_dbus_service
2254
2462
    mandos_dbus_service = None
2255
2463
    
 
2464
    socketfd = None
 
2465
    if server_settings["socket"] != "":
 
2466
        socketfd = server_settings["socket"]
2256
2467
    tcp_server = MandosServer((server_settings["address"],
2257
2468
                               server_settings["port"]),
2258
2469
                              ClientHandler,
2261
2472
                              use_ipv6=use_ipv6,
2262
2473
                              gnutls_priority=
2263
2474
                              server_settings["priority"],
2264
 
                              use_dbus=use_dbus)
2265
 
    if not debug:
2266
 
        pidfilename = "/var/run/mandos.pid"
 
2475
                              use_dbus=use_dbus,
 
2476
                              socketfd=socketfd)
 
2477
    if not foreground:
 
2478
        pidfilename = "/run/mandos.pid"
 
2479
        if not os.path.isdir("/run/."):
 
2480
            pidfilename = "/var/run/mandos.pid"
 
2481
        pidfile = None
2267
2482
        try:
2268
2483
            pidfile = open(pidfilename, "w")
2269
2484
        except IOError as e:
2284
2499
        os.setgid(gid)
2285
2500
        os.setuid(uid)
2286
2501
    except OSError as error:
2287
 
        if error[0] != errno.EPERM:
2288
 
            raise error
 
2502
        if error.errno != errno.EPERM:
 
2503
            raise
2289
2504
    
2290
2505
    if debug:
2291
2506
        # Enable all possible GnuTLS debugging
2308
2523
            os.close(null)
2309
2524
    
2310
2525
    # Need to fork before connecting to D-Bus
2311
 
    if not debug:
 
2526
    if not foreground:
2312
2527
        # Close all input and output, do double fork, etc.
2313
2528
        daemon()
2314
2529
    
 
2530
    # multiprocessing will use threads, so before we use gobject we
 
2531
    # need to inform gobject that threads will be used.
2315
2532
    gobject.threads_init()
2316
2533
    
2317
2534
    global main_loop
2332
2549
            use_dbus = False
2333
2550
            server_settings["use_dbus"] = False
2334
2551
            tcp_server.use_dbus = False
2335
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2336
 
    service = AvahiServiceToSyslog(name =
2337
 
                                   server_settings["servicename"],
2338
 
                                   servicetype = "_mandos._tcp",
2339
 
                                   protocol = protocol, bus = bus)
2340
 
    if server_settings["interface"]:
2341
 
        service.interface = (if_nametoindex
2342
 
                             (str(server_settings["interface"])))
 
2552
    if zeroconf:
 
2553
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2554
        service = AvahiServiceToSyslog(name =
 
2555
                                       server_settings["servicename"],
 
2556
                                       servicetype = "_mandos._tcp",
 
2557
                                       protocol = protocol, bus = bus)
 
2558
        if server_settings["interface"]:
 
2559
            service.interface = (if_nametoindex
 
2560
                                 (server_settings["interface"]
 
2561
                                  .encode("utf-8")))
2343
2562
    
2344
2563
    global multiprocessing_manager
2345
2564
    multiprocessing_manager = multiprocessing.Manager()
2352
2571
    old_client_settings = {}
2353
2572
    clients_data = {}
2354
2573
    
 
2574
    # This is used to redirect stdout and stderr for checker processes
 
2575
    global wnull
 
2576
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2577
    # Only used if server is running in foreground but not in debug
 
2578
    # mode
 
2579
    if debug or not foreground:
 
2580
        wnull.close()
 
2581
    
2355
2582
    # Get client data and settings from last running state.
2356
2583
    if server_settings["restore"]:
2357
2584
        try:
2361
2588
            os.remove(stored_state_path)
2362
2589
        except IOError as e:
2363
2590
            if e.errno == errno.ENOENT:
2364
 
                logger.warning("Could not load persistent state: {0}"
 
2591
                logger.warning("Could not load persistent state: {}"
2365
2592
                                .format(os.strerror(e.errno)))
2366
2593
            else:
2367
2594
                logger.critical("Could not load persistent state:",
2372
2599
                           "EOFError:", exc_info=e)
2373
2600
    
2374
2601
    with PGPEngine() as pgp:
2375
 
        for client_name, client in clients_data.iteritems():
 
2602
        for client_name, client in clients_data.items():
 
2603
            # Skip removed clients
 
2604
            if client_name not in client_settings:
 
2605
                continue
 
2606
            
2376
2607
            # Decide which value to use after restoring saved state.
2377
2608
            # We have three different values: Old config file,
2378
2609
            # new config file, and saved state.
2399
2630
                if datetime.datetime.utcnow() >= client["expires"]:
2400
2631
                    if not client["last_checked_ok"]:
2401
2632
                        logger.warning(
2402
 
                            "disabling client {0} - Client never "
 
2633
                            "disabling client {} - Client never "
2403
2634
                            "performed a successful checker"
2404
2635
                            .format(client_name))
2405
2636
                        client["enabled"] = False
2406
2637
                    elif client["last_checker_status"] != 0:
2407
2638
                        logger.warning(
2408
 
                            "disabling client {0} - Client "
2409
 
                            "last checker failed with error code {1}"
 
2639
                            "disabling client {} - Client last"
 
2640
                            " checker failed with error code {}"
2410
2641
                            .format(client_name,
2411
2642
                                    client["last_checker_status"]))
2412
2643
                        client["enabled"] = False
2415
2646
                                             .utcnow()
2416
2647
                                             + client["timeout"])
2417
2648
                        logger.debug("Last checker succeeded,"
2418
 
                                     " keeping {0} enabled"
 
2649
                                     " keeping {} enabled"
2419
2650
                                     .format(client_name))
2420
2651
            try:
2421
2652
                client["secret"] = (
2424
2655
                                ["secret"]))
2425
2656
            except PGPError:
2426
2657
                # If decryption fails, we use secret from new settings
2427
 
                logger.debug("Failed to decrypt {0} old secret"
 
2658
                logger.debug("Failed to decrypt {} old secret"
2428
2659
                             .format(client_name))
2429
2660
                client["secret"] = (
2430
2661
                    client_settings[client_name]["secret"])
2438
2669
        clients_data[client_name] = client_settings[client_name]
2439
2670
    
2440
2671
    # Create all client objects
2441
 
    for client_name, client in clients_data.iteritems():
 
2672
    for client_name, client in clients_data.items():
2442
2673
        tcp_server.clients[client_name] = client_class(
2443
 
            name = client_name, settings = client)
 
2674
            name = client_name, settings = client,
 
2675
            server_settings = server_settings)
2444
2676
    
2445
2677
    if not tcp_server.clients:
2446
2678
        logger.warning("No clients defined")
2447
2679
    
2448
 
    if not debug:
2449
 
        try:
2450
 
            with pidfile:
2451
 
                pid = os.getpid()
2452
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2453
 
            del pidfile
2454
 
        except IOError:
2455
 
            logger.error("Could not write to file %r with PID %d",
2456
 
                         pidfilename, pid)
2457
 
        except NameError:
2458
 
            # "pidfile" was never created
2459
 
            pass
 
2680
    if not foreground:
 
2681
        if pidfile is not None:
 
2682
            try:
 
2683
                with pidfile:
 
2684
                    pid = os.getpid()
 
2685
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2686
            except IOError:
 
2687
                logger.error("Could not write to file %r with PID %d",
 
2688
                             pidfilename, pid)
 
2689
        del pidfile
2460
2690
        del pidfilename
2461
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2462
2691
    
2463
2692
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2464
2693
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2505
2734
            def GetAllClientsWithProperties(self):
2506
2735
                "D-Bus method"
2507
2736
                return dbus.Dictionary(
2508
 
                    ((c.dbus_object_path, c.GetAll(""))
2509
 
                     for c in tcp_server.clients.itervalues()),
 
2737
                    { c.dbus_object_path: c.GetAll("")
 
2738
                      for c in tcp_server.clients.itervalues() },
2510
2739
                    signature="oa{sv}")
2511
2740
            
2512
2741
            @dbus.service.method(_interface, in_signature="o")
2529
2758
    
2530
2759
    def cleanup():
2531
2760
        "Cleanup function; run on exit"
2532
 
        service.cleanup()
 
2761
        if zeroconf:
 
2762
            service.cleanup()
2533
2763
        
2534
2764
        multiprocessing.active_children()
 
2765
        wnull.close()
2535
2766
        if not (tcp_server.clients or client_settings):
2536
2767
            return
2537
2768
        
2548
2779
                
2549
2780
                # A list of attributes that can not be pickled
2550
2781
                # + secret.
2551
 
                exclude = set(("bus", "changedstate", "secret",
2552
 
                               "checker"))
 
2782
                exclude = { "bus", "changedstate", "secret",
 
2783
                            "checker", "server_settings" }
2553
2784
                for name, typ in (inspect.getmembers
2554
2785
                                  (dbus.service.Object)):
2555
2786
                    exclude.add(name)
2564
2795
                del client_settings[client.name]["secret"]
2565
2796
        
2566
2797
        try:
2567
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2568
 
                                                prefix="clients-",
2569
 
                                                dir=os.path.dirname
2570
 
                                                (stored_state_path))
2571
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2798
            with (tempfile.NamedTemporaryFile
 
2799
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2800
                   dir=os.path.dirname(stored_state_path),
 
2801
                   delete=False)) as stored_state:
2572
2802
                pickle.dump((clients, client_settings), stored_state)
 
2803
                tempname=stored_state.name
2573
2804
            os.rename(tempname, stored_state_path)
2574
2805
        except (IOError, OSError) as e:
2575
2806
            if not debug:
2578
2809
                except NameError:
2579
2810
                    pass
2580
2811
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2581
 
                logger.warning("Could not save persistent state: {0}"
 
2812
                logger.warning("Could not save persistent state: {}"
2582
2813
                               .format(os.strerror(e.errno)))
2583
2814
            else:
2584
2815
                logger.warning("Could not save persistent state:",
2585
2816
                               exc_info=e)
2586
 
                raise e
 
2817
                raise
2587
2818
        
2588
2819
        # Delete all clients, and settings from config
2589
2820
        while tcp_server.clients:
2613
2844
    tcp_server.server_activate()
2614
2845
    
2615
2846
    # Find out what port we got
2616
 
    service.port = tcp_server.socket.getsockname()[1]
 
2847
    if zeroconf:
 
2848
        service.port = tcp_server.socket.getsockname()[1]
2617
2849
    if use_ipv6:
2618
2850
        logger.info("Now listening on address %r, port %d,"
2619
2851
                    " flowinfo %d, scope_id %d",
2625
2857
    #service.interface = tcp_server.socket.getsockname()[3]
2626
2858
    
2627
2859
    try:
2628
 
        # From the Avahi example code
2629
 
        try:
2630
 
            service.activate()
2631
 
        except dbus.exceptions.DBusException as error:
2632
 
            logger.critical("D-Bus Exception", exc_info=error)
2633
 
            cleanup()
2634
 
            sys.exit(1)
2635
 
        # End of Avahi example code
 
2860
        if zeroconf:
 
2861
            # From the Avahi example code
 
2862
            try:
 
2863
                service.activate()
 
2864
            except dbus.exceptions.DBusException as error:
 
2865
                logger.critical("D-Bus Exception", exc_info=error)
 
2866
                cleanup()
 
2867
                sys.exit(1)
 
2868
            # End of Avahi example code
2636
2869
        
2637
2870
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2638
2871
                             lambda *args, **kwargs: