/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2013-12-31 16:02:18 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131231160218-plmmb0o0iifkd5l2
Specify BusName in systemd service file.

* mandos.service (BusName): Uncommented.

Show diffs side-by-side

added added

removed removed

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