/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-05 21:38:01 UTC
  • mto: (237.7.307 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150705213801-pi8vk0ovlumuj826
plugin-helpers/mandos-client-iprouteadddel.c: Fix #include lines.
(main): Fix minor typo in error message.

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-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
66
68
import binascii
67
69
import tempfile
68
70
import itertools
 
71
import collections
69
72
 
70
73
import dbus
71
74
import dbus.service
76
79
import ctypes.util
77
80
import xml.dom.minidom
78
81
import inspect
79
 
import GnuPGInterface
80
82
 
81
83
try:
82
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
88
    except ImportError:
87
89
        SO_BINDTODEVICE = None
88
90
 
89
 
version = "1.5.3"
 
91
if sys.version_info.major == 2:
 
92
    str = unicode
 
93
 
 
94
version = "1.6.9"
90
95
stored_state_file = "clients.pickle"
91
96
 
92
97
logger = logging.getLogger()
93
 
syslogger = (logging.handlers.SysLogHandler
94
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
 
              address = str("/dev/log")))
 
98
syslogger = None
96
99
 
97
100
try:
98
101
    if_nametoindex = (ctypes.cdll.LoadLibrary
104
107
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
108
        with contextlib.closing(socket.socket()) as s:
106
109
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
 
110
                                struct.pack(b"16s16x", interface))
 
111
        interface_index = struct.unpack("I", ifreq[16:20])[0]
111
112
        return interface_index
112
113
 
113
114
 
114
115
def initlogger(debug, level=logging.WARNING):
115
116
    """init logger and add loglevel"""
116
117
    
 
118
    global syslogger
 
119
    syslogger = (logging.handlers.SysLogHandler
 
120
                 (facility =
 
121
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
122
                  address = "/dev/log"))
117
123
    syslogger.setFormatter(logging.Formatter
118
124
                           ('Mandos [%(process)d]: %(levelname)s:'
119
125
                            ' %(message)s'))
137
143
class PGPEngine(object):
138
144
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
145
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
146
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
 
147
        self.gnupgargs = ['--batch',
 
148
                          '--home', self.tempdir,
 
149
                          '--force-mdc',
 
150
                          '--quiet',
 
151
                          '--no-use-agent']
148
152
    
149
153
    def __enter__(self):
150
154
        return self
151
155
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
156
    def __exit__(self, exc_type, exc_value, traceback):
153
157
        self._cleanup()
154
158
        return False
155
159
    
172
176
    def password_encode(self, password):
173
177
        # Passphrase can not be empty and can not contain newlines or
174
178
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
 
179
        encoded = b"mandos" + binascii.hexlify(password)
 
180
        if len(encoded) > 2048:
 
181
            # GnuPG can't handle long passwords, so encode differently
 
182
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
183
                       .replace(b"\n", b"\\n")
 
184
                       .replace(b"\0", b"\\x00"))
 
185
        return encoded
176
186
    
177
187
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
 
188
        passphrase = self.password_encode(password)
 
189
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
190
                                         ) as passfile:
 
191
            passfile.write(passphrase)
 
192
            passfile.flush()
 
193
            proc = subprocess.Popen(['gpg', '--symmetric',
 
194
                                     '--passphrase-file',
 
195
                                     passfile.name]
 
196
                                    + self.gnupgargs,
 
197
                                    stdin = subprocess.PIPE,
 
198
                                    stdout = subprocess.PIPE,
 
199
                                    stderr = subprocess.PIPE)
 
200
            ciphertext, err = proc.communicate(input = data)
 
201
        if proc.returncode != 0:
 
202
            raise PGPError(err)
192
203
        return ciphertext
193
204
    
194
205
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
 
206
        passphrase = self.password_encode(password)
 
207
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
208
                                         ) as passfile:
 
209
            passfile.write(passphrase)
 
210
            passfile.flush()
 
211
            proc = subprocess.Popen(['gpg', '--decrypt',
 
212
                                     '--passphrase-file',
 
213
                                     passfile.name]
 
214
                                    + self.gnupgargs,
 
215
                                    stdin = subprocess.PIPE,
 
216
                                    stdout = subprocess.PIPE,
 
217
                                    stderr = subprocess.PIPE)
 
218
            decrypted_plaintext, err = proc.communicate(input
 
219
                                                        = data)
 
220
        if proc.returncode != 0:
 
221
            raise PGPError(err)
209
222
        return decrypted_plaintext
210
223
 
211
224
 
212
 
 
213
225
class AvahiError(Exception):
214
226
    def __init__(self, value, *args, **kwargs):
215
227
        self.value = value
216
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
217
 
    def __unicode__(self):
218
 
        return unicode(repr(self.value))
 
228
        return super(AvahiError, self).__init__(value, *args,
 
229
                                                **kwargs)
219
230
 
220
231
class AvahiServiceError(AvahiError):
221
232
    pass
232
243
               Used to optionally bind to the specified interface.
233
244
    name: string; Example: 'Mandos'
234
245
    type: string; Example: '_mandos._tcp'.
235
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
246
     See <https://www.iana.org/assignments/service-names-port-numbers>
236
247
    port: integer; what port to announce
237
248
    TXT: list of strings; TXT record for the service
238
249
    domain: string; Domain to publish on, default to .local if empty.
244
255
    server: D-Bus Server
245
256
    bus: dbus.SystemBus()
246
257
    """
 
258
    
247
259
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
260
                 servicetype = None, port = None, TXT = None,
249
261
                 domain = "", host = "", max_renames = 32768,
262
274
        self.server = None
263
275
        self.bus = bus
264
276
        self.entry_group_state_changed_match = None
265
 
    def rename(self):
 
277
    
 
278
    def rename(self, remove=True):
266
279
        """Derived from the Avahi example code"""
267
280
        if self.rename_count >= self.max_renames:
268
281
            logger.critical("No suitable Zeroconf service name found"
269
282
                            " after %i retries, exiting.",
270
283
                            self.rename_count)
271
284
            raise AvahiServiceError("Too many renames")
272
 
        self.name = unicode(self.server
273
 
                            .GetAlternativeServiceName(self.name))
 
285
        self.name = str(self.server
 
286
                        .GetAlternativeServiceName(self.name))
 
287
        self.rename_count += 1
274
288
        logger.info("Changing Zeroconf service name to %r ...",
275
289
                    self.name)
276
 
        self.remove()
 
290
        if remove:
 
291
            self.remove()
277
292
        try:
278
293
            self.add()
279
294
        except dbus.exceptions.DBusException as error:
280
 
            logger.critical("D-Bus Exception", exc_info=error)
281
 
            self.cleanup()
282
 
            os._exit(1)
283
 
        self.rename_count += 1
 
295
            if (error.get_dbus_name()
 
296
                == "org.freedesktop.Avahi.CollisionError"):
 
297
                logger.info("Local Zeroconf service name collision.")
 
298
                return self.rename(remove=False)
 
299
            else:
 
300
                logger.critical("D-Bus Exception", exc_info=error)
 
301
                self.cleanup()
 
302
                os._exit(1)
 
303
    
284
304
    def remove(self):
285
305
        """Derived from the Avahi example code"""
286
306
        if self.entry_group_state_changed_match is not None:
288
308
            self.entry_group_state_changed_match = None
289
309
        if self.group is not None:
290
310
            self.group.Reset()
 
311
    
291
312
    def add(self):
292
313
        """Derived from the Avahi example code"""
293
314
        self.remove()
310
331
            dbus.UInt16(self.port),
311
332
            avahi.string_array_to_txt_array(self.TXT))
312
333
        self.group.Commit()
 
334
    
313
335
    def entry_group_state_changed(self, state, error):
314
336
        """Derived from the Avahi example code"""
315
337
        logger.debug("Avahi entry group state change: %i", state)
321
343
            self.rename()
322
344
        elif state == avahi.ENTRY_GROUP_FAILURE:
323
345
            logger.critical("Avahi: Error in group state changed %s",
324
 
                            unicode(error))
325
 
            raise AvahiGroupError("State changed: {0!s}"
 
346
                            str(error))
 
347
            raise AvahiGroupError("State changed: {!s}"
326
348
                                  .format(error))
 
349
    
327
350
    def cleanup(self):
328
351
        """Derived from the Avahi example code"""
329
352
        if self.group is not None:
334
357
                pass
335
358
            self.group = None
336
359
        self.remove()
 
360
    
337
361
    def server_state_changed(self, state, error=None):
338
362
        """Derived from the Avahi example code"""
339
363
        logger.debug("Avahi server state change: %i", state)
358
382
                logger.debug("Unknown state: %r", state)
359
383
            else:
360
384
                logger.debug("Unknown state: %r: %r", state, error)
 
385
    
361
386
    def activate(self):
362
387
        """Derived from the Avahi example code"""
363
388
        if self.server is None:
370
395
                                 self.server_state_changed)
371
396
        self.server_state_changed(self.server.GetState())
372
397
 
 
398
 
373
399
class AvahiServiceToSyslog(AvahiService):
374
 
    def rename(self):
 
400
    def rename(self, *args, **kwargs):
375
401
        """Add the new name to the syslog messages"""
376
 
        ret = AvahiService.rename(self)
 
402
        ret = AvahiService.rename(self, *args, **kwargs)
377
403
        syslogger.setFormatter(logging.Formatter
378
 
                               ('Mandos ({0}) [%(process)d]:'
 
404
                               ('Mandos ({}) [%(process)d]:'
379
405
                                ' %(levelname)s: %(message)s'
380
406
                                .format(self.name)))
381
407
        return ret
382
408
 
383
 
def timedelta_to_milliseconds(td):
384
 
    "Convert a datetime.timedelta() to milliseconds"
385
 
    return ((td.days * 24 * 60 * 60 * 1000)
386
 
            + (td.seconds * 1000)
387
 
            + (td.microseconds // 1000))
388
 
        
 
409
 
389
410
class Client(object):
390
411
    """A representation of a client host served by this server.
