/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-23 12:07:07 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150523120707-t5fq0brh2kxkvw8g
mandos: Some more minor changes to prepare for Python 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-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
72
81
 
73
82
import dbus
74
83
import dbus.service
75
 
import gobject
 
84
try:
 
85
    import gobject
 
86
except ImportError:
 
87
    from gi.repository import GObject as gobject
76
88
import avahi
77
89
from dbus.mainloop.glib import DBusGMainLoop
78
90
import ctypes
79
91
import ctypes.util
80
92
import xml.dom.minidom
81
93
import inspect
82
 
import GnuPGInterface
83
94
 
84
95
try:
85
96
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
89
100
    except ImportError:
90
101
        SO_BINDTODEVICE = None
91
102
 
92
 
version = "1.6.0"
 
103
if sys.version_info.major == 2:
 
104
    str = unicode
 
105
 
 
106
version = "1.6.9"
93
107
stored_state_file = "clients.pickle"
94
108
 
95
109
logger = logging.getLogger()
96
 
syslogger = (logging.handlers.SysLogHandler
97
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
 
              address = str("/dev/log")))
 
110
syslogger = None
99
111
 
100
112
try:
101
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
102
 
                      (ctypes.util.find_library("c"))
103
 
                      .if_nametoindex)
 
113
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
114
        ctypes.util.find_library("c")).if_nametoindex
104
115
except (OSError, AttributeError):
 
116
    
105
117
    def if_nametoindex(interface):
106
118
        "Get an interface index the hard way, i.e. using fcntl()"
107
119
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
120
        with contextlib.closing(socket.socket()) as s:
109
121
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(str("16s16x"),
111
 
                                            interface))
112
 
        interface_index = struct.unpack(str("I"),
113
 
                                        ifreq[16:20])[0]
 
122
                                struct.pack(b"16s16x", interface))
 
123
        interface_index = struct.unpack("I", ifreq[16:20])[0]
114
124
        return interface_index
115
125
 
116
126
 
117
127
def initlogger(debug, level=logging.WARNING):
118
128
    """init logger and add loglevel"""
119
129
    
 
130
    global syslogger
 
131
    syslogger = (logging.handlers.SysLogHandler(
 
132
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
133
        address = "/dev/log"))
120
134
    syslogger.setFormatter(logging.Formatter
121
135
                           ('Mandos [%(process)d]: %(levelname)s:'
122
136
                            ' %(message)s'))
139
153
 
140
154
class PGPEngine(object):
141
155
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
156
    
142
157
    def __init__(self):
143
 
        self.gnupg = GnuPGInterface.GnuPG()
144
158
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
145
 
        self.gnupg = GnuPGInterface.GnuPG()
146
 
        self.gnupg.options.meta_interactive = False
147
 
        self.gnupg.options.homedir = self.tempdir
148
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
149
 
                                              '--quiet',
150
 
                                              '--no-use-agent'])
 
159
        self.gnupgargs = ['--batch',
 
160
                          '--home', self.tempdir,
 
161
                          '--force-mdc',
 
162
                          '--quiet',
 
163
                          '--no-use-agent']
151
164
    
152
165
    def __enter__(self):
153
166
        return self
175
188
    def password_encode(self, password):
176
189
        # Passphrase can not be empty and can not contain newlines or
177
190
        # NUL bytes.  So we prefix it and hex encode it.
178
 
        return b"mandos" + binascii.hexlify(password)
 
191
        encoded = b"mandos" + binascii.hexlify(password)
 
192
        if len(encoded) > 2048:
 
193
            # GnuPG can't handle long passwords, so encode differently
 
194
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
195
                       .replace(b"\n", b"\\n")
 
196
                       .replace(b"\0", b"\\x00"))
 
197
        return encoded
179
198
    
180
199
    def encrypt(self, data, password):
181
 
        self.gnupg.passphrase = self.password_encode(password)
182
 
        with open(os.devnull, "w") as devnull:
183
 
            try:
184
 
                proc = self.gnupg.run(['--symmetric'],
185
 
                                      create_fhs=['stdin', 'stdout'],
186
 
                                      attach_fhs={'stderr': devnull})
187
 
                with contextlib.closing(proc.handles['stdin']) as f:
188
 
                    f.write(data)
189
 
                with contextlib.closing(proc.handles['stdout']) as f:
190
 
                    ciphertext = f.read()
191
 
                proc.wait()
192
 
            except IOError as e:
193
 
                raise PGPError(e)
194
 
        self.gnupg.passphrase = None
 
200
        passphrase = self.password_encode(password)
 
201
        with tempfile.NamedTemporaryFile(
 
202
                dir=self.tempdir) as passfile:
 
203
            passfile.write(passphrase)
 
204
            passfile.flush()
 
205
            proc = subprocess.Popen(['gpg', '--symmetric',
 
206
                                     '--passphrase-file',
 
207
                                     passfile.name]
 
208
                                    + self.gnupgargs,
 
209
                                    stdin = subprocess.PIPE,
 
210
                                    stdout = subprocess.PIPE,
 
211
                                    stderr = subprocess.PIPE)
 
212
            ciphertext, err = proc.communicate(input = data)
 
213
        if proc.returncode != 0:
 
214
            raise PGPError(err)
195
215
        return ciphertext
196
216
    
197
217
    def decrypt(self, data, password):
198
 
        self.gnupg.passphrase = self.password_encode(password)
199
 
        with open(os.devnull, "w") as devnull:
200
 
            try:
201
 
                proc = self.gnupg.run(['--decrypt'],
202
 
                                      create_fhs=['stdin', 'stdout'],
203
 
                                      attach_fhs={'stderr': devnull})
204
 
                with contextlib.closing(proc.handles['stdin']) as f:
205
 
                    f.write(data)
206
 
                with contextlib.closing(proc.handles['stdout']) as f:
207
 
                    decrypted_plaintext = f.read()
208
 
                proc.wait()
209
 
            except IOError as e:
210
 
                raise PGPError(e)
211
 
        self.gnupg.passphrase = None
 
218
        passphrase = self.password_encode(password)
 
219
        with tempfile.NamedTemporaryFile(
 
220
                dir = self.tempdir) as passfile:
 
221
            passfile.write(passphrase)
 
222
            passfile.flush()
 
223
            proc = subprocess.Popen(['gpg', '--decrypt',
 
224
                                     '--passphrase-file',
 
225
                                     passfile.name]
 
226
                                    + self.gnupgargs,
 
227
                                    stdin = subprocess.PIPE,
 
228
                                    stdout = subprocess.PIPE,
 
229
                                    stderr = subprocess.PIPE)
 
230
            decrypted_plaintext, err = proc.communicate(input = data)
 
231
        if proc.returncode != 0:
 
232
            raise PGPError(err)
212
233
        return decrypted_plaintext
213
234
 
214
235
 
215
236
class AvahiError(Exception):
216
237
    def __init__(self, value, *args, **kwargs):
217
238
        self.value = value
218
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
219
 
    def __unicode__(self):
220
 
        return unicode(repr(self.value))
 
239
        return super(AvahiError, self).__init__(value, *args,
 
240
                                                **kwargs)
 
241
 
221
242
 
222
243
class AvahiServiceError(AvahiError):
223
244
    pass
224
245
 
 
246
 
225
247
class AvahiGroupError(AvahiError):
226
248
    pass
227
249
 
234
256
               Used to optionally bind to the specified interface.
235
257
    name: string; Example: 'Mandos'
236
258
    type: string; Example: '_mandos._tcp'.
237
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
259
     See <https://www.iana.org/assignments/service-names-port-numbers>
238
260
    port: integer; what port to announce
239
261
    TXT: list of strings; TXT record for the service
240
262
    domain: string; Domain to publish on, default to .local if empty.
247
269
    bus: dbus.SystemBus()
248
270
    """
249
271
    
250
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
 
                 servicetype = None, port = None, TXT = None,
252
 
                 domain = "", host = "", max_renames = 32768,
253
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
272
    def __init__(self,
 
273
                 interface = avahi.IF_UNSPEC,
 
274
                 name = None,
 
275
                 servicetype = None,
 
276
                 port = None,
 
277
                 TXT = None,
 
278
                 domain = "",
 
279
                 host = "",
 
280
                 max_renames = 32768,
 
281
                 protocol = avahi.PROTO_UNSPEC,
 
282
                 bus = None):
254
283
        self.interface = interface
255
284
        self.name = name
256
285
        self.type = servicetype
266
295
        self.bus = bus
267
296
        self.entry_group_state_changed_match = None
268
297
    
269
 
    def rename(self):
 
298
    def rename(self, remove=True):
270
299
        """Derived from the Avahi example code"""
271
300
        if self.rename_count >= self.max_renames:
272
301
            logger.critical("No suitable Zeroconf service name found"
273
302
                            " after %i retries, exiting.",
274
303
                            self.rename_count)
275
304
            raise AvahiServiceError("Too many renames")
276
 
        self.name = unicode(self.server
277
 
                            .GetAlternativeServiceName(self.name))
 
305
        self.name = str(
 
306
            self.server.GetAlternativeServiceName(self.name))
 
307
        self.rename_count += 1
278
308
        logger.info("Changing Zeroconf service name to %r ...",
279
309
                    self.name)
280
 
        self.remove()
 
310
        if remove:
 
311
            self.remove()
281
312
        try:
282
313
            self.add()
283
314
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
285
 
            self.cleanup()
286
 
            os._exit(1)
287
 
        self.rename_count += 1
 
315
            if (error.get_dbus_name()
 
316
                == "org.freedesktop.Avahi.CollisionError"):
 
317
                logger.info("Local Zeroconf service name collision.")
 
318
                return self.rename(remove=False)
 
319
            else:
 
320
                logger.critical("D-Bus Exception", exc_info=error)
 
321
                self.cleanup()
 
322
                os._exit(1)
288
323
    
289
324
    def remove(self):
290
325
        """Derived from the Avahi example code"""
328
363
            self.rename()
329
364
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
365
            logger.critical("Avahi: Error in group state changed %s",
331
 
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
 
366
                            str(error))
 
367
            raise AvahiGroupError("State changed: {!s}".format(error))
334
368
    
335
369
    def cleanup(self):
336
370
        """Derived from the Avahi example code"""
346
380
    def server_state_changed(self, state, error=None):
347
381
        """Derived from the Avahi example code"""
348
382
        logger.debug("Avahi server state change: %i", state)
349
 
        bad_states = { avahi.SERVER_INVALID:
350
 
                           "Zeroconf server invalid",
351
 
                       avahi.SERVER_REGISTERING: None,
352
 
                       avahi.SERVER_COLLISION:
353
 
                           "Zeroconf server name collision",
354
 
                       avahi.SERVER_FAILURE:
355
 
                           "Zeroconf server failure" }
 
383
        bad_states = {
 
384
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
385
            avahi.SERVER_REGISTERING: None,
 
386
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
387
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
388
        }
356
389
        if state in bad_states:
357
390
            if bad_states[state] is not None:
358
391
                if error is None:
377
410
                                    follow_name_owner_changes=True),
378
411
                avahi.DBUS_INTERFACE_SERVER)
379
412
        self.server.connect_to_signal("StateChanged",
380
 
                                 self.server_state_changed)
 
413
                                      self.server_state_changed)
381
414
        self.server_state_changed(self.server.GetState())
382
415
 
383
416
 
384
417
class AvahiServiceToSyslog(AvahiService):
385
 
    def rename(self):
 
418
    def rename(self, *args, **kwargs):
386
419
        """Add the new name to the syslog messages"""
387
 
        ret = AvahiService.rename(self)
388
 
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
420
        ret = AvahiService.rename(self, *args, **kwargs)
 
421
        syslogger.setFormatter(logging.Formatter(
 
422
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
423
            .format(self.name)))
392
424
        return ret
393
425
 
394
426
 
395
 
def timedelta_to_milliseconds(td):
396
 
    "Convert a datetime.timedelta() to milliseconds"
397
 
    return ((td.days * 24 * 60 * 60 * 1000)
398
 
            + (td.seconds * 1000)
399
 
            + (td.microseconds // 1000))
400
 
 
401
 
 
402
427
class Client(object):
403
428
    """A representation of a client host served by this server.
