/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

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

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

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

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

Show diffs side-by-side

added added

removed removed

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