391
412
    
427
448
    runtime_expansions: Allowed attributes for runtime expansion.
428
449
    expires:    datetime.datetime(); time (UTC) when a client will be
429
450
                disabled, or None
 
451
    server_settings: The server_settings dict from main()
430
452
    """
431
453
    
432
454
    runtime_expansions = ("approval_delay", "approval_duration",
433
 
                          "created", "enabled", "fingerprint",
434
 
                          "host", "interval", "last_checked_ok",
 
455
                          "created", "enabled", "expires",
 
456
                          "fingerprint", "host", "interval",
 
457
                          "last_approval_request", "last_checked_ok",
435
458
                          "last_enabled", "name", "timeout")
436
 
    client_defaults = { "timeout": "5m",
437
 
                        "extended_timeout": "15m",
438
 
                        "interval": "2m",
 
459
    client_defaults = { "timeout": "PT5M",
 
460
                        "extended_timeout": "PT15M",
 
461
                        "interval": "PT2M",
439
462
                        "checker": "fping -q -- %%(host)s",
440
463
                        "host": "",
441
 
                        "approval_delay": "0s",
442
 
                        "approval_duration": "1s",
 
464
                        "approval_delay": "PT0S",
 
465
                        "approval_duration": "PT1S",
443
466
                        "approved_by_default": "True",
444
467
                        "enabled": "True",
445
468
                        }
446
469
    
447
 
    def timeout_milliseconds(self):
448
 
        "Return the 'timeout' attribute in milliseconds"
449
 
        return timedelta_to_milliseconds(self.timeout)
450
 
    
451
 
    def extended_timeout_milliseconds(self):
452
 
        "Return the 'extended_timeout' attribute in milliseconds"
453
 
        return timedelta_to_milliseconds(self.extended_timeout)
454
 
    
455
 
    def interval_milliseconds(self):
456
 
        "Return the 'interval' attribute in milliseconds"
457
 
        return timedelta_to_milliseconds(self.interval)
458
 
    
459
 
    def approval_delay_milliseconds(self):
460
 
        return timedelta_to_milliseconds(self.approval_delay)
461
 
 
462
470
    @staticmethod
463
471
    def config_parser(config):
464
472
        """Construct a new dict of client settings of this form:
489
497
                          "rb") as secfile:
490
498
                    client["secret"] = secfile.read()
491
499
            else:
492
 
                raise TypeError("No secret or secfile for section {0}"
 
500
                raise TypeError("No secret or secfile for section {}"
493
501
                                .format(section))
494
502
            client["timeout"] = string_to_delta(section["timeout"])
495
503
            client["extended_timeout"] = string_to_delta(
505
513
            client["last_checker_status"] = -2
506
514
        
507
515
        return settings
508
 
        
509
 
        
510
 
    def __init__(self, settings, name = None):
511
 
        """Note: the 'checker' key in 'config' sets the
512
 
        'checker_command' attribute and *not* the 'checker'
513
 
        attribute."""
 
516
    
 
517
    def __init__(self, settings, name = None, server_settings=None):
514
518
        self.name = name
 
519
        if server_settings is None:
 
520
            server_settings = {}
 
521
        self.server_settings = server_settings
515
522
        # adding all client settings
516
 
        for setting, value in settings.iteritems():
 
523
        for setting, value in settings.items():
517
524
            setattr(self, setting, value)
518
525
        
519
526
        if self.enabled:
525
532
        else:
526
533
            self.last_enabled = None
527
534
            self.expires = None
528
 
       
 
535
        
529
536
        logger.debug("Creating client %r", self.name)
530
537
        # Uppercase and remove spaces from fingerprint for later
531
538
        # comparison purposes with return value from the fingerprint()
533
540
        logger.debug("  Fingerprint: %s", self.fingerprint)
534
541
        self.created = settings.get("created",
535
542
                                    datetime.datetime.utcnow())
536
 
 
 
543
        
537
544
        # attributes specific for this server instance
538
545
        self.checker = None
539
546
        self.checker_initiator_tag = None
567
574
        if getattr(self, "enabled", False):
568
575
            # Already enabled
569
576
            return
570
 
        self.send_changedstate()
571
577
        self.expires = datetime.datetime.utcnow() + self.timeout
572
578
        self.enabled = True
573
579
        self.last_enabled = datetime.datetime.utcnow()
574
580
        self.init_checker()
 
581
        self.send_changedstate()
575
582
    
576
583
    def disable(self, quiet=True):
577
584
        """Disable this client."""
578
585
        if not getattr(self, "enabled", False):
579
586
            return False
580
587
        if not quiet:
581
 
            self.send_changedstate()
582
 
        if not quiet:
583
588
            logger.info("Disabling client %s", self.name)
584
 
        if getattr(self, "disable_initiator_tag", False):
 
589
        if getattr(self, "disable_initiator_tag", None) is not None:
585
590
            gobject.source_remove(self.disable_initiator_tag)
586
591
            self.disable_initiator_tag = None
587
592
        self.expires = None
588
 
        if getattr(self, "checker_initiator_tag", False):
 
593
        if getattr(self, "checker_initiator_tag", None) is not None:
589
594
            gobject.source_remove(self.checker_initiator_tag)
590
595
            self.checker_initiator_tag = None
591
596
        self.stop_checker()
592
597
        self.enabled = False
 
598
        if not quiet:
 
599
            self.send_changedstate()
593
600
        # Do not run this again if called by a gobject.timeout_add
594
601
        return False
595
602
    
599
606
    def init_checker(self):
600
607
        # Schedule a new checker to be started an 'interval' from now,
601
608
        # and every interval from then on.
 
609
        if self.checker_initiator_tag is not None:
 
610
            gobject.source_remove(self.checker_initiator_tag)
602
611
        self.checker_initiator_tag = (gobject.timeout_add
603
 
                                      (self.interval_milliseconds(),
 
612
                                      (int(self.interval
 
613
                                           .total_seconds() * 1000),
604
614
                                       self.start_checker))
605
615
        # Schedule a disable() when 'timeout' has passed
 
616
        if self.disable_initiator_tag is not None:
 
617
            gobject.source_remove(self.disable_initiator_tag)
606
618
        self.disable_initiator_tag = (gobject.timeout_add
607
 
                                   (self.timeout_milliseconds(),
608
 
                                    self.disable))
 
619
                                      (int(self.timeout
 
620
                                           .total_seconds() * 1000),
 
621
                                       self.disable))
609
622
        # Also start a new checker *right now*.
610
623
        self.start_checker()
611
624
    
639
652
            timeout = self.timeout
640
653
        if self.disable_initiator_tag is not None:
641
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
            self.disable_initiator_tag = None
642
656
        if getattr(self, "enabled", False):
643
657
            self.disable_initiator_tag = (gobject.timeout_add
644
 
                                          (timedelta_to_milliseconds
645
 
                                           (timeout), self.disable))
 
658
                                          (int(timeout.total_seconds()
 
659
                                               * 1000), self.disable))
646
660
            self.expires = datetime.datetime.utcnow() + timeout
647
661
    
648
662
    def need_approval(self):
654
668
        If a checker already exists, leave it running and do
655
669
        nothing."""
656
670
        # The reason for not killing a running checker is that if we
657
 
        # did that, then if a checker (for some reason) started
658
 
        # running slowly and taking more than 'interval' time, the
659
 
        # client would inevitably timeout, since no checker would get
660
 
        # a chance to run to completion.  If we instead leave running
 
671
        # did that, and if a checker (for some reason) started running
 
672
        # slowly and taking more than 'interval' time, then the client
 
673
        # would inevitably timeout, since no checker would get a
 
674
        # chance to run to completion.  If we instead leave running
661
675
        # checkers alone, the checker would have to take more time
662
676
        # than 'timeout' for the client to be disabled, which is as it
663
677
        # should be.
665
679
        # If a checker exists, make sure it is not a zombie
666
680
        try:
667
681
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
 
        except (AttributeError, OSError) as error:
669
 
            if (isinstance(error, OSError)
670
 
                and error.errno != errno.ECHILD):
671
 
                raise error
 
682
        except AttributeError:
 
683
            pass
 
684
        except OSError as error:
 
685
            if error.errno != errno.ECHILD:
 
686
                raise
672
687
        else:
673
688
            if pid:
674
689
                logger.warning("Checker was a zombie")
677
692
                                      self.current_checker_command)
678
693
        # Start a new checker if needed
679
694
        if self.checker is None:
 
695
            # Escape attributes for the shell
 
696
            escaped_attrs = { attr:
 
697
                                  re.escape(str(getattr(self, attr)))
 
698
                              for attr in self.runtime_expansions }
680
699
            try:
681
 
                # In case checker_command has exactly one % operator
682
 
                command = self.checker_command % self.host
683
 
            except TypeError:
684
 
                # Escape attributes for the shell
685
 
                escaped_attrs = dict(
686
 
                    (attr,
687
 
                     re.escape(unicode(str(getattr(self, attr, "")),
688
 
                                       errors=
689
 
                                       'replace')))
690
 
                    for attr in
691
 
                    self.runtime_expansions)
692
 
                
693
 
                try:
694
 
                    command = self.checker_command % escaped_attrs
695
 
                except TypeError as error:
696
 
                    logger.error('Could not format string "%s"',
697
 
                                 self.checker_command, exc_info=error)
698
 
                    return True # Try again later
 
700
                command = self.checker_command % escaped_attrs
 
701
            except TypeError as error:
 
702
                logger.error('Could not format string "%s"',
 
703
                             self.checker_command, exc_info=error)
 
704
                return True # Try again later
699
705
            self.current_checker_command = command
700
706
            try:
701
707
                logger.info("Starting checker %r for %s",
704
710
                # in normal mode, that is already done by daemon(),
705
711
                # and in debug mode we don't want to.  (Stdin is
706
712
                # always replaced by /dev/null.)
 
713
                # The exception is when not debugging but nevertheless
 
714
                # running in the foreground; use the previously
 
715
                # created wnull.
 
716
                popen_args = {}
 
717
                if (not self.server_settings["debug"]
 
718
                    and self.server_settings["foreground"]):
 
719
                    popen_args.update({"stdout": wnull,
 
720
                                       "stderr": wnull })
707
721
                self.checker = subprocess.Popen(command,
708
722
                                                close_fds=True,
709
 
                                                shell=True, cwd="/")
710
 
                self.checker_callback_tag = (gobject.child_watch_add
711
 
                                             (self.checker.pid,
712
 
                                              self.checker_callback,
713
 
                                              data=command))
714
 
                # The checker may have completed before the gobject
715
 
                # watch was added.  Check for this.
716
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
 
                if pid:
718
 
                    gobject.source_remove(self.checker_callback_tag)
719
 
                    self.checker_callback(pid, status, command)
 
723
                                                shell=True, cwd="/",
 
724
                                                **popen_args)
720
725
            except OSError as error:
721
726
                logger.error("Failed to start subprocess",
722
727
                             exc_info=error)
 
728
                return True
 
729
            self.checker_callback_tag = (gobject.child_watch_add
 
730
                                         (self.checker.pid,
 
731
                                          self.checker_callback,
 
732
                                          data=command))
 
733
            # The checker may have completed before the gobject
 
734
            # watch was added.  Check for this.
 
735
            try:
 
736
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
737
            except OSError as error:
 
738
                if error.errno == errno.ECHILD:
 
739
                    # This should never happen
 
740
                    logger.error("Child process vanished",
 
741
                                 exc_info=error)
 
742
                    return True
 
743
                raise
 
744
            if pid:
 
745
                gobject.source_remove(self.checker_callback_tag)
 
746
                self.checker_callback(pid, status, command)
723
747
        # Re-run this periodically if run by gobject.timeout_add
724
748
        return True
725
749
    
758
782
    # "Set" method, so we fail early here:
759
783
    if byte_arrays and signature != "ay":
760
784
        raise ValueError("Byte arrays not supported for non-'ay'"
761
 
                         " signature {0!r}".format(signature))
 
785
                         " signature {!r}".format(signature))
762
786
    def decorator(func):
763
787
        func._dbus_is_property = True
764
788
        func._dbus_interface = dbus_interface
773
797
 
774
798
 
775
799
def dbus_interface_annotations(dbus_interface):
776
 
    """Decorator for marking functions returning interface annotations.
 
800
    """Decorator for marking functions returning interface annotations
777
801
    
778
802
    Usage:
779
803
    
795
819
    """Decorator to annotate D-Bus methods, signals or properties
796
820
    Usage:
797
821
    
 
822
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
823
                       "org.freedesktop.DBus.Property."
 
824
                       "EmitsChangedSignal": "false"})