404
429
    
440
465
    runtime_expansions: Allowed attributes for runtime expansion.
441
466
    expires:    datetime.datetime(); time (UTC) when a client will be
442
467
                disabled, or None
 
468
    server_settings: The server_settings dict from main()
443
469
    """
444
470
    
445
471
    runtime_expansions = ("approval_delay", "approval_duration",
447
473
                          "fingerprint", "host", "interval",
448
474
                          "last_approval_request", "last_checked_ok",
449
475
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
453
 
                        "checker": "fping -q -- %%(host)s",
454
 
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
457
 
                        "approved_by_default": "True",
458
 
                        "enabled": "True",
459
 
                        }
460
 
    
461
 
    def timeout_milliseconds(self):
462
 
        "Return the 'timeout' attribute in milliseconds"
463
 
        return timedelta_to_milliseconds(self.timeout)
464
 
    
465
 
    def extended_timeout_milliseconds(self):
466
 
        "Return the 'extended_timeout' attribute in milliseconds"
467
 
        return timedelta_to_milliseconds(self.extended_timeout)
468
 
    
469
 
    def interval_milliseconds(self):
470
 
        "Return the 'interval' attribute in milliseconds"
471
 
        return timedelta_to_milliseconds(self.interval)
472
 
    
473
 
    def approval_delay_milliseconds(self):
474
 
        return timedelta_to_milliseconds(self.approval_delay)
 
476
    client_defaults = {
 
477
        "timeout": "PT5M",
 
478
        "extended_timeout": "PT15M",
 
479
        "interval": "PT2M",
 
480
        "checker": "fping -q -- %%(host)s",
 
481
        "host": "",
 
482
        "approval_delay": "PT0S",
 
483
        "approval_duration": "PT1S",
 
484
        "approved_by_default": "True",
 
485
        "enabled": "True",
 
486
    }
475
487
    
476
488
    @staticmethod
477
489
    def config_parser(config):
493
505
            client["enabled"] = config.getboolean(client_name,
494
506
                                                  "enabled")
495
507
            
 
508
            # Uppercase and remove spaces from fingerprint for later
 
509
            # comparison purposes with return value from the
 
510
            # fingerprint() function
496
511
            client["fingerprint"] = (section["fingerprint"].upper()
497
512
                                     .replace(" ", ""))
498
513
            if "secret" in section:
503
518
                          "rb") as secfile:
504
519
                    client["secret"] = secfile.read()
505
520
            else:
506
 
                raise TypeError("No secret or secfile for section {0}"
 
521
                raise TypeError("No secret or secfile for section {}"
507
522
                                .format(section))
508
523
            client["timeout"] = string_to_delta(section["timeout"])
509
524
            client["extended_timeout"] = string_to_delta(
520
535
        
521
536
        return settings
522
537
    
523
 
    def __init__(self, settings, name = None):
 
538
    def __init__(self, settings, name = None, server_settings=None):
524
539
        self.name = name
 
540
        if server_settings is None:
 
541
            server_settings = {}
 
542
        self.server_settings = server_settings
525
543
        # adding all client settings
526
 
        for setting, value in settings.iteritems():
 
544
        for setting, value in settings.items():
527
545
            setattr(self, setting, value)
528
546
        
529
547
        if self.enabled:
537
555
            self.expires = None
538
556
        
539
557
        logger.debug("Creating client %r", self.name)
540
 
        # Uppercase and remove spaces from fingerprint for later
541
 
        # comparison purposes with return value from the fingerprint()
542
 
        # function
543
558
        logger.debug("  Fingerprint: %s", self.fingerprint)
544
559
        self.created = settings.get("created",
545
560
                                    datetime.datetime.utcnow())
552
567
        self.current_checker_command = None
553
568
        self.approved = None
554
569
        self.approvals_pending = 0
555
 
        self.changedstate = (multiprocessing_manager
556
 
                             .Condition(multiprocessing_manager
557
 
                                        .Lock()))
558
 
        self.client_structure = [attr for attr in
559
 
                                 self.__dict__.iterkeys()
 
570
        self.changedstate = multiprocessing_manager.Condition(
 
571
            multiprocessing_manager.Lock())
 
572
        self.client_structure = [attr
 
573
                                 for attr in self.__dict__.iterkeys()
560
574
                                 if not attr.startswith("_")]
561
575
        self.client_structure.append("client_structure")
562
576
        
563
 
        for name, t in inspect.getmembers(type(self),
564
 
                                          lambda obj:
565
 
                                              isinstance(obj,
566
 
                                                         property)):
 
577
        for name, t in inspect.getmembers(
 
578
                type(self), lambda obj: isinstance(obj, property)):
567
579
            if not name.startswith("_"):
568
580
                self.client_structure.append(name)
569
581
    
611
623
        # and every interval from then on.
612
624
        if self.checker_initiator_tag is not None:
613
625
            gobject.source_remove(self.checker_initiator_tag)
614
 
        self.checker_initiator_tag = (gobject.timeout_add
615
 
                                      (self.interval_milliseconds(),
616
 
                                       self.start_checker))
 
626
        self.checker_initiator_tag = gobject.timeout_add(
 
627
            int(self.interval.total_seconds() * 1000),
 
628
            self.start_checker)
617
629
        # Schedule a disable() when 'timeout' has passed
618
630
        if self.disable_initiator_tag is not None:
619
631
            gobject.source_remove(self.disable_initiator_tag)
620
 
        self.disable_initiator_tag = (gobject.timeout_add
621
 
                                   (self.timeout_milliseconds(),
622
 
                                    self.disable))
 
632
        self.disable_initiator_tag = gobject.timeout_add(
 
633
            int(self.timeout.total_seconds() * 1000), self.disable)
623
634
        # Also start a new checker *right now*.
624
635
        self.start_checker()
625
636
    
634
645
                            vars(self))
635
646
                self.checked_ok()
636
647
            else:
637
 
                logger.info("Checker for %(name)s failed",
638
 
                            vars(self))
 
648
                logger.info("Checker for %(name)s failed", vars(self))
639
649
        else:
640
650
            self.last_checker_status = -1
641
651
            logger.warning("Checker for %(name)s crashed?",
655
665
            gobject.source_remove(self.disable_initiator_tag)
656
666
            self.disable_initiator_tag = None
657
667
        if getattr(self, "enabled", False):
658
 
            self.disable_initiator_tag = (gobject.timeout_add
659
 
                                          (timedelta_to_milliseconds
660
 
                                           (timeout), self.disable))
 
668
            self.disable_initiator_tag = gobject.timeout_add(
 
669
                int(timeout.total_seconds() * 1000), self.disable)
661
670
            self.expires = datetime.datetime.utcnow() + timeout
662
671
    
663
672
    def need_approval(self):
680
689
        # If a checker exists, make sure it is not a zombie
681
690
        try:
682
691
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
683
 
        except (AttributeError, OSError) as error:
684
 
            if (isinstance(error, OSError)
685
 
                and error.errno != errno.ECHILD):
686
 
                raise error
 
692
        except AttributeError:
 
693
            pass
 
694
        except OSError as error:
 
695
            if error.errno != errno.ECHILD:
 
696
                raise
687
697
        else:
688
698
            if pid:
689
699
                logger.warning("Checker was a zombie")
693
703
        # Start a new checker if needed
694
704
        if self.checker is None:
695
705
            # Escape attributes for the shell
696
 
            escaped_attrs = dict(
697
 
                (attr, re.escape(unicode(getattr(self, attr))))
698
 
                for attr in
699
 
                self.runtime_expansions)
 
706
            escaped_attrs = {
 
707
                attr: re.escape(str(getattr(self, attr)))
 
708
                for attr in self.runtime_expansions }
700
709
            try:
701
710
                command = self.checker_command % escaped_attrs
702
711
            except TypeError as error:
703
712
                logger.error('Could not format string "%s"',
704
 
                             self.checker_command, exc_info=error)
705
 
                return True # Try again later
 
713
                             self.checker_command,
 
714
                             exc_info=error)
 
715
                return True     # Try again later
706
716
            self.current_checker_command = command
707
717
            try:
708
 
                logger.info("Starting checker %r for %s",
709
 
                            command, self.name)
 
718
                logger.info("Starting checker %r for %s", command,
 
719
                            self.name)
710
720
                # We don't need to redirect stdout and stderr, since
711
721
                # in normal mode, that is already done by daemon(),
712
722
                # and in debug mode we don't want to.  (Stdin is
713
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 })
714
732
                self.checker = subprocess.Popen(command,
715
733
                                                close_fds=True,
716
 
                                                shell=True, cwd="/")
 
734
                                                shell=True,
 
735
                                                cwd="/",
 
736
                                                **popen_args)
717
737
            except OSError as error:
718
738
                logger.error("Failed to start subprocess",
719
739
                             exc_info=error)
720
 
            self.checker_callback_tag = (gobject.child_watch_add
721
 
                                         (self.checker.pid,
722
 
                                          self.checker_callback,
723
 
                                          data=command))
 
740
                return True
 
741
            self.checker_callback_tag = gobject.child_watch_add(
 
742
                self.checker.pid, self.checker_callback, data=command)
724
743
            # The checker may have completed before the gobject
725
744
            # watch was added.  Check for this.
726
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
745
            try:
 
746
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
747
            except OSError as error:
 
748
                if error.errno == errno.ECHILD:
 
749
                    # This should never happen
 
750
                    logger.error("Child process vanished",
 
751
                                 exc_info=error)
 
752
                    return True
 
753
                raise
727
754
            if pid:
728
755
                gobject.source_remove(self.checker_callback_tag)
729
756
                self.checker_callback(pid, status, command)
749
776
        self.checker = None
750
777
 
751
778
 
752
 
def dbus_service_property(dbus_interface, signature="v",
753
 
                          access="readwrite", byte_arrays=False):
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
754
783
    """Decorators for marking methods of a DBusObjectWithProperties to
755
784
    become properties on the D-Bus.
756
785
    
765
794
    # "Set" method, so we fail early here:
766
795
    if byte_arrays and signature != "ay":
767
796
        raise ValueError("Byte arrays not supported for non-'ay'"
768
 
                         " signature {0!r}".format(signature))
 
797
                         " signature {!r}".format(signature))
 
798
    
769
799
    def decorator(func):
770
800
        func._dbus_is_property = True
771
801
        func._dbus_interface = dbus_interface
776
806
            func._dbus_name = func._dbus_name[:-14]
777
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
778
808
        return func
 
809
    
779
810
    return decorator
780
811
 
781
812
 
790
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
791
822
                    "false"}
