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