798
825
    @dbus_service_property("org.example.Interface", signature="b",
799
826
                           access="r")
800
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
 
                        "org.freedesktop.DBus.Property."
802
 
                        "EmitsChangedSignal": "false"})
803
827
    def Property_dbus_property(self):
804
828
        return dbus.Boolean(False)
805
829
    """
812
836
class DBusPropertyException(dbus.exceptions.DBusException):
813
837
    """A base class for D-Bus property-related exceptions
814
838
    """
815
 
    def __unicode__(self):
816
 
        return unicode(str(self))
817
 
 
 
839
    pass
818
840
 
819
841
class DBusPropertyAccessException(DBusPropertyException):
820
842
    """A property's access permissions disallows an operation.
843
865
        If called like _is_dbus_thing("method") it returns a function
844
866
        suitable for use as predicate to inspect.getmembers().
845
867
        """
846
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
868
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
847
869
                                   False)
848
870
    
849
871
    def _get_all_dbus_things(self, thing):
898
920
            # The byte_arrays option is not supported yet on
899
921
            # signatures other than "ay".
900
922
            if prop._dbus_signature != "ay":
901
 
                raise ValueError
 
923
                raise ValueError("Byte arrays not supported for non-"
 
924
                                 "'ay' signature {!r}"
 
925
                                 .format(prop._dbus_signature))
902
926
            value = dbus.ByteArray(b''.join(chr(byte)
903
927
                                            for byte in value))
904
928
        prop(value)
928
952
                                           value.variant_level+1)
929
953
        return dbus.Dictionary(properties, signature="sv")
930
954
    
 
955
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
956
    def PropertiesChanged(self, interface_name, changed_properties,
 
957
                          invalidated_properties):
 
958
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
959
        standard.
 
960
        """
 
961
        pass
 
962
    
931
963
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
932
964
                         out_signature="s",
933
965
                         path_keyword='object_path',
968
1000
                                              (prop,
969
1001
                                               "_dbus_annotations",
970
1002
                                               {}))
971
 
                        for name, value in annots.iteritems():
 
1003
                        for name, value in annots.items():
972
1004
                            ann_tag = document.createElement(
973
1005
                                "annotation")
974
1006
                            ann_tag.setAttribute("name", name)
976
1008
                            tag.appendChild(ann_tag)
977
1009
                # Add interface annotation tags
978
1010
                for annotation, value in dict(
979
 
                    itertools.chain(
980
 
                        *(annotations().iteritems()
981
 
                          for name, annotations in
982
 
                          self._get_all_dbus_things("interface")
983
 
                          if name == if_tag.getAttribute("name")
984
 
                          ))).iteritems():
 
1011
                    itertools.chain.from_iterable(
 
1012
                        annotations().items()
 
1013
                        for name, annotations in
 
1014
                        self._get_all_dbus_things("interface")
 
1015
                        if name == if_tag.getAttribute("name")
 
1016
                        )).items():
985
1017
                    ann_tag = document.createElement("annotation")
986
1018
                    ann_tag.setAttribute("name", annotation)
987
1019
                    ann_tag.setAttribute("value", value)
1010
1042
        return xmlstring
1011
1043
 
1012
1044
 
1013
 
def datetime_to_dbus (dt, variant_level=0):
 
1045
def datetime_to_dbus(dt, variant_level=0):
1014
1046
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1015
1047
    if dt is None:
1016
1048
        return dbus.String("", variant_level = variant_level)
1018
1050
                       variant_level=variant_level)
1019
1051
 
1020
1052
 
1021
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
 
                                  .__metaclass__):
1023
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
1024
 
    will add additional D-Bus attributes matching a certain pattern.
 
1053
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1054
    """A class decorator; applied to a subclass of
 
1055
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1056
    interface names according to the "alt_interface_names" mapping.
 
1057
    Usage:
 
1058
    
 
1059
    @alternate_dbus_interfaces({"org.example.Interface":
 
1060
                                    "net.example.AlternateInterface"})
 
1061
    class SampleDBusObject(dbus.service.Object):
 
1062
        @dbus.service.method("org.example.Interface")
 
1063
        def SampleDBusMethod():
 
1064
            pass
 
1065
    
 
1066
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1067
    reachable via two interfaces: "org.example.Interface" and
 
1068
    "net.example.AlternateInterface", the latter of which will have
 
1069
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1070
    "true", unless "deprecate" is passed with a False value.
 
1071
    
 
1072
    This works for methods and signals, and also for D-Bus properties
 
1073
    (from DBusObjectWithProperties) and interfaces (from the
 
1074
    dbus_interface_annotations decorator).
1025
1075
    """
1026
 
    def __new__(mcs, name, bases, attr):
1027
 
        # Go through all the base classes which could have D-Bus
1028
 
        # methods, signals, or properties in them
1029
 
        old_interface_names = []
1030
 
        for base in (b for b in bases
1031
 
                     if issubclass(b, dbus.service.Object)):
1032
 
            # Go though all attributes of the base class
1033
 
            for attrname, attribute in inspect.getmembers(base):
 
1076
    def wrapper(cls):
 
1077
        for orig_interface_name, alt_interface_name in (
 
1078
            alt_interface_names.items()):
 
1079
            attr = {}
 
1080
            interface_names = set()
 
1081
            # Go though all attributes of the class
 
1082
            for attrname, attribute in inspect.getmembers(cls):
1034
1083
                # Ignore non-D-Bus attributes, and D-Bus attributes
1035
1084
                # with the wrong interface name
1036
1085
                if (not hasattr(attribute, "_dbus_interface")
1037
1086
                    or not attribute._dbus_interface
1038
 
                    .startswith("se.recompile.Mandos")):
 
1087
                    .startswith(orig_interface_name)):
1039
1088
                    continue
1040
1089
                # Create an alternate D-Bus interface name based on
1041
1090
                # the current name
1042
1091
                alt_interface = (attribute._dbus_interface
1043
 
                                 .replace("se.recompile.Mandos",
1044
 
                                          "se.bsnet.fukt.Mandos"))
1045
 
                if alt_interface != attribute._dbus_interface:
1046
 
                    old_interface_names.append(alt_interface)
 
1092
                                 .replace(orig_interface_name,
 
1093
                                          alt_interface_name))
 
1094
                interface_names.add(alt_interface)
1047
1095
                # Is this a D-Bus signal?
1048
1096
                if getattr(attribute, "_dbus_is_signal", False):
1049
 
                    # Extract the original non-method function by
1050
 
                    # black magic
 
1097
                    # Extract the original non-method undecorated
 
1098
                    # function by black magic