792
823
    """
 
824
    
793
825
    def decorator(func):
794
826
        func._dbus_is_interface = True
795
827
        func._dbus_interface = dbus_interface
796
828
        func._dbus_name = dbus_interface
797
829
        return func
 
830
    
798
831
    return decorator
799
832
 
800
833
 
802
835
    """Decorator to annotate D-Bus methods, signals or properties
803
836
    Usage:
804
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
805
841
    @dbus_service_property("org.example.Interface", signature="b",
806
842
                           access="r")
807
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
808
 
                        "org.freedesktop.DBus.Property."
809
 
                        "EmitsChangedSignal": "false"})
810
843
    def Property_dbus_property(self):
811
844
        return dbus.Boolean(False)
812
845
    """
 
846
    
813
847
    def decorator(func):
814
848
        func._dbus_annotations = annotations
815
849
        return func
 
850
    
816
851
    return decorator
817
852
 
818
853
 
819
854
class DBusPropertyException(dbus.exceptions.DBusException):
820
855
    """A base class for D-Bus property-related exceptions
821
856
    """
822
 
    def __unicode__(self):
823
 
        return unicode(str(self))
 
857
    pass
824
858
 
825
859
 
826
860
class DBusPropertyAccessException(DBusPropertyException):
850
884
        If called like _is_dbus_thing("method") it returns a function
851
885
        suitable for use as predicate to inspect.getmembers().
852
886
        """
853
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
887
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
854
888
                                   False)
855
889
    
856
890
    def _get_all_dbus_things(self, thing):
857
891
        """Returns a generator of (name, attribute) pairs
858
892
        """
859
 
        return ((getattr(athing.__get__(self), "_dbus_name",
860
 
                         name),
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
861
894
                 athing.__get__(self))
862
895
                for cls in self.__class__.__mro__
863
896
                for name, athing in
864
 
                inspect.getmembers(cls,
865
 
                                   self._is_dbus_thing(thing)))
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
866
898
    
867
899
    def _get_dbus_property(self, interface_name, property_name):
868
900
        """Returns a bound method if one exists which is a D-Bus
869
901
        property with the specified name and interface.
870
902
        """
871
 
        for cls in  self.__class__.__mro__:
872
 
            for name, value in (inspect.getmembers
873
 
                                (cls,
874
 
                                 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")):
875
906
                if (value._dbus_name == property_name
876
907
                    and value._dbus_interface == interface_name):
877
908
                    return value.__get__(self)
878
909
        
879
910
        # No such property
880
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
881
 
                                   + interface_name + "."
882
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
883
913
    
884
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
885
916
                         out_signature="v")
886
917
    def Get(self, interface_name, property_name):
887
918
        """Standard D-Bus property Get() method, see D-Bus standard.
905
936
            # The byte_arrays option is not supported yet on
906
937
            # signatures other than "ay".
907
938
            if prop._dbus_signature != "ay":
908
 
                raise ValueError
 
939
                raise ValueError("Byte arrays not supported for non-"
 
940
                                 "'ay' signature {!r}"
 
941
                                 .format(prop._dbus_signature))
909
942
            value = dbus.ByteArray(b''.join(chr(byte)
910
943
                                            for byte in value))
911
944
        prop(value)
912
945
    
913
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
914
948
                         out_signature="a{sv}")
915
949
    def GetAll(self, interface_name):
916
950
        """Standard D-Bus property GetAll() method, see D-Bus
931
965
            if not hasattr(value, "variant_level"):
932
966
                properties[name] = value
933
967
                continue
934
 
            properties[name] = type(value)(value, variant_level=
935
 
                                           value.variant_level+1)
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
936
970
        return dbus.Dictionary(properties, signature="sv")
937
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
    
938
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
939
981
                         out_signature="s",
940
982
                         path_keyword='object_path',
948
990
                                                   connection)
949
991
        try:
950
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
951
994
            def make_tag(document, name, prop):
952
995
                e = document.createElement("property")
953
996
                e.setAttribute("name", name)
954
997
                e.setAttribute("type", prop._dbus_signature)
955
998
                e.setAttribute("access", prop._dbus_access)
956
999
                return e
 
1000
            
957
1001
            for if_tag in document.getElementsByTagName("interface"):
958
1002
                # Add property tags
959
1003
                for tag in (make_tag(document, name, prop)
971
1015
                            if (name == tag.getAttribute("name")
972
1016
                                and prop._dbus_interface
973
1017
                                == if_tag.getAttribute("name")):
974
 
                                annots.update(getattr
975
 
                                              (prop,
976
 
                                               "_dbus_annotations",
977
 
                                               {}))
978
 
                        for name, value in annots.iteritems():
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
 
1020
                        for name, value in annots.items():
979
1021
                            ann_tag = document.createElement(
980
1022
                                "annotation")
981
1023
                            ann_tag.setAttribute("name", name)
984
1026
                # Add interface annotation tags
985
1027
                for annotation, value in dict(
986
1028
                    itertools.chain.from_iterable(
987
 
                        annotations().iteritems()
988
 
                        for name, annotations in
989
 
                        self._get_all_dbus_things("interface")
 
1029
                        annotations().items()
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
990
1032
                        if name == if_tag.getAttribute("name")
991
 
                        )).iteritems():
 
1033
                        )).items():
992
1034
                    ann_tag = document.createElement("annotation")
993
1035
                    ann_tag.setAttribute("name", annotation)
994
1036
                    ann_tag.setAttribute("value", value)
1021
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1022
1064
    if dt is None:
1023
1065
        return dbus.String("", variant_level = variant_level)
1024
 
    return dbus.String(dt.isoformat(),
1025
 
                       variant_level=variant_level)
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1026
1067
 
1027
1068
 
1028
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1048
1089
    (from DBusObjectWithProperties) and interfaces (from the
1049
1090
    dbus_interface_annotations decorator).
1050
1091
    """
 
1092
    
1051
1093
    def wrapper(cls):
1052
1094
        for orig_interface_name, alt_interface_name in (
1053
 
            alt_interface_names.iteritems()):
 
1095
                alt_interface_names.items()):
1054
1096
            attr = {}
1055
1097
            interface_names = set()
1056
1098
            # Go though all attributes of the class
1058
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
1059
1101
                # with the wrong interface name
1060
1102
                if (not hasattr(attribute, "_dbus_interface")
1061
 
                    or not attribute._dbus_interface
1062
 
                    .startswith(orig_interface_name)):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
1063
1105
                    continue
1064
1106
                # Create an alternate D-Bus interface name based on
1065
1107
                # the current name
1066
 
                alt_interface = (attribute._dbus_interface
1067
 
                                 .replace(orig_interface_name,
1068
 
                                          alt_interface_name))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
1069
1110
                interface_names.add(alt_interface)
1070
1111
                # Is this a D-Bus signal?
1071
1112
                if getattr(attribute, "_dbus_is_signal", False):
1072
 
                    # Extract the original non-method function by
1073
 
                    # black magic
 
1113
                    # Extract the original non-method undecorated
 
1114
                    # function by black magic
1074
1115
                    nonmethod_func = (dict(
1075
 
                            zip(attribute.func_code.co_freevars,
1076
 
                                attribute.__closure__))["func"]
1077
 
                                      .cell_contents)
 
1116
                        zip(attribute.func_code.co_freevars,
 
1117
                            attribute.__closure__))
 
1118
                                      ["func"].cell_contents)
1078
1119
                    # Create a new, but exactly alike, function
1079
1120
                    # object, and decorate it to be a new D-Bus signal
1080
1121
                    # with the alternate D-Bus interface name
1081
 
                    new_function = (dbus.service.signal
1082
 
                                    (alt_interface,
1083
 
                                     attribute._dbus_signature)
 
1122
                    new_function = (dbus.service.signal(
 
1123
                        alt_interface, attribute._dbus_signature)
1084
1124
                                    (types.FunctionType(
1085
 
                                nonmethod_func.func_code,
1086
 
                                nonmethod_func.func_globals,
1087
 
                                nonmethod_func.func_name,
1088
 
                                nonmethod_func.func_defaults,
1089
 
                                nonmethod_func.func_closure)))
 
1125
                                        nonmethod_func.func_code,
 
1126
                                        nonmethod_func.func_globals,
 
1127
                                        nonmethod_func.func_name,
 
1128
                                        nonmethod_func.func_defaults,
 
1129
                                        nonmethod_func.func_closure)))
1090
1130
                    # Copy annotations, if any
1091
1131
                    try:
1092
 
                        new_function._dbus_annotations = (
1093
 
                            dict(attribute._dbus_annotations))
 
1132
                        new_function._dbus_annotations = dict(
 
1133
                            attribute._dbus_annotations)
1094
1134
                    except AttributeError:
1095
1135
                        pass
1096
1136
                    # Define a creator of a function to call both the
1101
1141
                        """This function is a scope container to pass
1102
1142
                        func1 and func2 to the "call_both" function
1103
1143
                        outside of its arguments"""
 
1144
                        
1104
1145
                        def call_both(*args, **kwargs):
1105
1146
                            """This function will emit two D-Bus
