/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-31 15:56:58 UTC
  • Revision ID: teddy@recompile.se-20150531155658-l7znu7zlqr2dmuwd
mandos: Generate better messages in exceptions.

mandos (ProxyClient.__init__): Include fingerprint in KeyError().
(rfc3339_duration_to_delta): Include duration in ValueError().

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