1051
1099
                    nonmethod_func = (dict(
1052
1100
                            zip(attribute.func_code.co_freevars,
1053
1101
                                attribute.__closure__))["func"]
1071
1119
                    except AttributeError:
1072
1120
                        pass
1073
1121
                    # Define a creator of a function to call both the
1074
 
                    # old and new functions, so both the old and new
1075
 
                    # signals gets sent when the function is called
 
1122
                    # original and alternate functions, so both the
 
1123
                    # original and alternate signals gets sent when
 
1124
                    # the function is called
1076
1125
                    def fixscope(func1, func2):
1077
1126
                        """This function is a scope container to pass
1078
1127
                        func1 and func2 to the "call_both" function
1085
1134
                        return call_both
1086
1135
                    # Create the "call_both" function and add it to
1087
1136
                    # the class
1088
 
                    attr[attrname] = fixscope(attribute,
1089
 
                                              new_function)
 
1137
                    attr[attrname] = fixscope(attribute, new_function)
1090
1138
                # Is this a D-Bus method?
1091
1139
                elif getattr(attribute, "_dbus_is_method", False):
1092
1140
                    # Create a new, but exactly alike, function
1148
1196
                                        attribute.func_name,
1149
1197
                                        attribute.func_defaults,
1150
1198
                                        attribute.func_closure)))
1151
 
        # Deprecate all old interfaces
1152
 
        basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
 
        for old_interface_name in old_interface_names:
1154
 
            @dbus_interface_annotations(old_interface_name)
1155
 
            def func(self):
1156
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1157
 
            # Find an unused name
1158
 
            for aname in (basename.format(i) for i in
1159
 
                          itertools.count()):
1160
 
                if aname not in attr:
1161
 
                    attr[aname] = func
1162
 
                    break
1163
 
        return type.__new__(mcs, name, bases, attr)
1164
 
 
1165
 
 
 
1199
            if deprecate:
 
1200
                # Deprecate all alternate interfaces
 
1201
                iname="_AlternateDBusNames_interface_annotation{}"
 
1202
                for interface_name in interface_names:
 
1203
                    @dbus_interface_annotations(interface_name)
 
1204
                    def func(self):
 
1205
                        return { "org.freedesktop.DBus.Deprecated":
 
1206
                                     "true" }
 
1207
                    # Find an unused name
 
1208
                    for aname in (iname.format(i)
 
1209
                                  for i in itertools.count()):
 
1210
                        if aname not in attr:
 
1211
                            attr[aname] = func
 
1212
                            break
 
1213
            if interface_names:
 
1214
                # Replace the class with a new subclass of it with
 
1215
                # methods, signals, etc. as created above.
 
1216
                cls = type(b"{}Alternate".format(cls.__name__),
 
1217
                           (cls,), attr)
 
1218
        return cls
 
1219
    return wrapper
 
1220
 
 
1221
 
 
1222
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1223
                                "se.bsnet.fukt.Mandos"})
1166
1224
class ClientDBus(Client, DBusObjectWithProperties):
1167
1225
    """A Client class using D-Bus
1168
1226
    
1174
1232
    runtime_expansions = (Client.runtime_expansions
1175
1233
                          + ("dbus_object_path",))
1176
1234
    
 
1235
    _interface = "se.recompile.Mandos.Client"
 
1236
    
1177
1237
    # dbus.service.Object doesn't use super(), so we can't either.
1178
1238
    
1179
1239
    def __init__(self, bus = None, *args, **kwargs):
1181
1241
        Client.__init__(self, *args, **kwargs)
1182
1242
        # Only now, when this client is initialized, can it show up on
1183
1243
        # the D-Bus
1184
 
        client_object_name = unicode(self.name).translate(
 
1244
        client_object_name = str(self.name).translate(
1185
1245
            {ord("."): ord("_"),
1186
1246
             ord("-"): ord("_")})
1187
1247
        self.dbus_object_path = (dbus.ObjectPath
1188
1248
                                 ("/clients/" + client_object_name))
1189
1249
        DBusObjectWithProperties.__init__(self, self.bus,
1190
1250
                                          self.dbus_object_path)
1191
 
        
 
1251
    
1192
1252
    def notifychangeproperty(transform_func,
1193
1253
                             dbus_name, type_func=lambda x: x,
1194
 
                             variant_level=1):
 
1254
                             variant_level=1, invalidate_only=False,
 
1255
                             _interface=_interface):
1195
1256
        """ Modify a variable so that it's a property which announces
1196
1257
        its changes to DBus.
1197
1258
        
1202
1263
                   to the D-Bus.  Default: no transform
1203
1264
        variant_level: D-Bus variant level.  Default: 1
1204
1265
        """
1205
 
        attrname = "_{0}".format(dbus_name)
 
1266
        attrname = "_{}".format(dbus_name)
1206
1267
        def setter(self, value):
1207
1268
            if hasattr(self, "dbus_object_path"):
1208
1269
                if (not hasattr(self, attrname) or
1209
1270
                    type_func(getattr(self, attrname, None))
1210
1271
                    != type_func(value)):
1211
 
                    dbus_value = transform_func(type_func(value),
1212
 
                                                variant_level
1213
 
                                                =variant_level)
1214
 
                    self.PropertyChanged(dbus.String(dbus_name),
1215
 
                                         dbus_value)
 
1272
                    if invalidate_only:
 
1273
                        self.PropertiesChanged(_interface,
 
1274
                                               dbus.Dictionary(),
 
1275
                                               dbus.Array
 
1276
                                               ((dbus_name,)))
 
1277
                    else:
 
1278
                        dbus_value = transform_func(type_func(value),
 
1279
                                                    variant_level
 
1280
                                                    =variant_level)
 
1281
                        self.PropertyChanged(dbus.String(dbus_name),
 
1282
                                             dbus_value)
 
1283
                        self.PropertiesChanged(_interface,
 
1284
                                               dbus.Dictionary({
 
1285
                                    dbus.String(dbus_name):
 
1286
                                        dbus_value }), dbus.Array())
1216
1287
            setattr(self, attrname, value)
1217
1288
        
1218
1289
        return property(lambda self: getattr(self, attrname), setter)
1219
1290
    
1220
 
    
1221
1291
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1222
1292
    approvals_pending = notifychangeproperty(dbus.Boolean,
1223
1293
                                             "ApprovalPending",
1239
1309
    approval_delay = notifychangeproperty(dbus.UInt64,
1240
1310
                                          "ApprovalDelay",
1241
1311
                                          type_func =
1242
 
                                          timedelta_to_milliseconds)
 
1312
                                          lambda td: td.total_seconds()
 
1313
                                          * 1000)
1243
1314
    approval_duration = notifychangeproperty(
1244
1315
        dbus.UInt64, "ApprovalDuration",
1245
 
        type_func = timedelta_to_milliseconds)
 
1316
        type_func = lambda td: td.total_seconds() * 1000)
1246
1317
    host = notifychangeproperty(dbus.String, "Host")
1247
1318
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
 
                                   type_func =
1249
 
                                   timedelta_to_milliseconds)
 
1319
                                   type_func = lambda td:
 
1320
                                       td.total_seconds() * 1000)
1250
1321
    extended_timeout = notifychangeproperty(
1251
1322
        dbus.UInt64, "ExtendedTimeout",
1252
 
        type_func = timedelta_to_milliseconds)
 
1323
        type_func = lambda td: td.total_seconds() * 1000)
1253
1324
    interval = notifychangeproperty(dbus.UInt64,
1254
1325
                                    "Interval",
1255
1326
                                    type_func =
1256
 
                                    timedelta_to_milliseconds)
 
1327
                                    lambda td: td.total_seconds()
 
1328
                                    * 1000)
1257
1329
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1330
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1331
                                  invalidate_only=True)
1258
1332
    
1259
1333
    del notifychangeproperty
1260
1334
    
1287
1361
                                       *args, **kwargs)
1288
1362
    
1289
1363
    def start_checker(self, *args, **kwargs):
1290
 
        old_checker = self.checker
1291
 
        if self.checker is not None:
1292
 
            old_checker_pid = self.checker.pid
1293
 
        else:
1294
 
            old_checker_pid = None
 
1364
        old_checker_pid = getattr(self.checker, "pid", None)
1295
1365
        r = Client.start_checker(self, *args, **kwargs)
1296
1366
        # Only if new checker process was started
1297
1367
        if (self.checker is not None
1305
1375
        return False
1306
1376
    
1307
1377
    def approve(self, value=True):
1308
 
        self.send_changedstate()
1309
1378
        self.approved = value
1310
 
        gobject.timeout_add(timedelta_to_milliseconds
1311
 
                            (self.approval_duration),
1312
 
                            self._reset_approved)
1313
 
    
 
1379
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1380
                                * 1000), self._reset_approved)
 
1381
        self.send_changedstate()
1314
1382
    
1315
1383
    ## D-Bus methods, signals & properties
1316
 
    _interface = "se.recompile.Mandos.Client"
1317
1384
    
1318
1385
    ## Interfaces
1319
1386
    
1320
 
    @dbus_interface_annotations(_interface)
1321
 
    def _foo(self):
1322
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
 
                     "false"}
1324
 
    
1325
1387
    ## Signals
1326
1388
    
1327
1389
    # CheckerCompleted - signal
1337
1399
        pass
1338
1400
    
1339
1401
    # PropertyChanged - signal
 
1402
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1340
1403
    @dbus.service.signal(_interface, signature="sv")
1341
1404
    def PropertyChanged(self, property, value):
1342
1405
        "D-Bus signal"
1418
1481
                           access="readwrite")
1419
1482
    def ApprovalDelay_dbus_property(self, value=None):
1420
1483
        if value is None:       # get
1421
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1484
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1485
                               * 1000)
1422
1486
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1423
1487
    
1424
1488
    # ApprovalDuration - property
1426
1490
                           access="readwrite")
1427
1491
    def ApprovalDuration_dbus_property(self, value=None):
1428
1492
        if value is None:       # get