1106
1147
                            signals by calling func1 and func2"""
1107
1148
                            func1(*args, **kwargs)
1108
1149
                            func2(*args, **kwargs)
 
1150
                        
1109
1151
                        return call_both
1110
1152
                    # Create the "call_both" function and add it to
1111
1153
                    # the class
1116
1158
                    # object.  Decorate it to be a new D-Bus method
1117
1159
                    # with the alternate D-Bus interface name.  Add it
1118
1160
                    # to the class.
1119
 
                    attr[attrname] = (dbus.service.method
1120
 
                                      (alt_interface,
1121
 
                                       attribute._dbus_in_signature,
1122
 
                                       attribute._dbus_out_signature)
1123
 
                                      (types.FunctionType
1124
 
                                       (attribute.func_code,
1125
 
                                        attribute.func_globals,
1126
 
                                        attribute.func_name,
1127
 
                                        attribute.func_defaults,
1128
 
                                        attribute.func_closure)))
 
1161
                    attr[attrname] = (
 
1162
                        dbus.service.method(
 
1163
                            alt_interface,
 
1164
                            attribute._dbus_in_signature,
 
1165
                            attribute._dbus_out_signature)
 
1166
                        (types.FunctionType(attribute.func_code,
 
1167
                                            attribute.func_globals,
 
1168
                                            attribute.func_name,
 
1169
                                            attribute.func_defaults,
 
1170
                                            attribute.func_closure)))
1129
1171
                    # Copy annotations, if any
1130
1172
                    try:
1131
 
                        attr[attrname]._dbus_annotations = (
1132
 
                            dict(attribute._dbus_annotations))
 
1173
                        attr[attrname]._dbus_annotations = dict(
 
1174
                            attribute._dbus_annotations)
1133
1175
                    except AttributeError:
1134
1176
                        pass
1135
1177
                # Is this a D-Bus property?
1138
1180
                    # object, and decorate it to be a new D-Bus
1139
1181
                    # property with the alternate D-Bus interface
1140
1182
                    # name.  Add it to the class.
1141
 
                    attr[attrname] = (dbus_service_property
1142
 
                                      (alt_interface,
1143
 
                                       attribute._dbus_signature,
1144
 
                                       attribute._dbus_access,
1145
 
                                       attribute
1146
 
                                       ._dbus_get_args_options
1147
 
                                       ["byte_arrays"])
1148
 
                                      (types.FunctionType
1149
 
                                       (attribute.func_code,
1150
 
                                        attribute.func_globals,
1151
 
                                        attribute.func_name,
1152
 
                                        attribute.func_defaults,
1153
 
                                        attribute.func_closure)))
 
1183
                    attr[attrname] = (dbus_service_property(
 
1184
                        alt_interface, attribute._dbus_signature,
 
1185
                        attribute._dbus_access,
 
1186
                        attribute._dbus_get_args_options
 
1187
                        ["byte_arrays"])
 
1188
                                      (types.FunctionType(
 
1189
                                          attribute.func_code,
 
1190
                                          attribute.func_globals,
 
1191
                                          attribute.func_name,
 
1192
                                          attribute.func_defaults,
 
1193
                                          attribute.func_closure)))
1154
1194
                    # Copy annotations, if any
1155
1195
                    try:
1156
 
                        attr[attrname]._dbus_annotations = (
1157
 
                            dict(attribute._dbus_annotations))
 
1196
                        attr[attrname]._dbus_annotations = dict(
 
1197
                            attribute._dbus_annotations)
1158
1198
                    except AttributeError:
1159
1199
                        pass
1160
1200
                # Is this a D-Bus interface?
1163
1203
                    # object.  Decorate it to be a new D-Bus interface
1164
1204
                    # with the alternate D-Bus interface name.  Add it
1165
1205
                    # to the class.
1166
 
                    attr[attrname] = (dbus_interface_annotations
1167
 
                                      (alt_interface)
1168
 
                                      (types.FunctionType
1169
 
                                       (attribute.func_code,
1170
 
                                        attribute.func_globals,
1171
 
                                        attribute.func_name,
1172
 
                                        attribute.func_defaults,
1173
 
                                        attribute.func_closure)))
 
1206
                    attr[attrname] = (
 
1207
                        dbus_interface_annotations(alt_interface)
 
1208
                        (types.FunctionType(attribute.func_code,
 
1209
                                            attribute.func_globals,
 
1210
                                            attribute.func_name,
 
1211
                                            attribute.func_defaults,
 
1212
                                            attribute.func_closure)))
1174
1213
            if deprecate:
1175
1214
                # Deprecate all alternate interfaces
1176
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1215
                iname="_AlternateDBusNames_interface_annotation{}"
1177
1216
                for interface_name in interface_names:
 
1217
                    
1178
1218
                    @dbus_interface_annotations(interface_name)
1179
1219
                    def func(self):
1180
1220
                        return { "org.freedesktop.DBus.Deprecated":
1181
 
                                     "true" }
 
1221
                                 "true" }
1182
1222
                    # Find an unused name
1183
1223
                    for aname in (iname.format(i)
1184
1224
                                  for i in itertools.count()):
1188
1228
            if interface_names:
1189
1229
                # Replace the class with a new subclass of it with
1190
1230
                # methods, signals, etc. as created above.
1191
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1192
 
                           (cls,), attr)
 
1231
                cls = type(b"{}Alternate".format(cls.__name__),
 
1232
                           (cls, ), attr)
1193
1233
        return cls
 
1234
    
1194
1235
    return wrapper
1195
1236
 
1196
1237
 
1197
1238
@alternate_dbus_interfaces({"se.recompile.Mandos":
1198
 
                                "se.bsnet.fukt.Mandos"})
 
1239
                            "se.bsnet.fukt.Mandos"})
1199
1240
class ClientDBus(Client, DBusObjectWithProperties):
1200
1241
    """A Client class using D-Bus
1201
1242
    
1205
1246
    """
1206
1247
    
1207
1248
    runtime_expansions = (Client.runtime_expansions
1208
 
                          + ("dbus_object_path",))
 
1249
                          + ("dbus_object_path", ))
 
1250
    
 
1251
    _interface = "se.recompile.Mandos.Client"
1209
1252
    
1210
1253
    # dbus.service.Object doesn't use super(), so we can't either.
1211
1254
    
1214
1257
        Client.__init__(self, *args, **kwargs)
1215
1258
        # Only now, when this client is initialized, can it show up on
1216
1259
        # the D-Bus
1217
 
        client_object_name = unicode(self.name).translate(
 
1260
        client_object_name = str(self.name).translate(
1218
1261
            {ord("."): ord("_"),
1219
1262
             ord("-"): ord("_")})
1220
 
        self.dbus_object_path = (dbus.ObjectPath
1221
 
                                 ("/clients/" + client_object_name))
 
1263
        self.dbus_object_path = dbus.ObjectPath(
 
1264
            "/clients/" + client_object_name)
1222
1265
        DBusObjectWithProperties.__init__(self, self.bus,
1223
1266
                                          self.dbus_object_path)
1224
1267
    
1225
 
    def notifychangeproperty(transform_func,
1226
 
                             dbus_name, type_func=lambda x: x,
1227
 
                             variant_level=1):
 
1268
    def notifychangeproperty(transform_func, dbus_name,
 
1269
                             type_func=lambda x: x,
 
1270
                             variant_level=1,
 
1271
                             invalidate_only=False,
 
1272
                             _interface=_interface):
1228
1273
        """ Modify a variable so that it's a property which announces
1229
1274
        its changes to DBus.
1230
1275
        
1235
1280
                   to the D-Bus.  Default: no transform
1236
1281
        variant_level: D-Bus variant level.  Default: 1