1429
 
            return dbus.UInt64(timedelta_to_milliseconds(
1430
 
                    self.approval_duration))
 
1493
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1494
                               * 1000)
1431
1495
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
1496
    
1433
1497
    # Name - property
1446
1510
    def Host_dbus_property(self, value=None):
1447
1511
        if value is None:       # get
1448
1512
            return dbus.String(self.host)
1449
 
        self.host = unicode(value)
 
1513
        self.host = str(value)
1450
1514
    
1451
1515
    # Created - property
1452
1516
    @dbus_service_property(_interface, signature="s", access="read")
1499
1563
                           access="readwrite")
1500
1564
    def Timeout_dbus_property(self, value=None):
1501
1565
        if value is None:       # get
1502
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1566
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1567
        old_timeout = self.timeout
1503
1568
        self.timeout = datetime.timedelta(0, 0, 0, value)
1504
 
        # Reschedule timeout
 
1569
        # Reschedule disabling
1505
1570
        if self.enabled:
1506
1571
            now = datetime.datetime.utcnow()
1507
 
            time_to_die = timedelta_to_milliseconds(
1508
 
                (self.last_checked_ok + self.timeout) - now)
1509
 
            if time_to_die <= 0:
 
1572
            self.expires += self.timeout - old_timeout
 
1573
            if self.expires <= now:
1510
1574
                # The timeout has passed
1511
1575
                self.disable()
1512
1576
            else:
1513
 
                self.expires = (now +
1514
 
                                datetime.timedelta(milliseconds =
1515
 
                                                   time_to_die))
1516
1577
                if (getattr(self, "disable_initiator_tag", None)
1517
1578
                    is None):
1518
1579
                    return
1519
1580
                gobject.source_remove(self.disable_initiator_tag)
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
1521
 
                                              (time_to_die,
1522
 
                                               self.disable))
 
1581
                self.disable_initiator_tag = (
 
1582
                    gobject.timeout_add(
 
1583
                        int((self.expires - now).total_seconds()
 
1584
                            * 1000), self.disable))
1523
1585
    
1524
1586
    # ExtendedTimeout - property
1525
1587
    @dbus_service_property(_interface, signature="t",
1526
1588
                           access="readwrite")
1527
1589
    def ExtendedTimeout_dbus_property(self, value=None):
1528
1590
        if value is None:       # get
1529
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1591
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1592
                               * 1000)
1530
1593
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1531
1594
    
1532
1595
    # Interval - property
1534
1597
                           access="readwrite")
1535
1598
    def Interval_dbus_property(self, value=None):
1536
1599
        if value is None:       # get
1537
 
            return dbus.UInt64(self.interval_milliseconds())
 
1600
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
1601
        self.interval = datetime.timedelta(0, 0, 0, value)
1539
1602
        if getattr(self, "checker_initiator_tag", None) is None:
1540
1603
            return
1551
1614
    def Checker_dbus_property(self, value=None):
1552
1615
        if value is None:       # get
1553
1616
            return dbus.String(self.checker_command)
1554
 
        self.checker_command = unicode(value)
 
1617
        self.checker_command = str(value)
1555
1618
    
1556
1619
    # CheckerRunning - property
1557
1620
    @dbus_service_property(_interface, signature="b",
1573
1636
    @dbus_service_property(_interface, signature="ay",
1574
1637
                           access="write", byte_arrays=True)
1575
1638
    def Secret_dbus_property(self, value):
1576
 
        self.secret = str(value)
 
1639
        self.secret = bytes(value)
1577
1640
    
1578
1641
    del _interface
1579
1642
 
1604
1667
        self._pipe.send(('setattr', name, value))
1605
1668
 
1606
1669
 
1607
 
class ClientDBusTransitional(ClientDBus):
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
1609
 
 
1610
 
 
1611
1670
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1671
    """A class to handle client connections.
1613
1672
    
1617
1676
    def handle(self):
1618
1677
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
1678
            logger.info("TCP connection from: %s",
1620
 
                        unicode(self.client_address))
 
1679
                        str(self.client_address))
1621
1680
            logger.debug("Pipe FD: %d",
1622
1681
                         self.server.child_pipe.fileno())
1623
1682
            
1649
1708
            logger.debug("Protocol version: %r", line)
1650
1709
            try:
1651
1710
                if int(line.strip().split()[0]) > 1:
1652
 
                    raise RuntimeError
 
1711
                    raise RuntimeError(line)
1653
1712
            except (ValueError, IndexError, RuntimeError) as error:
1654
1713
                logger.error("Unknown protocol version: %s", error)
1655
1714
                return
1704
1763
                        if self.server.use_dbus:
1705
1764
                            # Emit D-Bus signal
1706
1765
                            client.NeedApproval(
1707
 
                                client.approval_delay_milliseconds(),
1708
 
                                client.approved_by_default)
 
1766
                                client.approval_delay.total_seconds()
 
1767
                                * 1000, client.approved_by_default)
1709
1768
                    else:
1710
1769
                        logger.warning("Client %s was not approved",
1711
1770
                                       client.name)
1717
1776
                    #wait until timeout or approved
1718
1777
                    time = datetime.datetime.now()
1719
1778
                    client.changedstate.acquire()
1720
 
                    (client.changedstate.wait
1721
 
                     (float(client.timedelta_to_milliseconds(delay)
1722
 
                            / 1000)))
 
1779
                    client.changedstate.wait(delay.total_seconds())
1723
1780
                    client.changedstate.release()
1724
1781
                    time2 = datetime.datetime.now()
1725
1782
                    if (time2 - time) >= delay:
1741
1798
                    try:
1742
1799
                        sent = session.send(client.secret[sent_size:])
1743
1800
                    except gnutls.errors.GNUTLSError as error:
1744
 
                        logger.warning("gnutls send failed")
 
1801
                        logger.warning("gnutls send failed",
 
1802
                                       exc_info=error)
1745
1803
                        return
1746
1804
                    logger.debug("Sent: %d, remaining: %d",
1747
1805
                                 sent, len(client.secret)
1761
1819
                try:
1762
1820
                    session.bye()
1763
1821
                except gnutls.errors.GNUTLSError as error:
1764
 
                    logger.warning("GnuTLS bye failed")
 
1822
                    logger.warning("GnuTLS bye failed",
 
1823
                                   exc_info=error)
1765
1824
    
1766
1825
    @staticmethod
1767
1826
    def peer_certificate(session):
1839
1898
    def process_request(self, request, address):
1840
1899
        """Start a new process to process the request."""
1841
1900
        proc = multiprocessing.Process(target = self.sub_process_main,
1842
 
                                       args = (request,
1843
 
                                               address))
 
1901
                                       args = (request, address))
1844
1902
        proc.start()
1845
1903
        return proc
1846
1904
 
1861
1919
    
1862
1920
    def add_pipe(self, parent_pipe, proc):
1863
1921
        """Dummy function; override as necessary"""
1864
 
        raise NotImplementedError
 
1922
        raise NotImplementedError()
1865
1923
 
1866
1924
 
1867
1925
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1874
1932
        use_ipv6:       Boolean; to use IPv6 or not
1875
1933
    """
1876
1934
    def __init__(self, server_address, RequestHandlerClass,
1877
 
                 interface=None, use_ipv6=True):
 
1935
                 interface=None, use_ipv6=True, socketfd=None):
 
1936
        """If socketfd is set, use that file descriptor instead of
 
1937
        creating a new one with socket.socket().
 
1938
        """
1878
1939
        self.interface = interface
1879
1940
        if use_ipv6:
1880
1941
            self.address_family = socket.AF_INET6
 
1942
        if socketfd is not None:
 
1943
            # Save the file descriptor
 
1944
            self.socketfd = socketfd
 
1945
            # Save the original socket.socket() function
 
1946
            self.socket_socket = socket.socket
 
1947
            # To implement --socket, we monkey patch socket.socket.
 
1948
            # 
 
1949
            # (When socketserver.TCPServer is a new-style class, we
 
1950
            # could make self.socket into a property instead of monkey
 
1951
            # patching socket.socket.)
 
1952
            # 
 
1953
            # Create a one-time-only replacement for socket.socket()
 
1954
            @functools.wraps(socket.socket)
 
1955
            def socket_wrapper(*args, **kwargs):
 
1956
                # Restore original function so subsequent calls are
 
1957
                # not affected.
 
1958
                socket.socket = self.socket_socket
 
1959
                del self.socket_socket
 
1960
                # This time only, return a new socket object from the
 
1961
                # saved file descriptor.
 
1962
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1963
            # Replace socket.socket() function with wrapper
 
1964
            socket.socket = socket_wrapper
 
1965
        # The socketserver.TCPServer.__init__ will call
 
1966
        # socket.socket(), which might be our replacement,
 
1967
        # socket_wrapper(), if socketfd was set.
1881
1968
        socketserver.TCPServer.__init__(self, server_address,
1882
1969
                                        RequestHandlerClass)
 
1970
    
1883
1971
    def server_bind(self):