1237
1282
        """
1238
 
        attrname = "_{0}".format(dbus_name)
 
1283
        attrname = "_{}".format(dbus_name)
 
1284
        
1239
1285
        def setter(self, value):
1240
1286
            if hasattr(self, "dbus_object_path"):
1241
1287
                if (not hasattr(self, attrname) or
1242
1288
                    type_func(getattr(self, attrname, None))
1243
1289
                    != type_func(value)):
1244
 
                    dbus_value = transform_func(type_func(value),
1245
 
                                                variant_level
1246
 
                                                =variant_level)
1247
 
                    self.PropertyChanged(dbus.String(dbus_name),
1248
 
                                         dbus_value)
 
1290
                    if invalidate_only:
 
1291
                        self.PropertiesChanged(
 
1292
                            _interface, dbus.Dictionary(),
 
1293
                            dbus.Array((dbus_name, )))
 
1294
                    else:
 
1295
                        dbus_value = transform_func(
 
1296
                            type_func(value),
 
1297
                            variant_level = variant_level)
 
1298
                        self.PropertyChanged(dbus.String(dbus_name),
 
1299
                                             dbus_value)
 
1300
                        self.PropertiesChanged(
 
1301
                            _interface,
 
1302
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1303
                                              dbus_value }),
 
1304
                            dbus.Array())
1249
1305
            setattr(self, attrname, value)
1250
1306
        
1251
1307
        return property(lambda self: getattr(self, attrname), setter)
1257
1313
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1258
1314
    last_enabled = notifychangeproperty(datetime_to_dbus,
1259
1315
                                        "LastEnabled")
1260
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1261
 
                                   type_func = lambda checker:
1262
 
                                       checker is not None)
 
1316
    checker = notifychangeproperty(
 
1317
        dbus.Boolean, "CheckerRunning",
 
1318
        type_func = lambda checker: checker is not None)
1263
1319
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1264
1320
                                           "LastCheckedOK")
1265
1321
    last_checker_status = notifychangeproperty(dbus.Int16,
1268
1324
        datetime_to_dbus, "LastApprovalRequest")
1269
1325
    approved_by_default = notifychangeproperty(dbus.Boolean,
1270
1326
                                               "ApprovedByDefault")
1271
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1272
 
                                          "ApprovalDelay",
1273
 
                                          type_func =
1274
 
                                          timedelta_to_milliseconds)
 
1327
    approval_delay = notifychangeproperty(
 
1328
        dbus.UInt64, "ApprovalDelay",
 
1329
        type_func = lambda td: td.total_seconds() * 1000)
1275
1330
    approval_duration = notifychangeproperty(
1276
1331
        dbus.UInt64, "ApprovalDuration",
1277
 
        type_func = timedelta_to_milliseconds)
 
1332
        type_func = lambda td: td.total_seconds() * 1000)
1278
1333
    host = notifychangeproperty(dbus.String, "Host")
1279
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1280
 
                                   type_func =
1281
 
                                   timedelta_to_milliseconds)
 
1334
    timeout = notifychangeproperty(
 
1335
        dbus.UInt64, "Timeout",
 
1336
        type_func = lambda td: td.total_seconds() * 1000)
1282
1337
    extended_timeout = notifychangeproperty(
1283
1338
        dbus.UInt64, "ExtendedTimeout",
1284
 
        type_func = timedelta_to_milliseconds)
1285
 
    interval = notifychangeproperty(dbus.UInt64,
1286
 
                                    "Interval",
1287
 
                                    type_func =
1288
 
                                    timedelta_to_milliseconds)
 
1339
        type_func = lambda td: td.total_seconds() * 1000)
 
1340
    interval = notifychangeproperty(
 
1341
        dbus.UInt64, "Interval",
 
1342
        type_func = lambda td: td.total_seconds() * 1000)
1289
1343
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1344
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1345
                                  invalidate_only=True)
1290
1346
    
1291
1347
    del notifychangeproperty
1292
1348
    
1319
1375
                                       *args, **kwargs)
1320
1376
    
1321
1377
    def start_checker(self, *args, **kwargs):
1322
 
        old_checker = self.checker
1323
 
        if self.checker is not None:
1324
 
            old_checker_pid = self.checker.pid
1325
 
        else:
1326
 
            old_checker_pid = None
 
1378
        old_checker_pid = getattr(self.checker, "pid", None)
1327
1379
        r = Client.start_checker(self, *args, **kwargs)
1328
1380
        # Only if new checker process was started
1329
1381
        if (self.checker is not None
1338
1390
    
1339
1391
    def approve(self, value=True):
1340
1392
        self.approved = value
1341
 
        gobject.timeout_add(timedelta_to_milliseconds
1342
 
                            (self.approval_duration),
1343
 
                            self._reset_approved)
 
1393
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1394
                                * 1000), self._reset_approved)
1344
1395
        self.send_changedstate()
1345
1396
    
1346
1397
    ## D-Bus methods, signals & properties
1347
 
    _interface = "se.recompile.Mandos.Client"
1348
1398
    
1349
1399
    ## Interfaces
1350
1400
    
1351
 
    @dbus_interface_annotations(_interface)
1352
 
    def _foo(self):
1353
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1354
 
                     "false"}
1355
 
    
1356
1401
    ## Signals
1357
1402
    
1358
1403
    # CheckerCompleted - signal
1368
1413
        pass
1369
1414
    
1370
1415
    # PropertyChanged - signal
 
1416
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1371
1417
    @dbus.service.signal(_interface, signature="sv")
1372
1418
    def PropertyChanged(self, property, value):
1373
1419
        "D-Bus signal"
1437
1483
        return dbus.Boolean(bool(self.approvals_pending))
1438
1484
    
1439
1485
    # ApprovedByDefault - property
1440
 
    @dbus_service_property(_interface, signature="b",
 
1486
    @dbus_service_property(_interface,
 
1487
                           signature="b",
1441
1488
                           access="readwrite")
1442
1489
    def ApprovedByDefault_dbus_property(self, value=None):
1443
1490
        if value is None:       # get
1445
1492
        self.approved_by_default = bool(value)
1446
1493
    
1447
1494
    # ApprovalDelay - property
1448
 
    @dbus_service_property(_interface, signature="t",
 
1495
    @dbus_service_property(_interface,
 
1496
                           signature="t",
1449
1497
                           access="readwrite")
1450
1498
    def ApprovalDelay_dbus_property(self, value=None):
1451
1499
        if value is None:       # get
1452
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1500
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1501
                               * 1000)
1453
1502
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1454
1503
    
1455
1504
    # ApprovalDuration - property
1456
 
    @dbus_service_property(_interface, signature="t",
 
1505
    @dbus_service_property(_interface,
 
1506
                           signature="t",
1457
1507
                           access="readwrite")
1458
1508
    def ApprovalDuration_dbus_property(self, value=None):
1459
1509
        if value is None:       # get
1460
 
            return dbus.UInt64(timedelta_to_milliseconds(
1461
 
                    self.approval_duration))
 
1510
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1511
                               * 1000)
1462
1512
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1463
1513
    
1464
1514
    # Name - property
1472
1522
        return dbus.String(self.fingerprint)
1473
1523
    
1474
1524
    # Host - property
1475
 
    @dbus_service_property(_interface, signature="s",
 
1525
    @dbus_service_property(_interface,
 
1526
                           signature="s",
1476
1527
                           access="readwrite")
1477
1528
    def Host_dbus_property(self, value=None):
1478
1529
        if value is None:       # get
1479
1530
            return dbus.String(self.host)
1480
 
        self.host = unicode(value)
 
1531
        self.host = str(value)
1481
1532
    
1482
1533
    # Created - property
1483
1534
    @dbus_service_property(_interface, signature="s", access="read")
1490
1541
        return datetime_to_dbus(self.last_enabled)
1491
1542
    
1492
1543
    # Enabled - property
1493
 
    @dbus_service_property(_interface, signature="b",
 
1544
    @dbus_service_property(_interface,
 
1545
                           signature="b",
1494
1546
                           access="readwrite")
1495
1547
    def Enabled_dbus_property(self, value=None):
1496
1548
        if value is None:       # get
1501
1553
            self.disable()
1502
1554
    
1503
1555
    # LastCheckedOK - property
1504
 
    @dbus_service_property(_interface, signature="s",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="s",
1505
1558
                           access="readwrite")
1506
1559
    def LastCheckedOK_dbus_property(self, value=None):
1507
1560
        if value is not None:
1510
1563
        return datetime_to_dbus(self.last_checked_ok)
1511
1564
    
1512
1565
    # LastCheckerStatus - property
1513
 
    @dbus_service_property(_interface, signature="n",
1514
 
                           access="read")
 
1566
    @dbus_service_property(_interface, signature="n", access="read")
1515
1567
    def LastCheckerStatus_dbus_property(self):
1516
1568
        return dbus.Int16(self.last_checker_status)
1517
1569
    
1526
1578
        return datetime_to_dbus(self.last_approval_request)
1527
1579
    
1528
1580
    # Timeout - property
1529
 
    @dbus_service_property(_interface, signature="t",
 
1581
    @dbus_service_property(_interface,
 
1582
                           signature="t",
1530
1583
                           access="readwrite")
1531
1584
    def Timeout_dbus_property(self, value=None):
1532
1585
        if value is None:       # get
1533
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1586
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1534
1587
        old_timeout = self.timeout
1535
1588
        self.timeout = datetime.timedelta(0, 0, 0, value)
1536
1589
        # Reschedule disabling
1545
1598
                    is None):
1546
1599
                    return
1547
1600
                gobject.source_remove(self.disable_initiator_tag)
1548
 
                self.disable_initiator_tag = (
1549
 
                    gobject.timeout_add(
1550
 
                        timedelta_to_milliseconds(self.expires - now),
1551
 
                        self.disable))
 
1601
                self.disable_initiator_tag = gobject.timeout_add(
 
1602
                    int((self.expires - now).total_seconds() * 1000),
 
1603
                    self.disable)
1552
1604
    
1553
1605
    # ExtendedTimeout - property
1554
 
    @dbus_service_property(_interface, signature="t",
 
1606
    @dbus_service_property(_interface,
 
1607
                           signature="t",
1555
1608
                           access="readwrite")
1556
1609
    def ExtendedTimeout_dbus_property(self, value=None):
1557
1610
        if value is None:       # get
1558
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1611
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1612
                               * 1000)
1559
1613
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1560
1614
    
1561
1615
    # Interval - property
1562
 
    @dbus_service_property(_interface, signature="t",
 
1616
    @dbus_service_property(_interface,
 
1617
                           signature="t",
1563
1618
                           access="readwrite")
1564
1619
    def Interval_dbus_property(self, value=None):
1565
1620
        if value is None:       # get
1566
 
            return dbus.UInt64(self.interval_milliseconds())
 
1621
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1567
1622
        self.interval = datetime.timedelta(0, 0, 0, value)
1568
1623
        if getattr(self, "checker_initiator_tag", None) is None:
1569
1624
            return
1570
1625
        if self.enabled:
1571
1626
            # Reschedule checker run
1572
1627
            gobject.source_remove(self.checker_initiator_tag)
1573
 
            self.checker_initiator_tag = (gobject.timeout_add
1574
 
                                          (value, self.start_checker))
1575
 
            self.start_checker()    # Start one now, too
 
1628
            self.checker_initiator_tag = gobject.timeout_add(
 
1629
                value, self.start_checker)
 
1630
            self.start_checker() # Start one now, too
1576
1631
    
1577
1632
    # Checker - property
1578
 
    @dbus_service_property(_interface, signature="s",
 
1633
    @dbus_service_property(_interface,
 
1634
                           signature="s",
1579
1635
                           access="readwrite")
1580
1636
    def Checker_dbus_property(self, value=None):
1581
1637
        if value is None:       # get
1582
1638
            return dbus.String(self.checker_command)
1583
 
        self.checker_command = unicode(value)
 
1639
        self.checker_command = str(value)
1584
1640
    
1585
1641
    # CheckerRunning - property
1586
 
    @dbus_service_property(_interface, signature="b",
 
1642
    @dbus_service_property(_interface,
 
1643
                           signature="b",
1587
1644
                           access="readwrite")
1588
1645
    def CheckerRunning_dbus_property(self, value=None):
1589
1646
        if value is None:       # get
1599
1656
        return self.dbus_object_path # is already a dbus.ObjectPath
1600
1657
    
1601
1658
    # Secret = property
1602
 
    @dbus_service_property(_interface, signature="ay",
1603
 
                           access="write", byte_arrays=True)
 
1659
    @dbus_service_property(_interface,
 
1660
                           signature="ay",
 
1661
                           access="write",
 
1662
                           byte_arrays=True)
1604
1663
    def Secret_dbus_property(self, value):
1605
 
        self.secret = str(value)
 
1664
        self.secret = bytes(value)
1606
1665
    
1607
1666
    del _interface
1608
1667
 
1622
1681
        if data[0] == 'data':
1623
1682
            return data[1]
1624
1683
        if data[0] == 'function':
 
1684
            
1625
1685
            def func(*args, **kwargs):
1626
1686
                self._pipe.send(('funcall', name, args, kwargs))
1627
1687
                return self._pipe.recv()[1]
 
1688
            
1628
1689
            return func
1629
1690
    
1630
1691
    def __setattr__(self, name, value):
1642
1703
    def handle(self):
1643
1704
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1644
1705
            logger.info("TCP connection from: %s",
1645
 
                        unicode(self.client_address))
 
1706
                        str(self.client_address))
1646
1707
            logger.debug("Pipe FD: %d",
1647
1708
                         self.server.child_pipe.fileno())
1648
1709
            
1649
 
            session = (gnutls.connection
1650
 
                       .ClientSession(self.request,
1651
 
                                      gnutls.connection
1652
 
                                      .X509Credentials()))
 
1710
            session = gnutls.connection.ClientSession(
 
1711
                self.request, gnutls.connection .X509Credentials())
1653
1712
            
1654
1713
            # Note: gnutls.connection.X509Credentials is really a
1655
1714
            # generic GnuTLS certificate credentials object so long as
1664
1723
            priority = self.server.gnutls_priority
1665
1724
            if priority is None:
1666
1725
                priority = "NORMAL"
1667
 
            (gnutls.library.functions
1668
 
             .gnutls_priority_set_direct(session._c_object,
1669
 
                                         priority, None))
 
1726
            gnutls.library.functions.gnutls_priority_set_direct(
 
1727
                session._c_object, priority, None)
1670
1728
            
1671
1729
            # Start communication using the Mandos protocol
1672
1730
            # Get protocol number
1674
1732
            logger.debug("Protocol version: %r", line)
1675
1733
            try:
1676
1734
                if int(line.strip().split()[0]) > 1:
1677
 
                    raise RuntimeError
 
1735
                    raise RuntimeError(line)
1678
1736
            except (ValueError, IndexError, RuntimeError) as error:
1679
1737
                logger.error("Unknown protocol version: %s", error)
1680
1738
                return
1692
1750
            approval_required = False
1693
1751
            try:
1694
1752
                try:
1695
 
                    fpr = self.fingerprint(self.peer_certificate
1696
 
                                           (session))
 
1753
                    fpr = self.fingerprint(
 
1754
                        self.peer_certificate(session))
1697
1755
                except (TypeError,
1698
1756
                        gnutls.errors.GNUTLSError) as error:
1699
1757
                    logger.warning("Bad certificate: %s", error)
1714
1772
                while True:
1715
1773
                    if not client.enabled:
1716
1774
                        logger.info("Client %s is disabled",
1717
 
                                       client.name)
 
1775
                                    client.name)
1718
1776
                        if self.server.use_dbus:
1719
1777
                            # Emit D-Bus signal
1720
1778
                            client.Rejected("Disabled")
1729
1787
                        if self.server.use_dbus:
1730
1788
                            # Emit D-Bus signal
1731
1789
                            client.NeedApproval(
1732
 
                                client.approval_delay_milliseconds(),
1733
 
                                client.approved_by_default)
 
1790
                                client.approval_delay.total_seconds()
 
1791
                                * 1000, client.approved_by_default)
1734
1792
                    else:
1735
1793
                        logger.warning("Client %s was not approved",
1736
1794
                                       client.name)
1742
1800
                    #wait until timeout or approved
1743
1801
                    time = datetime.datetime.now()
1744
1802
                    client.changedstate.acquire()
1745
 
                    client.changedstate.wait(
1746
 
                        float(timedelta_to_milliseconds(delay)
1747
 
                              / 1000))
 
1803
                    client.changedstate.wait(delay.total_seconds())
1748
1804
                    client.changedstate.release()
1749
1805
                    time2 = datetime.datetime.now()
1750
1806
                    if (time2 - time) >= delay:
1769
1825
                        logger.warning("gnutls send failed",
1770
1826
                                       exc_info=error)
1771
1827
                        return
1772
 
                    logger.debug("Sent: %d, remaining: %d",
1773
 
                                 sent, len(client.secret)
1774
 
                                 - (sent_size + sent))
 
1828
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1829
                                 len(client.secret) - (sent_size
 
1830
                                                       + sent))
1775
1831
                    sent_size += sent
1776
1832
                
1777
1833
                logger.info("Sending secret to %s", client.name)
1794
1850
    def peer_certificate(session):
1795
1851
        "Return the peer's OpenPGP certificate as a bytestring"
1796
1852
        # If not an OpenPGP certificate...
1797
 
        if (gnutls.library.functions
1798
 
            .gnutls_certificate_type_get(session._c_object)
 
1853
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1854
                session._c_object)
1799
1855
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1800
1856
            # ...do the normal thing
1801
1857
            return session.peer_certificate
1815
1871
    def fingerprint(openpgp):
1816
1872
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1817
1873
        # New GnuTLS "datum" with the OpenPGP public key
1818
 
        datum = (gnutls.library.types
1819
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1820
 
                                             ctypes.POINTER
1821
 
                                             (ctypes.c_ubyte)),
1822
 
                                 ctypes.c_uint(len(openpgp))))
 
1874
        datum = gnutls.library.types.gnutls_datum_t(
 
1875
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1876
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1877
            ctypes.c_uint(len(openpgp)))
1823
1878
        # New empty GnuTLS certificate
1824
1879
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1825
 
        (gnutls.library.functions
1826
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1880
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1881
            ctypes.byref(crt))
1827
1882
        # Import the OpenPGP public key into the certificate
1828
 
        (gnutls.library.functions
1829
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1830
 
                                    gnutls.library.constants
1831
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1883
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1884
            crt, ctypes.byref(datum),
 
1885
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1832
1886
        # Verify the self signature in the key
1833
1887
        crtverify = ctypes.c_uint()
1834
 
        (gnutls.library.functions
1835
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1836
 
                                         ctypes.byref(crtverify)))
 
1888
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1889
            crt, 0, ctypes.byref(crtverify))
1837
1890
        if crtverify.value != 0:
1838
1891
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1839
 
            raise (gnutls.errors.CertificateSecurityError
1840
 
                   ("Verify failed"))
 
1892
            raise gnutls.errors.CertificateSecurityError(
 
1893
                "Verify failed")
1841
1894
        # New buffer for the fingerprint
1842
1895
        buf = ctypes.create_string_buffer(20)
1843
1896
        buf_len = ctypes.c_size_t()
1844
1897
        # Get the fingerprint from the certificate into the buffer
1845
 
        (gnutls.library.functions
1846
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1847
 
                                             ctypes.byref(buf_len)))
 
1898
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1899
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1848
1900
        # Deinit the certificate
1849
1901
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1850
1902
        # Convert the buffer to a Python bytestring
1856
1908
 
1857
1909
class MultiprocessingMixIn(object):
1858
1910
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1911
    
1859
1912
    def sub_process_main(self, request, address):
1860
1913
        try:
1861
1914
            self.finish_request(request, address)
1873
1926
 
1874
1927
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1875
1928
    """ adds a pipe to the MixIn """
 
1929
    
1876
1930
    def process_request(self, request, client_address):
1877
1931
        """Overrides and wraps the original process_request().
1878
1932
        
1887
1941
    
1888
1942
    def add_pipe(self, parent_pipe, proc):
1889
1943
        """Dummy function; override as necessary"""
1890
 
        raise NotImplementedError
 
1944
        raise NotImplementedError()
1891
1945
 
1892
1946
 
1893
1947
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1899
1953
        interface:      None or a network interface name (string)
1900
1954
        use_ipv6:       Boolean; to use IPv6 or not
1901
1955
    """
 
1956
    
1902
1957
    def __init__(self, server_address, RequestHandlerClass,
1903
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1958
                 interface=None,
 
1959
                 use_ipv6=True,
 
1960
                 socketfd=None):
1904
1961
        """If socketfd is set, use that file descriptor instead of
1905
1962
        creating a new one with socket.socket().
1906
1963
        """
1947
2004
                             self.interface)
1948
2005
            else:
1949
2006
                try:
1950
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1951
 
                                           SO_BINDTODEVICE,
1952
 
                                           str(self.interface + '\0'))
 
2007
                    self.socket.setsockopt(
 
2008
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2009
                        (self.interface + "\0").encode("utf-8"))
1953
2010
                except socket.error as error:
1954
2011
                    if error.errno == errno.EPERM:
1955
2012
                        logger.error("No permission to bind to"
1969
2026
                if self.address_family == socket.AF_INET6:
1970
2027
                    any_address = "::" # in6addr_any
1971
2028
                else:
1972
 
                    any_address = socket.INADDR_ANY
 
2029
                    any_address = "0.0.0.0" # INADDR_ANY
1973
2030
                self.server_address = (any_address,
1974
2031
                                       self.server_address[1])
1975
2032
            elif not self.server_address[1]:
1976
 
                self.server_address = (self.server_address[0],
1977
 
                                       0)
 
2033
                self.server_address = (self.server_address[0], 0)
1978
2034
#                 if self.interface:
1979
2035
#                     self.server_address = (self.server_address[0],
1980
2036
#                                            0, # port
1994
2050
    
1995
2051
    Assumes a gobject.MainLoop event loop.
1996
2052
    """
 
2053
    
1997
2054
    def __init__(self, server_address, RequestHandlerClass,
1998
 
                 interface=None, use_ipv6=True, clients=None,
1999
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2055
                 interface=None,
 
2056
                 use_ipv6=True,
 
2057
                 clients=None,
 
2058
                 gnutls_priority=None,
 
2059
                 use_dbus=True,
 
2060
                 socketfd=None):
2000
2061
        self.enabled = False
2001
2062
        self.clients = clients
2002
2063
        if self.clients is None:
2008
2069
                                interface = interface,
2009
2070
                                use_ipv6 = use_ipv6,
2010
2071
                                socketfd = socketfd)
 
2072
    
2011
2073
    def server_activate(self):
2012
2074
        if self.enabled:
2013
2075
            return socketserver.TCPServer.server_activate(self)
2017
2079
    
2018
2080
    def add_pipe(self, parent_pipe, proc):
2019
2081
        # Call "handle_ipc" for both data and EOF events
2020
 
        gobject.io_add_watch(parent_pipe.fileno(),
2021
 
                             gobject.IO_IN | gobject.IO_HUP,
2022
 
                             functools.partial(self.handle_ipc,
2023
 
                                               parent_pipe =
2024
 
                                               parent_pipe,
2025
 
                                               proc = proc))
 
2082
        gobject.io_add_watch(
 
2083
            parent_pipe.fileno(),
 
2084
            gobject.IO_IN | gobject.IO_HUP,
 
2085
            functools.partial(self.handle_ipc,
 
2086
                              parent_pipe = parent_pipe,
 
2087
                              proc = proc))
2026
2088
    
2027
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2028
 
                   proc = None, client_object=None):
 
2089
    def handle_ipc(self, source, condition,
 
2090
                   parent_pipe=None,
 
2091
                   proc = None,
 
2092
                   client_object=None):
2029
2093
        # error, or the other end of multiprocessing.Pipe has closed
2030
2094
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2031
2095
            # Wait for other process to exit
2054
2118
                parent_pipe.send(False)
2055
2119
                return False
2056
2120
            
2057
 
            gobject.io_add_watch(parent_pipe.fileno(),
2058
 
                                 gobject.IO_IN | gobject.IO_HUP,
2059
 
                                 functools.partial(self.handle_ipc,
2060
 
                                                   parent_pipe =
2061
 
                                                   parent_pipe,
2062
 
                                                   proc = proc,
2063
 
                                                   client_object =
2064
 
                                                   client))
 
2121
            gobject.io_add_watch(
 
2122
                parent_pipe.fileno(),
 
2123
                gobject.IO_IN | gobject.IO_HUP,
 
2124
                functools.partial(self.handle_ipc,
 
2125
                                  parent_pipe = parent_pipe,
 
2126
                                  proc = proc,
 
2127
                                  client_object = client))
2065
2128
            parent_pipe.send(True)
2066
2129
            # remove the old hook in favor of the new above hook on
2067
2130
            # same fileno
2073
2136
            
2074
2137
            parent_pipe.send(('data', getattr(client_object,
2075
2138
                                              funcname)(*args,
2076
 
                                                         **kwargs)))
 
2139
                                                        **kwargs)))
2077
2140
        
2078
2141
        if command == 'getattr':
2079
2142
            attrname = request[1]
2080
2143
            if callable(client_object.__getattribute__(attrname)):
2081
 
                parent_pipe.send(('function',))
 
2144
                parent_pipe.send(('function', ))
2082
2145
            else:
2083
 
                parent_pipe.send(('data', client_object
2084
 
                                  .__getattribute__(attrname)))
 
2146
                parent_pipe.send((
 
2147
                    'data', client_object.__getattribute__(attrname)))
2085
2148
        
2086
2149
        if command == 'setattr':
2087
2150
            attrname = request[1]
2127
2190
                                              # None
2128
2191
                                    "followers")) # Tokens valid after
2129
2192
                                                  # this token
 
2193
    Token = collections.namedtuple("Token", (
 
2194
        "regexp",  # To match token; if "value" is not None, must have
 
2195
                   # a "group" containing digits
 
2196
        "value",   # datetime.timedelta or None
 
2197
        "followers"))           # Tokens valid after this token
2130
2198
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2131
2199
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2132
2200
    token_end = Token(re.compile(r"$"), None, frozenset())
2133
2201
    token_second = Token(re.compile(r"(\d+)S"),
2134
2202
                         datetime.timedelta(seconds=1),
2135
 
                         frozenset((token_end,)))
 
2203
                         frozenset((token_end, )))
2136
2204
    token_minute = Token(re.compile(r"(\d+)M"),
2137
2205
                         datetime.timedelta(minutes=1),
2138
2206
                         frozenset((token_second, token_end)))
2154
2222
                       frozenset((token_month, token_end)))
2155
2223
    token_week = Token(re.compile(r"(\d+)W"),
2156
2224
                       datetime.timedelta(weeks=1),
2157
 
                       frozenset((token_end,)))
 
2225
                       frozenset((token_end, )))
2158
2226
    token_duration = Token(re.compile(r"P"), None,
2159
2227
                           frozenset((token_year, token_month,
2160
2228
                                      token_day, token_time,
2161
 
                                      token_week))),
 
2229
                                      token_week)))
2162
2230
    # Define starting values
2163
2231
    value = datetime.timedelta() # Value so far
2164
2232
    found_token = None
2165
 
    followers = frozenset(token_duration,) # Following valid tokens
 
2233
    followers = frozenset((token_duration,)) # Following valid tokens
2166
2234
    s = duration                # String left to parse
2167
2235
    # Loop until end token is found
2168
2236
    while found_token is not token_end:
2215
2283
    timevalue = datetime.timedelta(0)
2216
2284
    for s in interval.split():
2217
2285
        try:
2218
 
            suffix = unicode(s[-1])
 
2286
            suffix = s[-1]
2219
2287
            value = int(s[:-1])
2220
2288
            if suffix == "d":
2221
2289
                delta = datetime.timedelta(value)
2228
2296
            elif suffix == "w":
2229
2297
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2230
2298
            else:
2231
 
                raise ValueError("Unknown suffix {0!r}"
2232
 
                                 .format(suffix))
2233
 
        except (ValueError, IndexError) as e:
 
2299
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2300
        except IndexError as e:
2234
2301
            raise ValueError(*(e.args))
2235
2302
        timevalue += delta
2236
2303
    return timevalue
2252
2319
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2253
2320
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2254
2321
            raise OSError(errno.ENODEV,
2255
 
                          "{0} not a character device"
 
2322
                          "{} not a character device"
2256
2323
                          .format(os.devnull))
2257
2324
        os.dup2(null, sys.stdin.fileno())
2258
2325
        os.dup2(null, sys.stdout.fileno())
2268
2335
    
2269
2336
    parser = argparse.ArgumentParser()
2270
2337
    parser.add_argument("-v", "--version", action="version",
2271
 
                        version = "%(prog)s {0}".format(version),
 
2338
                        version = "%(prog)s {}".format(version),
2272
2339
                        help="show version number and exit")
2273
2340
    parser.add_argument("-i", "--interface", metavar="IF",
2274
2341
                        help="Bind to interface IF")
2280
2347
                        help="Run self-test")
2281
2348
    parser.add_argument("--debug", action="store_true",
2282
2349
                        help="Debug mode; run in foreground and log"
2283
 
                        " to terminal")
 
2350
                        " to terminal", default=None)
2284
2351
    parser.add_argument("--debuglevel", metavar="LEVEL",
2285
2352
                        help="Debug level for stdout output")
2286
2353
    parser.add_argument("--priority", help="GnuTLS"
2293
2360
                        " files")
2294
2361
    parser.add_argument("--no-dbus", action="store_false",
2295
2362
                        dest="use_dbus", help="Do not provide D-Bus"
2296
 
                        " system bus interface")
 
2363
                        " system bus interface", default=None)
2297
2364
    parser.add_argument("--no-ipv6", action="store_false",
2298
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2365
                        dest="use_ipv6", help="Do not use IPv6",
 
2366
                        default=None)
2299
2367
    parser.add_argument("--no-restore", action="store_false",
2300
2368
                        dest="restore", help="Do not restore stored"
2301
 
                        " state")
 
2369
                        " state", default=None)
2302
2370
    parser.add_argument("--socket", type=int,
2303
2371
                        help="Specify a file descriptor to a network"
2304
2372
                        " socket to use instead of creating one")
2305
2373
    parser.add_argument("--statedir", metavar="DIR",
2306
2374
                        help="Directory to save/restore state in")
2307
2375
    parser.add_argument("--foreground", action="store_true",
2308
 
                        help="Run in foreground")
 
2376
                        help="Run in foreground", default=None)
 
2377
    parser.add_argument("--no-zeroconf", action="store_false",
 
2378
                        dest="zeroconf", help="Do not use Zeroconf",
 
2379
                        default=None)
2309
2380
    
2310
2381
    options = parser.parse_args()
2311
2382
    
2312
2383
    if options.check:
2313
2384
        import doctest
2314
 
        doctest.testmod()
2315
 
        sys.exit()
 
2385
        fail_count, test_count = doctest.testmod()
 
2386
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2316
2387
    
2317
2388
    # Default values for config file for server-global settings
2318
2389
    server_defaults = { "interface": "",
2320
2391
                        "port": "",
2321
2392
                        "debug": "False",
2322
2393
                        "priority":
2323
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2394
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2395
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2324
2396
                        "servicename": "Mandos",
2325
2397
                        "use_dbus": "True",
2326
2398
                        "use_ipv6": "True",
2329
2401
                        "socket": "",
2330
2402
                        "statedir": "/var/lib/mandos",
2331
2403
                        "foreground": "False",
2332
 
                        }
 
2404
                        "zeroconf": "True",
 
2405
                    }
2333
2406
    
2334
2407
    # Parse config file for server-global settings
2335
2408
    server_config = configparser.SafeConfigParser(server_defaults)
2336
2409
    del server_defaults
2337
 
    server_config.read(os.path.join(options.configdir,
2338
 
                                    "mandos.conf"))
 
2410
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2339
2411
    # Convert the SafeConfigParser object to a dict
2340
2412
    server_settings = server_config.defaults()
2341
2413
    # Use the appropriate methods on the non-string config options
2359
2431
    # Override the settings from the config file with command line
2360
2432
    # options, if set.
2361
2433
    for option in ("interface", "address", "port", "debug",
2362
 
                   "priority", "servicename", "configdir",
2363
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2364
 
                   "statedir", "socket", "foreground"):
 
2434
                   "priority", "servicename", "configdir", "use_dbus",
 
2435
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2436
                   "socket", "foreground", "zeroconf"):
2365
2437
        value = getattr(options, option)
2366
2438
        if value is not None:
2367
2439
            server_settings[option] = value
2368
2440
    del options
2369
2441
    # Force all strings to be unicode
2370
2442
    for option in server_settings.keys():
2371
 
        if type(server_settings[option]) is str:
2372
 
            server_settings[option] = unicode(server_settings[option])
 
2443
        if isinstance(server_settings[option], bytes):
 
2444
            server_settings[option] = (server_settings[option]
 
2445
                                       .decode("utf-8"))
 
2446
    # Force all boolean options to be boolean
 
2447
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2448
                   "foreground", "zeroconf"):
 
2449
        server_settings[option] = bool(server_settings[option])
2373
2450
    # Debug implies foreground
2374
2451
    if server_settings["debug"]:
2375
2452
        server_settings["foreground"] = True
2377
2454
    
2378
2455
    ##################################################################
2379
2456
    
 
2457
    if (not server_settings["zeroconf"]
 
2458
        and not (server_settings["port"]
 
2459
                 or server_settings["socket"] != "")):
 
2460
        parser.error("Needs port or socket to work without Zeroconf")
 
2461
    
2380
2462
    # For convenience
2381
2463
    debug = server_settings["debug"]
2382
2464
    debuglevel = server_settings["debuglevel"]
2385
2467
    stored_state_path = os.path.join(server_settings["statedir"],
2386
2468
                                     stored_state_file)
2387
2469
    foreground = server_settings["foreground"]
 
2470
    zeroconf = server_settings["zeroconf"]
2388
2471
    
2389
2472
    if debug:
2390
2473
        initlogger(debug, logging.DEBUG)
2396
2479
            initlogger(debug, level)
2397
2480
    
2398
2481
    if server_settings["servicename"] != "Mandos":
2399
 
        syslogger.setFormatter(logging.Formatter
2400
 
                               ('Mandos ({0}) [%(process)d]:'
2401
 
                                ' %(levelname)s: %(message)s'
2402
 
                                .format(server_settings
2403
 
                                        ["servicename"])))
 
2482
        syslogger.setFormatter(
 
2483
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2484
                              ' %(levelname)s: %(message)s'.format(
 
2485
                                  server_settings["servicename"])))
2404
2486
    
2405
2487
    # Parse config file with clients
2406
2488
    client_config = configparser.SafeConfigParser(Client
2411
2493
    global mandos_dbus_service
2412
2494
    mandos_dbus_service = None
2413
2495
    
2414
 
    tcp_server = MandosServer((server_settings["address"],
2415
 
                               server_settings["port"]),
2416
 
                              ClientHandler,
2417
 
                              interface=(server_settings["interface"]
2418
 
                                         or None),
2419
 
                              use_ipv6=use_ipv6,
2420
 
                              gnutls_priority=
2421
 
                              server_settings["priority"],
2422
 
                              use_dbus=use_dbus,
2423
 
                              socketfd=(server_settings["socket"]
2424
 
                                        or None))
 
2496
    socketfd = None
 
2497
    if server_settings["socket"] != "":
 
2498
        socketfd = server_settings["socket"]
 
2499
    tcp_server = MandosServer(
 
2500
        (server_settings["address"], server_settings["port"]),
 
2501
        ClientHandler,
 
2502
        interface=(server_settings["interface"] or None),
 
2503
        use_ipv6=use_ipv6,
 
2504
        gnutls_priority=server_settings["priority"],
 
2505
        use_dbus=use_dbus,
 
2506
        socketfd=socketfd)
2425
2507
    if not foreground:
2426
 
        pidfilename = "/var/run/mandos.pid"
 
2508
        pidfilename = "/run/mandos.pid"
 
2509
        if not os.path.isdir("/run/."):
 
2510
            pidfilename = "/var/run/mandos.pid"
2427
2511
        pidfile = None
2428
2512
        try:
2429
2513
            pidfile = open(pidfilename, "w")
2446
2530
        os.setuid(uid)
2447
2531
    except OSError as error:
2448
2532
        if error.errno != errno.EPERM:
2449
 
            raise error
 
2533
            raise
2450
2534
    
2451
2535
    if debug:
2452
2536
        # Enable all possible GnuTLS debugging
2459
2543
        def debug_gnutls(level, string):
2460
2544
            logger.debug("GnuTLS: %s", string[:-1])
2461
2545
        
2462
 
        (gnutls.library.functions
2463
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2546
        gnutls.library.functions.gnutls_global_set_log_function(
 
2547
            debug_gnutls)
2464
2548
        
2465
2549
        # Redirect stdin so all checkers get /dev/null
2466
2550
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2486
2570
    if use_dbus:
2487
2571
        try:
2488
2572
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2489
 
                                            bus, do_not_queue=True)
2490
 
            old_bus_name = (dbus.service.BusName
2491
 
                            ("se.bsnet.fukt.Mandos", bus,
2492
 
                             do_not_queue=True))
 
2573
                                            bus,
 
2574
                                            do_not_queue=True)
 
2575
            old_bus_name = dbus.service.BusName(
 
2576
                "se.bsnet.fukt.Mandos", bus,
 
2577
                do_not_queue=True)
2493
2578
        except dbus.exceptions.NameExistsException as e:
2494
2579
            logger.error("Disabling D-Bus:", exc_info=e)
2495
2580
            use_dbus = False
2496
2581
            server_settings["use_dbus"] = False
2497
2582
            tcp_server.use_dbus = False
2498
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2499
 
    service = AvahiServiceToSyslog(name =
2500
 
                                   server_settings["servicename"],
2501
 
                                   servicetype = "_mandos._tcp",
2502
 
                                   protocol = protocol, bus = bus)
2503
 
    if server_settings["interface"]:
2504
 
        service.interface = (if_nametoindex
2505
 
                             (str(server_settings["interface"])))
 
2583
    if zeroconf:
 
2584
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2585
        service = AvahiServiceToSyslog(
 
2586
            name = server_settings["servicename"],
 
2587
            servicetype = "_mandos._tcp",
 
2588
            protocol = protocol,
 
2589
            bus = bus)
 
2590
        if server_settings["interface"]:
 
2591
            service.interface = if_nametoindex(
 
2592
                server_settings["interface"].encode("utf-8"))
2506
2593
    
2507
2594
    global multiprocessing_manager
2508
2595
    multiprocessing_manager = multiprocessing.Manager()
2515
2602
    old_client_settings = {}
2516
2603
    clients_data = {}
2517
2604
    
 
2605
    # This is used to redirect stdout and stderr for checker processes
 
2606
    global wnull
 
2607
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2608
    # Only used if server is running in foreground but not in debug
 
2609
    # mode
 
2610
    if debug or not foreground:
 
2611
        wnull.close()
 
2612
    
2518
2613
    # Get client data and settings from last running state.
2519
2614
    if server_settings["restore"]:
2520
2615
        try:
2521
2616
            with open(stored_state_path, "rb") as stored_state:
2522
 
                clients_data, old_client_settings = (pickle.load
2523
 
                                                     (stored_state))
 
2617
                clients_data, old_client_settings = pickle.load(
 
2618
                    stored_state)
2524
2619
            os.remove(stored_state_path)
2525
2620
        except IOError as e:
2526
2621
            if e.errno == errno.ENOENT:
2527
 
                logger.warning("Could not load persistent state: {0}"
2528
 
                                .format(os.strerror(e.errno)))
 
2622
                logger.warning("Could not load persistent state:"
 
2623
                               " {}".format(os.strerror(e.errno)))
2529
2624
            else:
2530
2625
                logger.critical("Could not load persistent state:",
2531
2626
                                exc_info=e)
2532
2627
                raise
2533
2628
        except EOFError as e:
2534
2629
            logger.warning("Could not load persistent state: "
2535
 
                           "EOFError:", exc_info=e)
 
2630
                           "EOFError:",
 
2631
                           exc_info=e)
2536
2632
    
2537
2633
    with PGPEngine() as pgp:
2538
 
        for client_name, client in clients_data.iteritems():
 
2634
        for client_name, client in clients_data.items():
 
2635
            # Skip removed clients
 
2636
            if client_name not in client_settings:
 
2637
                continue
 
2638
            
2539
2639
            # Decide which value to use after restoring saved state.
2540
2640
            # We have three different values: Old config file,
2541
2641
            # new config file, and saved state.
2546
2646
                    # For each value in new config, check if it
2547
2647
                    # differs from the old config value (Except for
2548
2648
                    # the "secret" attribute)
2549
 
                    if (name != "secret" and
2550
 
                        value != old_client_settings[client_name]
2551
 
                        [name]):
 
2649
                    if (name != "secret"
 
2650
                        and (value !=
 
2651
                             old_client_settings[client_name][name])):
2552
2652
                        client[name] = value
2553
2653
                except KeyError:
2554
2654
                    pass
2562
2662
                if datetime.datetime.utcnow() >= client["expires"]:
2563
2663
                    if not client["last_checked_ok"]:
2564
2664
                        logger.warning(
2565
 
                            "disabling client {0} - Client never "
2566
 
                            "performed a successful checker"
2567
 
                            .format(client_name))
 
2665
                            "disabling client {} - Client never "
 
2666
                            "performed a successful checker".format(
 
2667
                                client_name))
2568
2668
                        client["enabled"] = False
2569
2669
                    elif client["last_checker_status"] != 0:
2570
2670
                        logger.warning(
2571
 
                            "disabling client {0} - Client "
2572
 
                            "last checker failed with error code {1}"
2573
 
                            .format(client_name,
2574
 
                                    client["last_checker_status"]))
 
2671
                            "disabling client {} - Client last"
 
2672
                            " checker failed with error code"
 
2673
                            " {}".format(
 
2674
                                client_name,
 
2675
                                client["last_checker_status"]))
2575
2676
                        client["enabled"] = False
2576
2677
                    else:
2577
 
                        client["expires"] = (datetime.datetime
2578
 
                                             .utcnow()
2579
 
                                             + client["timeout"])
 
2678
                        client["expires"] = (
 
2679
                            datetime.datetime.utcnow()
 
2680
                            + client["timeout"])
2580
2681
                        logger.debug("Last checker succeeded,"
2581
 
                                     " keeping {0} enabled"
2582
 
                                     .format(client_name))
 
2682
                                     " keeping {} enabled".format(
 
2683
                                         client_name))
2583
2684
            try:
2584
 
                client["secret"] = (
2585
 
                    pgp.decrypt(client["encrypted_secret"],
2586
 
                                client_settings[client_name]
2587
 
                                ["secret"]))
 
2685
                client["secret"] = pgp.decrypt(
 
2686
                    client["encrypted_secret"],
 
2687
                    client_settings[client_name]["secret"])
2588
2688
            except PGPError:
2589
2689
                # If decryption fails, we use secret from new settings
2590
 
                logger.debug("Failed to decrypt {0} old secret"
2591
 
                             .format(client_name))
2592
 
                client["secret"] = (
2593
 
                    client_settings[client_name]["secret"])
 
2690
                logger.debug("Failed to decrypt {} old secret".format(
 
2691
                    client_name))
 
2692
                client["secret"] = (client_settings[client_name]
 
2693
                                    ["secret"])
2594
2694
    
2595
2695
    # Add/remove clients based on new changes made to config
2596
2696
    for client_name in (set(old_client_settings)
2601
2701
        clients_data[client_name] = client_settings[client_name]
2602
2702
    
2603
2703
    # Create all client objects
2604
 
    for client_name, client in clients_data.iteritems():
 
2704
    for client_name, client in clients_data.items():
2605
2705
        tcp_server.clients[client_name] = client_class(
2606
 
            name = client_name, settings = client)
 
2706
            name = client_name,
 
2707
            settings = client,
 
2708
            server_settings = server_settings)
2607
2709
    
2608
2710
    if not tcp_server.clients:
2609
2711
        logger.warning("No clients defined")
2613
2715
            try:
2614
2716
                with pidfile:
2615
2717
                    pid = os.getpid()
2616
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2718
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2617
2719
            except IOError:
2618
2720
                logger.error("Could not write to file %r with PID %d",
2619
2721
                             pidfilename, pid)
2624
2726
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2625
2727
    
2626
2728
    if use_dbus:
2627
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2628
 
                                        "se.bsnet.fukt.Mandos"})
 
2729
        
 
2730
        @alternate_dbus_interfaces(
 
2731
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2629
2732
        class MandosDBusService(DBusObjectWithProperties):
2630
2733
            """A D-Bus proxy object"""
 
2734
            
2631
2735
            def __init__(self):
2632
2736
                dbus.service.Object.__init__(self, bus, "/")
 
2737
            
2633
2738
            _interface = "se.recompile.Mandos"
2634
2739
            
2635
2740
            @dbus_interface_annotations(_interface)
2636
2741
            def _foo(self):
2637
 
                return { "org.freedesktop.DBus.Property"
2638
 
                         ".EmitsChangedSignal":
2639
 
                             "false"}
 
2742
                return {
 
2743
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2744
                    "false" }
2640
2745
            
2641
2746
            @dbus.service.signal(_interface, signature="o")
2642
2747
            def ClientAdded(self, objpath):
2656
2761
            @dbus.service.method(_interface, out_signature="ao")
2657
2762
            def GetAllClients(self):
2658
2763
                "D-Bus method"
2659
 
                return dbus.Array(c.dbus_object_path
2660
 
                                  for c in
 
2764
                return dbus.Array(c.dbus_object_path for c in
2661
2765
                                  tcp_server.clients.itervalues())
2662
2766
            
2663
2767
            @dbus.service.method(_interface,
2665
2769
            def GetAllClientsWithProperties(self):
2666
2770
                "D-Bus method"
2667
2771
                return dbus.Dictionary(
2668
 
                    ((c.dbus_object_path, c.GetAll(""))
2669
 
                     for c in tcp_server.clients.itervalues()),
 
2772
                    { c.dbus_object_path: c.GetAll("")
 
2773
                      for c in tcp_server.clients.itervalues() },
2670
2774
                    signature="oa{sv}")
2671
2775
            
2672
2776
            @dbus.service.method(_interface, in_signature="o")
2689
2793
    
2690
2794
    def cleanup():
2691
2795
        "Cleanup function; run on exit"
2692
 
        service.cleanup()
 
2796
        if zeroconf:
 
2797
            service.cleanup()
2693
2798
        
2694
2799
        multiprocessing.active_children()
 
2800
        wnull.close()
2695
2801
        if not (tcp_server.clients or client_settings):
2696
2802
            return
2697
2803
        
2708
2814
                
2709
2815
                # A list of attributes that can not be pickled
2710
2816
                # + secret.
2711
 
                exclude = set(("bus", "changedstate", "secret",
2712
 
                               "checker"))
2713
 
                for name, typ in (inspect.getmembers
2714
 
                                  (dbus.service.Object)):
 
2817
                exclude = { "bus", "changedstate", "secret",
 
2818
                            "checker", "server_settings" }
 
2819
                for name, typ in inspect.getmembers(dbus.service
 
2820
                                                    .Object):
2715
2821
                    exclude.add(name)
2716
2822
                
2717
2823
                client_dict["encrypted_secret"] = (client
2724
2830
                del client_settings[client.name]["secret"]
2725
2831
        
2726
2832
        try:
2727
 
            with (tempfile.NamedTemporaryFile
2728
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2729
 
                   dir=os.path.dirname(stored_state_path),
2730
 
                   delete=False)) as stored_state:
 
2833
            with tempfile.NamedTemporaryFile(
 
2834
                    mode='wb',
 
2835
                    suffix=".pickle",
 
2836
                    prefix='clients-',
 
2837
                    dir=os.path.dirname(stored_state_path),
 
2838
                    delete=False) as stored_state:
2731
2839
                pickle.dump((clients, client_settings), stored_state)
2732
 
                tempname=stored_state.name
 
2840
                tempname = stored_state.name
2733
2841
            os.rename(tempname, stored_state_path)
2734
2842
        except (IOError, OSError) as e:
2735
2843
            if not debug:
2738
2846
                except NameError:
2739
2847
                    pass
2740
2848
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2741
 
                logger.warning("Could not save persistent state: {0}"
 
2849
                logger.warning("Could not save persistent state: {}"
2742
2850
                               .format(os.strerror(e.errno)))
2743
2851
            else:
2744
2852
                logger.warning("Could not save persistent state:",
2745
2853
                               exc_info=e)
2746
 
                raise e
 
2854
                raise
2747
2855
        
2748
2856
        # Delete all clients, and settings from config
2749
2857
        while tcp_server.clients:
2754
2862
            client.disable(quiet=True)
2755
2863
            if use_dbus:
2756
2864
                # Emit D-Bus signal
2757
 
                mandos_dbus_service.ClientRemoved(client
2758
 
                                                  .dbus_object_path,
2759
 
                                                  client.name)
 
2865
                mandos_dbus_service.ClientRemoved(
 
2866
                    client.dbus_object_path, client.name)
2760
2867
        client_settings.clear()
2761
2868
    
2762
2869
    atexit.register(cleanup)
2773
2880
    tcp_server.server_activate()
2774
2881
    
2775
2882
    # Find out what port we got
2776
 
    service.port = tcp_server.socket.getsockname()[1]
 
2883
    if zeroconf:
 
2884
        service.port = tcp_server.socket.getsockname()[1]
2777
2885
    if use_ipv6:
2778
2886
        logger.info("Now listening on address %r, port %d,"
2779
2887
                    " flowinfo %d, scope_id %d",
2785
2893
    #service.interface = tcp_server.socket.getsockname()[3]
2786
2894
    
2787
2895
    try:
2788
 
        # From the Avahi example code
2789
 
        try:
2790
 
            service.activate()
2791
 
        except dbus.exceptions.DBusException as error:
2792
 
            logger.critical("D-Bus Exception", exc_info=error)
2793
 
            cleanup()
2794
 
            sys.exit(1)
2795
 
        # End of Avahi example code
 
2896
        if zeroconf:
 
2897
            # From the Avahi example code
 
2898
            try:
 
2899
                service.activate()
 
2900
            except dbus.exceptions.DBusException as error:
 
2901
                logger.critical("D-Bus Exception", exc_info=error)
 
2902
                cleanup()
 
2903
                sys.exit(1)
 
2904
            # End of Avahi example code
2796
2905
        
2797
2906
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2798
2907
                             lambda *args, **kwargs:
2813
2922
    # Must run before the D-Bus bus name gets deregistered
2814
2923
    cleanup()
2815
2924
 
 
2925
 
2816
2926
if __name__ == '__main__':
2817
2927
    main()