1884
1972
        """This overrides the normal server_bind() function
1885
1973
        to bind to an interface if one was specified, and also NOT to
1893
1981
                try:
1894
1982
                    self.socket.setsockopt(socket.SOL_SOCKET,
1895
1983
                                           SO_BINDTODEVICE,
1896
 
                                           str(self.interface
1897
 
                                               + '\0'))
 
1984
                                           (self.interface + "\0")
 
1985
                                           .encode("utf-8"))
1898
1986
                except socket.error as error:
1899
 
                    if error[0] == errno.EPERM:
1900
 
                        logger.error("No permission to"
1901
 
                                     " bind to interface %s",
1902
 
                                     self.interface)
1903
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1987
                    if error.errno == errno.EPERM:
 
1988
                        logger.error("No permission to bind to"
 
1989
                                     " interface %s", self.interface)
 
1990
                    elif error.errno == errno.ENOPROTOOPT:
1904
1991
                        logger.error("SO_BINDTODEVICE not available;"
1905
1992
                                     " cannot bind to interface %s",
1906
1993
                                     self.interface)
 
1994
                    elif error.errno == errno.ENODEV:
 
1995
                        logger.error("Interface %s does not exist,"
 
1996
                                     " cannot bind", self.interface)
1907
1997
                    else:
1908
1998
                        raise
1909
1999
        # Only bind(2) the socket if we really need to.
1912
2002
                if self.address_family == socket.AF_INET6:
1913
2003
                    any_address = "::" # in6addr_any
1914
2004
                else:
1915
 
                    any_address = socket.INADDR_ANY
 
2005
                    any_address = "0.0.0.0" # INADDR_ANY
1916
2006
                self.server_address = (any_address,
1917
2007
                                       self.server_address[1])
1918
2008
            elif not self.server_address[1]:
1939
2029
    """
1940
2030
    def __init__(self, server_address, RequestHandlerClass,
1941
2031
                 interface=None, use_ipv6=True, clients=None,
1942
 
                 gnutls_priority=None, use_dbus=True):
 
2032
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1943
2033
        self.enabled = False
1944
2034
        self.clients = clients
1945
2035
        if self.clients is None:
1949
2039
        IPv6_TCPServer.__init__(self, server_address,
1950
2040
                                RequestHandlerClass,
1951
2041
                                interface = interface,
1952
 
                                use_ipv6 = use_ipv6)
 
2042
                                use_ipv6 = use_ipv6,
 
2043
                                socketfd = socketfd)
1953
2044
    def server_activate(self):
1954
2045
        if self.enabled:
1955
2046
            return socketserver.TCPServer.server_activate(self)
1968
2059
    
1969
2060
    def handle_ipc(self, source, condition, parent_pipe=None,
1970
2061
                   proc = None, client_object=None):
1971
 
        condition_names = {
1972
 
            gobject.IO_IN: "IN",   # There is data to read.
1973
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1974
 
                                    # blocking).
1975
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
 
            gobject.IO_ERR: "ERR", # Error condition.
1977
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1978
 
                                    # broken, usually for pipes and
1979
 
                                    # sockets).
1980
 
            }
1981
 
        conditions_string = ' | '.join(name
1982
 
                                       for cond, name in
1983
 
                                       condition_names.iteritems()
1984
 
                                       if cond & condition)
1985
2062
        # error, or the other end of multiprocessing.Pipe has closed
1986
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2063
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1987
2064
            # Wait for other process to exit
1988
2065
            proc.join()
1989
2066
            return False
2047
2124
        return True
2048
2125
 
2049
2126
 
 
2127
def rfc3339_duration_to_delta(duration):
 
2128
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2129
    
 
2130
    >>> rfc3339_duration_to_delta("P7D")
 
2131
    datetime.timedelta(7)
 
2132
    >>> rfc3339_duration_to_delta("PT60S")
 
2133
    datetime.timedelta(0, 60)
 
2134
    >>> rfc3339_duration_to_delta("PT60M")
 
2135
    datetime.timedelta(0, 3600)
 
2136
    >>> rfc3339_duration_to_delta("PT24H")
 
2137
    datetime.timedelta(1)
 
2138
    >>> rfc3339_duration_to_delta("P1W")
 
2139
    datetime.timedelta(7)
 
2140
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2141
    datetime.timedelta(0, 330)
 
2142
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2143
    datetime.timedelta(1, 200)
 
2144
    """
 
2145
    
 
2146
    # Parsing an RFC 3339 duration with regular expressions is not
 
2147
    # possible - there would have to be multiple places for the same
 
2148
    # values, like seconds.  The current code, while more esoteric, is
 
2149
    # cleaner without depending on a parsing library.  If Python had a
 
2150
    # built-in library for parsing we would use it, but we'd like to
 
2151
    # avoid excessive use of external libraries.
 
2152
    
 
2153
    # New type for defining tokens, syntax, and semantics all-in-one
 
2154
    Token = collections.namedtuple("Token",
 
2155
                                   ("regexp", # To match token; if
 
2156
                                              # "value" is not None,
 
2157
                                              # must have a "group"
 
2158
                                              # containing digits
 
2159
                                    "value",  # datetime.timedelta or
 
2160
                                              # None
 
2161
                                    "followers")) # Tokens valid after
 
2162
                                                  # this token
 
2163
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2164
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2165
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2166
    token_second = Token(re.compile(r"(\d+)S"),
 
2167
                         datetime.timedelta(seconds=1),
 
2168
                         frozenset((token_end,)))
 
2169
    token_minute = Token(re.compile(r"(\d+)M"),
 
2170
                         datetime.timedelta(minutes=1),
 
2171
                         frozenset((token_second, token_end)))
 
2172
    token_hour = Token(re.compile(r"(\d+)H"),
 
2173
                       datetime.timedelta(hours=1),
 
2174
                       frozenset((token_minute, token_end)))
 
2175
    token_time = Token(re.compile(r"T"),
 
2176
                       None,
 
2177
                       frozenset((token_hour, token_minute,
 
2178
                                  token_second)))
 
2179
    token_day = Token(re.compile(r"(\d+)D"),
 
2180
                      datetime.timedelta(days=1),
 
2181
                      frozenset((token_time, token_end)))
 
2182
    token_month = Token(re.compile(r"(\d+)M"),
 
2183
                        datetime.timedelta(weeks=4),
 
2184
                        frozenset((token_day, token_end)))
 
2185
    token_year = Token(re.compile(r"(\d+)Y"),
 
2186
                       datetime.timedelta(weeks=52),
 
2187
                       frozenset((token_month, token_end)))
 
2188
    token_week = Token(re.compile(r"(\d+)W"),
 
2189
                       datetime.timedelta(weeks=1),
 
2190
                       frozenset((token_end,)))
 
2191
    token_duration = Token(re.compile(r"P"), None,
 
2192
                           frozenset((token_year, token_month,
 
2193
                                      token_day, token_time,
 
2194
                                      token_week)))
 
2195
    # Define starting values
 
2196
    value = datetime.timedelta() # Value so far
 
2197
    found_token = None
 
2198
    followers = frozenset((token_duration,)) # Following valid tokens
 
2199
    s = duration                # String left to parse
 
2200
    # Loop until end token is found
 
2201
    while found_token is not token_end:
 
2202
        # Search for any currently valid tokens
 
2203
        for token in followers:
 
2204
            match = token.regexp.match(s)
 
2205
            if match is not None:
 
2206
                # Token found
 
2207
                if token.value is not None:
 
2208
                    # Value found, parse digits
 
2209
                    factor = int(match.group(1), 10)
 
2210
                    # Add to value so far
 
2211
                    value += factor * token.value
 
2212
                # Strip token from string
 
2213
                s = token.regexp.sub("", s, 1)
 
2214
                # Go to found token
 
2215
                found_token = token
 
2216
                # Set valid next tokens
 
2217
                followers = found_token.followers
 
2218
                break
 
2219
        else:
 
2220
            # No currently valid tokens were found
 
2221
            raise ValueError("Invalid RFC 3339 duration")
 
2222
    # End token found
 
2223
    return value
 
2224
 
 
2225
 
2050
2226
def string_to_delta(interval):
2051
2227
    """Parse a string and return a datetime.timedelta
2052
2228
    
2063
2239
    >>> string_to_delta('5m 30s')
2064
2240
    datetime.timedelta(0, 330)
2065
2241
    """
 
2242
    
 
2243
    try:
 
2244
        return rfc3339_duration_to_delta(interval)
 
2245
    except ValueError:
 
2246
        pass
 
2247
    
2066
2248
    timevalue = datetime.timedelta(0)
2067
2249
    for s in interval.split():
2068
2250
        try:
2069
 
            suffix = unicode(s[-1])
 
2251
            suffix = s[-1]
2070
2252
            value = int(s[:-1])
2071
2253
            if suffix == "d":
2072
2254
                delta = datetime.timedelta(value)
2079
2261
            elif suffix == "w":
2080
2262
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
2263
            else:
2082
 
                raise ValueError("Unknown suffix {0!r}"
 
2264
                raise ValueError("Unknown suffix {!r}"
2083
2265
                                 .format(suffix))
2084
 
        except (ValueError, IndexError) as e:
 
2266
        except IndexError as e:
2085
2267
            raise ValueError(*(e.args))
2086
2268
        timevalue += delta
2087
2269
    return timevalue
2102
2284
        # Close all standard open file descriptors
2103
2285
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2104
2286
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2105
 
            raise OSError(errno.ENODEV,
2106
 
                          "{0} not a character device"
 
2287
            raise OSError(errno.ENODEV, "{} not a character device"
2107
2288
                          .format(os.devnull))
2108
2289
        os.dup2(null, sys.stdin.fileno())
2109
2290
        os.dup2(null, sys.stdout.fileno())
2119
2300
    
2120
2301
    parser = argparse.ArgumentParser()
2121
2302
    parser.add_argument("-v", "--version", action="version",
2122
 
                        version = "%(prog)s {0}".format(version),
 
2303
                        version = "%(prog)s {}".format(version),
2123
2304
                        help="show version number and exit")
2124
2305
    parser.add_argument("-i", "--interface", metavar="IF",
2125
2306
                        help="Bind to interface IF")
2131
2312
                        help="Run self-test")
2132
2313
    parser.add_argument("--debug", action="store_true",
2133
2314
                        help="Debug mode; run in foreground and log"
2134
 
                        " to terminal")
 
2315
                        " to terminal", default=None)
2135
2316
    parser.add_argument("--debuglevel", metavar="LEVEL",
2136
2317
                        help="Debug level for stdout output")
2137
2318
    parser.add_argument("--priority", help="GnuTLS"
2144
2325
                        " files")
2145
2326
    parser.add_argument("--no-dbus", action="store_false",
2146
2327
                        dest="use_dbus", help="Do not provide D-Bus"
2147
 
                        " system bus interface")
 
2328
                        " system bus interface", default=None)
2148
2329
    parser.add_argument("--no-ipv6", action="store_false",
2149
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2330
                        dest="use_ipv6", help="Do not use IPv6",
 
2331
                        default=None)
2150
2332
    parser.add_argument("--no-restore", action="store_false",
2151
2333
                        dest="restore", help="Do not restore stored"
2152
 
                        " state")
 
2334
                        " state", default=None)
 
2335
    parser.add_argument("--socket", type=int,
 
2336
                        help="Specify a file descriptor to a network"
 
2337
                        " socket to use instead of creating one")
2153
2338
    parser.add_argument("--statedir", metavar="DIR",
2154
2339
                        help="Directory to save/restore state in")
 
2340
    parser.add_argument("--foreground", action="store_true",
 
2341
                        help="Run in foreground", default=None)
 
2342
    parser.add_argument("--no-zeroconf", action="store_false",
 
2343
                        dest="zeroconf", help="Do not use Zeroconf",
 
2344
                        default=None)
2155
2345
    
2156
2346
    options = parser.parse_args()
2157
2347
    
2158
2348
    if options.check:
2159
2349
        import doctest
2160
 
        doctest.testmod()
2161
 
        sys.exit()
 
2350
        fail_count, test_count = doctest.testmod()
 
2351
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2162
2352
    
2163
2353
    # Default values for config file for server-global settings
2164
2354
    server_defaults = { "interface": "",
2166
2356
                        "port": "",
2167
2357
                        "debug": "False",
2168
2358
                        "priority":
2169
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2359
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2170
2360
                        "servicename": "Mandos",
2171
2361
                        "use_dbus": "True",
2172
2362
                        "use_ipv6": "True",
2173
2363
                        "debuglevel": "",
2174
2364
                        "restore": "True",
2175
 
                        "statedir": "/var/lib/mandos"
 
2365
                        "socket": "",
 
2366
                        "statedir": "/var/lib/mandos",
 
2367
                        "foreground": "False",
 
2368
                        "zeroconf": "True",
2176
2369
                        }
2177
2370
    
2178
2371
    # Parse config file for server-global settings
2183
2376
    # Convert the SafeConfigParser object to a dict
2184
2377
    server_settings = server_config.defaults()
2185
2378
    # Use the appropriate methods on the non-string config options
2186
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2379
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2187
2380
        server_settings[option] = server_config.getboolean("DEFAULT",
2188
2381
                                                           option)
2189
2382
    if server_settings["port"]:
2190
2383
        server_settings["port"] = server_config.getint("DEFAULT",
2191
2384
                                                       "port")
 
2385
    if server_settings["socket"]:
 
2386
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2387
                                                         "socket")
 
2388
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2389
        # over with an opened os.devnull.  But we don't want this to
 
2390
        # happen with a supplied network socket.
 
2391
        if 0 <= server_settings["socket"] <= 2:
 
2392
            server_settings["socket"] = os.dup(server_settings
 
2393
                                               ["socket"])
2192
2394
    del server_config
2193
2395
    
2194
2396
    # Override the settings from the config file with command line
2196
2398
    for option in ("interface", "address", "port", "debug",
2197
2399
                   "priority", "servicename", "configdir",
2198
2400
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2199
 
                   "statedir"):
 
2401
                   "statedir", "socket", "foreground", "zeroconf"):
2200
2402
        value = getattr(options, option)
2201
2403
        if value is not None:
2202
2404
            server_settings[option] = value
2203
2405
    del options
2204
2406
    # Force all strings to be unicode
2205
2407
    for option in server_settings.keys():
2206
 
        if type(server_settings[option]) is str:
2207
 
            server_settings[option] = unicode(server_settings[option])
 
2408
        if isinstance(server_settings[option], bytes):
 
2409
            server_settings[option] = (server_settings[option]
 
2410
                                       .decode("utf-8"))
 
2411
    # Force all boolean options to be boolean
 
2412
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2413
                   "foreground", "zeroconf"):
 
2414
        server_settings[option] = bool(server_settings[option])
 
2415
    # Debug implies foreground
 
2416
    if server_settings["debug"]:
 
2417
        server_settings["foreground"] = True
2208
2418
    # Now we have our good server settings in "server_settings"
2209
2419
    
2210
2420
    ##################################################################
2211
2421
    
 
2422
    if (not server_settings["zeroconf"] and
 
2423
        not (server_settings["port"]
 
2424
             or server_settings["socket"] != "")):
 
2425
            parser.error("Needs port or socket to work without"
 
2426
                         " Zeroconf")
 
2427
    
2212
2428
    # For convenience
2213
2429
    debug = server_settings["debug"]
2214
2430
    debuglevel = server_settings["debuglevel"]
2216
2432
    use_ipv6 = server_settings["use_ipv6"]
2217
2433
    stored_state_path = os.path.join(server_settings["statedir"],
2218
2434
                                     stored_state_file)
 
2435
    foreground = server_settings["foreground"]
 
2436
    zeroconf = server_settings["zeroconf"]
2219
2437
    
2220
2438
    if debug:
2221
2439
        initlogger(debug, logging.DEBUG)
2228
2446
    
2229
2447
    if server_settings["servicename"] != "Mandos":
2230
2448
        syslogger.setFormatter(logging.Formatter
2231
 
                               ('Mandos ({0}) [%(process)d]:'
 
2449
                               ('Mandos ({}) [%(process)d]:'
2232
2450
                                ' %(levelname)s: %(message)s'
2233
2451
                                .format(server_settings
2234
2452
                                        ["servicename"])))
2242
2460
    global mandos_dbus_service
2243
2461
    mandos_dbus_service = None
2244
2462
    
 
2463
    socketfd = None
 
2464
    if server_settings["socket"] != "":
 
2465
        socketfd = server_settings["socket"]
2245
2466
    tcp_server = MandosServer((server_settings["address"],
2246
2467
                               server_settings["port"]),
2247
2468
                              ClientHandler,
2250
2471
                              use_ipv6=use_ipv6,
2251
2472
                              gnutls_priority=
2252
2473
                              server_settings["priority"],
2253
 
                              use_dbus=use_dbus)
2254
 
    if not debug:
2255
 
        pidfilename = "/var/run/mandos.pid"
 
2474
                              use_dbus=use_dbus,
 
2475
                              socketfd=socketfd)
 
2476
    if not foreground:
 
2477
        pidfilename = "/run/mandos.pid"
 
2478
        if not os.path.isdir("/run/."):
 
2479
            pidfilename = "/var/run/mandos.pid"
 
2480
        pidfile = None
2256
2481
        try:
2257
2482
            pidfile = open(pidfilename, "w")
2258
 
        except IOError:
2259
 
            logger.error("Could not open file %r", pidfilename)
 
2483
        except IOError as e:
 
2484
            logger.error("Could not open file %r", pidfilename,
 
2485
                         exc_info=e)
2260
2486
    
2261
2487
    for name in ("_mandos", "mandos", "nobody"):
2262
2488
        try:
2272
2498
        os.setgid(gid)
2273
2499
        os.setuid(uid)
2274
2500
    except OSError as error:
2275
 
        if error[0] != errno.EPERM:
2276
 
            raise error
 
2501
        if error.errno != errno.EPERM:
 
2502
            raise
2277
2503
    
2278
2504
    if debug:
2279
2505
        # Enable all possible GnuTLS debugging
2296
2522
            os.close(null)
2297
2523
    
2298
2524
    # Need to fork before connecting to D-Bus
2299
 
    if not debug:
 
2525
    if not foreground:
2300
2526
        # Close all input and output, do double fork, etc.
2301
2527
        daemon()
2302
2528
    
 
2529
    # multiprocessing will use threads, so before we use gobject we
 
2530
    # need to inform gobject that threads will be used.
2303
2531
    gobject.threads_init()
2304
2532
    
2305
2533
    global main_loop
2316
2544
                            ("se.bsnet.fukt.Mandos", bus,
2317
2545
                             do_not_queue=True))
2318
2546
        except dbus.exceptions.NameExistsException as e:
2319
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2547
            logger.error("Disabling D-Bus:", exc_info=e)
2320
2548
            use_dbus = False
2321
2549
            server_settings["use_dbus"] = False
2322
2550
            tcp_server.use_dbus = False
2323
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
 
    service = AvahiServiceToSyslog(name =
2325
 
                                   server_settings["servicename"],
2326
 
                                   servicetype = "_mandos._tcp",
2327
 
                                   protocol = protocol, bus = bus)
2328
 
    if server_settings["interface"]:
2329
 
        service.interface = (if_nametoindex
2330
 
                             (str(server_settings["interface"])))
 
2551
    if zeroconf:
 
2552
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2553
        service = AvahiServiceToSyslog(name =
 
2554
                                       server_settings["servicename"],
 
2555
                                       servicetype = "_mandos._tcp",
 
2556
                                       protocol = protocol, bus = bus)
 
2557
        if server_settings["interface"]:
 
2558
            service.interface = (if_nametoindex
 
2559
                                 (server_settings["interface"]
 
2560
                                  .encode("utf-8")))
2331
2561
    
2332
2562
    global multiprocessing_manager
2333
2563
    multiprocessing_manager = multiprocessing.Manager()
2334
2564
    
2335
2565
    client_class = Client
2336
2566
    if use_dbus:
2337
 
        client_class = functools.partial(ClientDBusTransitional,
2338
 
                                         bus = bus)
 
2567
        client_class = functools.partial(ClientDBus, bus = bus)
2339
2568
    
2340
2569
    client_settings = Client.config_parser(client_config)
2341
2570
    old_client_settings = {}
2342
2571
    clients_data = {}
2343
2572
    
 
2573
    # This is used to redirect stdout and stderr for checker processes
 
2574
    global wnull
 
2575
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2576
    # Only used if server is running in foreground but not in debug
 
2577
    # mode
 
2578
    if debug or not foreground:
 
2579
        wnull.close()
 
2580
    
2344
2581
    # Get client data and settings from last running state.
2345
2582
    if server_settings["restore"]:
2346
2583
        try:
2349
2586
                                                     (stored_state))
2350
2587
            os.remove(stored_state_path)
2351
2588
        except IOError as e:
2352
 
            logger.warning("Could not load persistent state: {0}"
2353
 
                           .format(e))
2354
 
            if e.errno != errno.ENOENT:
 
2589
            if e.errno == errno.ENOENT:
 
2590
                logger.warning("Could not load persistent state: {}"
 
2591
                                .format(os.strerror(e.errno)))
 
2592
            else:
 
2593
                logger.critical("Could not load persistent state:",
 
2594
                                exc_info=e)
2355
2595
                raise
2356
2596
        except EOFError as e:
2357
2597
            logger.warning("Could not load persistent state: "
2358
 
                           "EOFError: {0}".format(e))
 
2598
                           "EOFError:", exc_info=e)
2359
2599
    
2360
2600
    with PGPEngine() as pgp:
2361
 
        for client_name, client in clients_data.iteritems():
 
2601
        for client_name, client in clients_data.items():
 
2602
            # Skip removed clients
 
2603
            if client_name not in client_settings:
 
2604
                continue
 
2605
            
2362
2606
            # Decide which value to use after restoring saved state.
2363
2607
            # We have three different values: Old config file,
2364
2608
            # new config file, and saved state.
2385
2629
                if datetime.datetime.utcnow() >= client["expires"]:
2386
2630
                    if not client["last_checked_ok"]:
2387
2631
                        logger.warning(
2388
 
                            "disabling client {0} - Client never "
 
2632
                            "disabling client {} - Client never "
2389
2633
                            "performed a successful checker"
2390
2634
                            .format(client_name))
2391
2635
                        client["enabled"] = False
2392
2636
                    elif client["last_checker_status"] != 0:
2393
2637
                        logger.warning(
2394
 
                            "disabling client {0} - Client "
2395
 
                            "last checker failed with error code {1}"
 
2638
                            "disabling client {} - Client last"
 
2639
                            " checker failed with error code {}"
2396
2640
                            .format(client_name,
2397
2641
                                    client["last_checker_status"]))
2398
2642
                        client["enabled"] = False
2401
2645
                                             .utcnow()
2402
2646
                                             + client["timeout"])
2403
2647
                        logger.debug("Last checker succeeded,"
2404
 
                                     " keeping {0} enabled"
 
2648
                                     " keeping {} enabled"
2405
2649
                                     .format(client_name))
2406
2650
            try:
2407
2651
                client["secret"] = (
2410
2654
                                ["secret"]))
2411
2655
            except PGPError:
2412
2656
                # If decryption fails, we use secret from new settings
2413
 
                logger.debug("Failed to decrypt {0} old secret"
 
2657
                logger.debug("Failed to decrypt {} old secret"
2414
2658
                             .format(client_name))
2415
2659
                client["secret"] = (
2416
2660
                    client_settings[client_name]["secret"])
2417
 
 
2418
2661
    
2419
2662
    # Add/remove clients based on new changes made to config
2420
2663
    for client_name in (set(old_client_settings)
2423
2666
    for client_name in (set(client_settings)
2424
2667
                        - set(old_client_settings)):
2425
2668
        clients_data[client_name] = client_settings[client_name]
2426
 
 
 
2669
    
2427
2670
    # Create all client objects
2428
 
    for client_name, client in clients_data.iteritems():
 
2671
    for client_name, client in clients_data.items():
2429
2672
        tcp_server.clients[client_name] = client_class(
2430
 
            name = client_name, settings = client)
 
2673
            name = client_name, settings = client,
 
2674
            server_settings = server_settings)
2431
2675
    
2432
2676
    if not tcp_server.clients:
2433
2677
        logger.warning("No clients defined")
2434
 
        
2435
 
    if not debug:
2436
 
        try:
2437
 
            with pidfile:
2438
 
                pid = os.getpid()
2439
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2440
 
            del pidfile
2441
 
        except IOError:
2442
 
            logger.error("Could not write to file %r with PID %d",
2443
 
                         pidfilename, pid)
2444
 
        except NameError:
2445
 
            # "pidfile" was never created
2446
 
            pass
 
2678
    
 
2679
    if not foreground:
 
2680
        if pidfile is not None:
 
2681
            try:
 
2682
                with pidfile:
 
2683
                    pid = os.getpid()
 
2684
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2685
            except IOError:
 
2686
                logger.error("Could not write to file %r with PID %d",
 
2687
                             pidfilename, pid)
 
2688
        del pidfile
2447
2689
        del pidfilename
2448
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2449
2690
    
2450
2691
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
2692
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2452
2693
    
2453
2694
    if use_dbus:
 
2695
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2696
                                        "se.bsnet.fukt.Mandos"})
2454
2697
        class MandosDBusService(DBusObjectWithProperties):
2455
2698
            """A D-Bus proxy object"""
2456
2699
            def __init__(self):
2490
2733
            def GetAllClientsWithProperties(self):
2491
2734
                "D-Bus method"
2492
2735
                return dbus.Dictionary(
2493
 
                    ((c.dbus_object_path, c.GetAll(""))
2494
 
                     for c in tcp_server.clients.itervalues()),
 
2736
                    { c.dbus_object_path: c.GetAll("")
 
2737
                      for c in tcp_server.clients.itervalues() },
2495
2738
                    signature="oa{sv}")
2496
2739
            
2497
2740
            @dbus.service.method(_interface, in_signature="o")
2510
2753
            
2511
2754
            del _interface
2512
2755
        
2513
 
        class MandosDBusServiceTransitional(MandosDBusService):
2514
 
            __metaclass__ = AlternateDBusNamesMetaclass
2515
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2756
        mandos_dbus_service = MandosDBusService()
2516
2757
    
2517
2758
    def cleanup():
2518
2759
        "Cleanup function; run on exit"
2519
 
        service.cleanup()
 
2760
        if zeroconf:
 
2761
            service.cleanup()
2520
2762
        
2521
2763
        multiprocessing.active_children()
 
2764
        wnull.close()
2522
2765
        if not (tcp_server.clients or client_settings):
2523
2766
            return
2524
2767
        
2535
2778
                
2536
2779
                # A list of attributes that can not be pickled
2537
2780
                # + secret.
2538
 
                exclude = set(("bus", "changedstate", "secret",
2539
 
                               "checker"))
 
2781
                exclude = { "bus", "changedstate", "secret",
 
2782
                            "checker", "server_settings" }
2540
2783
                for name, typ in (inspect.getmembers
2541
2784
                                  (dbus.service.Object)):
2542
2785
                    exclude.add(name)
2551
2794
                del client_settings[client.name]["secret"]
2552
2795
        
2553
2796
        try:
2554
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
 
                                                prefix="clients-",
2556
 
                                                dir=os.path.dirname
2557
 
                                                (stored_state_path))
2558
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2797
            with (tempfile.NamedTemporaryFile
 
2798
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2799
                   dir=os.path.dirname(stored_state_path),
 
2800
                   delete=False)) as stored_state:
2559
2801
                pickle.dump((clients, client_settings), stored_state)
 
2802
                tempname=stored_state.name
2560
2803
            os.rename(tempname, stored_state_path)
2561
2804
        except (IOError, OSError) as e:
2562
 
            logger.warning("Could not save persistent state: {0}"
2563
 
                           .format(e))
2564
2805
            if not debug:
2565
2806
                try:
2566
2807
                    os.remove(tempname)
2567
2808
                except NameError:
2568
2809
                    pass
2569
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2570
 
                                   errno.EEXIST)):
2571
 
                raise e
 
2810
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2811
                logger.warning("Could not save persistent state: {}"
 
2812
                               .format(os.strerror(e.errno)))
 
2813
            else:
 
2814
                logger.warning("Could not save persistent state:",
 
2815
                               exc_info=e)
 
2816
                raise
2572
2817
        
2573
2818
        # Delete all clients, and settings from config
2574
2819
        while tcp_server.clients:
2598
2843
    tcp_server.server_activate()
2599
2844
    
2600
2845
    # Find out what port we got
2601
 
    service.port = tcp_server.socket.getsockname()[1]
 
2846
    if zeroconf:
 
2847
        service.port = tcp_server.socket.getsockname()[1]
2602
2848
    if use_ipv6:
2603
2849
        logger.info("Now listening on address %r, port %d,"
2604
2850
                    " flowinfo %d, scope_id %d",
2610
2856
    #service.interface = tcp_server.socket.getsockname()[3]
2611
2857
    
2612
2858
    try:
2613
 
        # From the Avahi example code
2614
 
        try:
2615
 
            service.activate()
2616
 
        except dbus.exceptions.DBusException as error:
2617
 
            logger.critical("D-Bus Exception", exc_info=error)
2618
 
            cleanup()
2619
 
            sys.exit(1)
2620
 
        # End of Avahi example code
 
2859
        if zeroconf:
 
2860
            # From the Avahi example code
 
2861
            try:
 
2862
                service.activate()
 
2863
            except dbus.exceptions.DBusException as error:
 
2864
                logger.critical("D-Bus Exception", exc_info=error)
 
2865
                cleanup()
 
2866
                sys.exit(1)
 
2867
            # End of Avahi example code
2621
2868
        
2622
2869
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2623
2870
                             lambda *args, **kwargs: