/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: 2014-07-25 23:54:03 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140725235403-8sx708g7rosge1ei
Bug fix to allow Python 3; that is, version 3 of the "python" package.

* debian/control (Package: mandos/Depends): Bug fix: Change from
                                            "python (<= 2.7)" to
                                            "python (>= 2.7)",
                                            allowing "/usr/bin/python"
                                            to be Python 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 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
65
67
import types
66
68
import binascii
67
69
import tempfile
 
70
import itertools
 
71
import collections
68
72
 
69
73
import dbus
70
74
import dbus.service
75
79
import ctypes.util
76
80
import xml.dom.minidom
77
81
import inspect
78
 
import GnuPGInterface
79
82
 
80
83
try:
81
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
88
    except ImportError:
86
89
        SO_BINDTODEVICE = None
87
90
 
88
 
 
89
 
version = "1.4.1"
 
91
version = "1.6.7"
90
92
stored_state_file = "clients.pickle"
91
93
 
92
94
logger = logging.getLogger()
93
 
syslogger = (logging.handlers.SysLogHandler
94
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
 
              address = str("/dev/log")))
 
95
syslogger = None
96
96
 
97
97
try:
98
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
111
111
        return interface_index
112
112
 
113
113
 
114
 
def initlogger(level=logging.WARNING):
 
114
def initlogger(debug, level=logging.WARNING):
115
115
    """init logger and add loglevel"""
116
116
    
 
117
    global syslogger
 
118
    syslogger = (logging.handlers.SysLogHandler
 
119
                 (facility =
 
120
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
121
                  address = str("/dev/log")))
117
122
    syslogger.setFormatter(logging.Formatter
118
123
                           ('Mandos [%(process)d]: %(levelname)s:'
119
124
                            ' %(message)s'))
120
125
    logger.addHandler(syslogger)
121
126
    
122
 
    console = logging.StreamHandler()
123
 
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
124
 
                                           ' [%(process)d]:'
125
 
                                           ' %(levelname)s:'
126
 
                                           ' %(message)s'))
127
 
    logger.addHandler(console)
 
127
    if debug:
 
128
        console = logging.StreamHandler()
 
129
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
130
                                               ' [%(process)d]:'
 
131
                                               ' %(levelname)s:'
 
132
                                               ' %(message)s'))
 
133
        logger.addHandler(console)
128
134
    logger.setLevel(level)
129
135
 
130
136
 
131
 
class CryptoError(Exception):
 
137
class PGPError(Exception):
 
138
    """Exception if encryption/decryption fails"""
132
139
    pass
133
140
 
134
141
 
135
 
class Crypto(object):
 
142
class PGPEngine(object):
136
143
    """A simple class for OpenPGP symmetric encryption & decryption"""
137
144
    def __init__(self):
138
 
        self.gnupg = GnuPGInterface.GnuPG()
139
145
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
 
        self.gnupg.options.meta_interactive = False
142
 
        self.gnupg.options.homedir = self.tempdir
143
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
144
 
                                              '--quiet'])
 
146
        self.gnupgargs = ['--batch',
 
147
                          '--home', self.tempdir,
 
148
                          '--force-mdc',
 
149
                          '--quiet',
 
150
                          '--no-use-agent']
145
151
    
146
152
    def __enter__(self):
147
153
        return self
148
154
    
149
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
155
    def __exit__(self, exc_type, exc_value, traceback):
150
156
        self._cleanup()
151
157
        return False
152
158
    
169
175
    def password_encode(self, password):
170
176
        # Passphrase can not be empty and can not contain newlines or
171
177
        # NUL bytes.  So we prefix it and hex encode it.
172
 
        return b"mandos" + binascii.hexlify(password)
 
178
        encoded = b"mandos" + binascii.hexlify(password)
 
179
        if len(encoded) > 2048:
 
180
            # GnuPG can't handle long passwords, so encode differently
 
181
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
182
                       .replace(b"\n", b"\\n")
 
183
                       .replace(b"\0", b"\\x00"))
 
184
        return encoded
173
185
    
174
186
    def encrypt(self, data, password):
175
 
        self.gnupg.passphrase = self.password_encode(password)
176
 
        with open(os.devnull) as devnull:
177
 
            try:
178
 
                proc = self.gnupg.run(['--symmetric'],
179
 
                                      create_fhs=['stdin', 'stdout'],
180
 
                                      attach_fhs={'stderr': devnull})
181
 
                with contextlib.closing(proc.handles['stdin']) as f:
182
 
                    f.write(data)
183
 
                with contextlib.closing(proc.handles['stdout']) as f:
184
 
                    ciphertext = f.read()
185
 
                proc.wait()
186
 
            except IOError as e:
187
 
                raise CryptoError(e)
188
 
        self.gnupg.passphrase = None
 
187
        passphrase = self.password_encode(password)
 
188
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
189
                                         ) as passfile:
 
190
            passfile.write(passphrase)
 
191
            passfile.flush()
 
192
            proc = subprocess.Popen(['gpg', '--symmetric',
 
193
                                     '--passphrase-file',
 
194
                                     passfile.name]
 
195
                                    + self.gnupgargs,
 
196
                                    stdin = subprocess.PIPE,
 
197
                                    stdout = subprocess.PIPE,
 
198
                                    stderr = subprocess.PIPE)
 
199
            ciphertext, err = proc.communicate(input = data)
 
200
        if proc.returncode != 0:
 
201
            raise PGPError(err)
189
202
        return ciphertext
190
203
    
191
204
    def decrypt(self, data, password):
192
 
        self.gnupg.passphrase = self.password_encode(password)
193
 
        with open(os.devnull) as devnull:
194
 
            try:
195
 
                proc = self.gnupg.run(['--decrypt'],
196
 
                                      create_fhs=['stdin', 'stdout'],
197
 
                                      attach_fhs={'stderr': devnull})
198
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
199
 
                    f.write(data)
200
 
                with contextlib.closing(proc.handles['stdout']) as f:
201
 
                    decrypted_plaintext = f.read()
202
 
                proc.wait()
203
 
            except IOError as e:
204
 
                raise CryptoError(e)
205
 
        self.gnupg.passphrase = None
 
205
        passphrase = self.password_encode(password)
 
206
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
207
                                         ) as passfile:
 
208
            passfile.write(passphrase)
 
209
            passfile.flush()
 
210
            proc = subprocess.Popen(['gpg', '--decrypt',
 
211
                                     '--passphrase-file',
 
212
                                     passfile.name]
 
213
                                    + self.gnupgargs,
 
214
                                    stdin = subprocess.PIPE,
 
215
                                    stdout = subprocess.PIPE,
 
216
                                    stderr = subprocess.PIPE)
 
217
            decrypted_plaintext, err = proc.communicate(input
 
218
                                                        = data)
 
219
        if proc.returncode != 0:
 
220
            raise PGPError(err)
206
221
        return decrypted_plaintext
207
222
 
208
223
 
209
 
 
210
224
class AvahiError(Exception):
211
225
    def __init__(self, value, *args, **kwargs):
212
226
        self.value = value
229
243
               Used to optionally bind to the specified interface.
230
244
    name: string; Example: 'Mandos'
231
245
    type: string; Example: '_mandos._tcp'.
232
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
246
     See <https://www.iana.org/assignments/service-names-port-numbers>
233
247
    port: integer; what port to announce
234
248
    TXT: list of strings; TXT record for the service
235
249
    domain: string; Domain to publish on, default to .local if empty.
241
255
    server: D-Bus Server
242
256
    bus: dbus.SystemBus()
243
257
    """
 
258
    
244
259
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
245
260
                 servicetype = None, port = None, TXT = None,
246
261
                 domain = "", host = "", max_renames = 32768,
259
274
        self.server = None
260
275
        self.bus = bus
261
276
        self.entry_group_state_changed_match = None
 
277
    
262
278
    def rename(self):
263
279
        """Derived from the Avahi example code"""
264
280
        if self.rename_count >= self.max_renames:
274
290
        try:
275
291
            self.add()
276
292
        except dbus.exceptions.DBusException as error:
277
 
            logger.critical("DBusException: %s", error)
 
293
            logger.critical("D-Bus Exception", exc_info=error)
278
294
            self.cleanup()
279
295
            os._exit(1)
280
296
        self.rename_count += 1
 
297
    
281
298
    def remove(self):
282
299
        """Derived from the Avahi example code"""
283
300
        if self.entry_group_state_changed_match is not None:
285
302
            self.entry_group_state_changed_match = None
286
303
        if self.group is not None:
287
304
            self.group.Reset()
 
305
    
288
306
    def add(self):
289
307
        """Derived from the Avahi example code"""
290
308
        self.remove()
307
325
            dbus.UInt16(self.port),
308
326
            avahi.string_array_to_txt_array(self.TXT))
309
327
        self.group.Commit()
 
328
    
310
329
    def entry_group_state_changed(self, state, error):
311
330
        """Derived from the Avahi example code"""
312
331
        logger.debug("Avahi entry group state change: %i", state)
319
338
        elif state == avahi.ENTRY_GROUP_FAILURE:
320
339
            logger.critical("Avahi: Error in group state changed %s",
321
340
                            unicode(error))
322
 
            raise AvahiGroupError("State changed: %s"
323
 
                                  % unicode(error))
 
341
            raise AvahiGroupError("State changed: {!s}"
 
342
                                  .format(error))
 
343
    
324
344
    def cleanup(self):
325
345
        """Derived from the Avahi example code"""
326
346
        if self.group is not None:
331
351
                pass
332
352
            self.group = None
333
353
        self.remove()
 
354
    
334
355
    def server_state_changed(self, state, error=None):
335
356
        """Derived from the Avahi example code"""
336
357
        logger.debug("Avahi server state change: %i", state)
355
376
                logger.debug("Unknown state: %r", state)
356
377
            else:
357
378
                logger.debug("Unknown state: %r: %r", state, error)
 
379
    
358
380
    def activate(self):
359
381
        """Derived from the Avahi example code"""
360
382
        if self.server is None:
367
389
                                 self.server_state_changed)
368
390
        self.server_state_changed(self.server.GetState())
369
391
 
 
392
 
370
393
class AvahiServiceToSyslog(AvahiService):
371
394
    def rename(self):
372
395
        """Add the new name to the syslog messages"""
373
396
        ret = AvahiService.rename(self)
374
397
        syslogger.setFormatter(logging.Formatter
375
 
                               ('Mandos (%s) [%%(process)d]:'
376
 
                                ' %%(levelname)s: %%(message)s'
377
 
                                % self.name))
 
398
                               ('Mandos ({}) [%(process)d]:'
 
399
                                ' %(levelname)s: %(message)s'
 
400
                                .format(self.name)))
378
401
        return ret
379
402
 
380
 
def _timedelta_to_milliseconds(td):
381
 
    "Convert a datetime.timedelta() to milliseconds"
382
 
    return ((td.days * 24 * 60 * 60 * 1000)
383
 
            + (td.seconds * 1000)
384
 
            + (td.microseconds // 1000))
385
 
        
 
403
 
386
404
class Client(object):
387
405
    """A representation of a client host served by this server.
388
406
    
389
407
    Attributes:
390
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
408
    approved:   bool(); 'None' if not yet approved/disapproved
391
409
    approval_delay: datetime.timedelta(); Time to wait for approval
392
410
    approval_duration: datetime.timedelta(); Duration of one approval
393
411
    checker:    subprocess.Popen(); a running checker process used
411
429
    interval:   datetime.timedelta(); How often to start a new checker
412
430
    last_approval_request: datetime.datetime(); (UTC) or None
413
431
    last_checked_ok: datetime.datetime(); (UTC) or None
414
 
 
415
432
    last_checker_status: integer between 0 and 255 reflecting exit
416
433
                         status of last checker. -1 reflects crashed
417
 
                         checker, or None.
418
 
    last_enabled: datetime.datetime(); (UTC)
 
434
                         checker, -2 means no checker completed yet.
 
435
    last_enabled: datetime.datetime(); (UTC) or None
419
436
    name:       string; from the config file, used in log messages and
420
437
                        D-Bus identifiers
421
438
    secret:     bytestring; sent verbatim (over TLS) to client
422
439
    timeout:    datetime.timedelta(); How long from last_checked_ok
423
440
                                      until this client is disabled
424
 
    extended_timeout:   extra long timeout when password has been sent
 
441
    extended_timeout:   extra long timeout when secret has been sent
425
442
    runtime_expansions: Allowed attributes for runtime expansion.
426
443
    expires:    datetime.datetime(); time (UTC) when a client will be
427
444
                disabled, or None
 
445
    server_settings: The server_settings dict from main()
428
446
    """
429
447
    
430
448
    runtime_expansions = ("approval_delay", "approval_duration",
431
 
                          "created", "enabled", "fingerprint",
432
 
                          "host", "interval", "last_checked_ok",
 
449
                          "created", "enabled", "expires",
 
450
                          "fingerprint", "host", "interval",
 
451
                          "last_approval_request", "last_checked_ok",
433
452
                          "last_enabled", "name", "timeout")
434
 
    
435
 
    def timeout_milliseconds(self):
436
 
        "Return the 'timeout' attribute in milliseconds"
437
 
        return _timedelta_to_milliseconds(self.timeout)
438
 
    
439
 
    def extended_timeout_milliseconds(self):
440
 
        "Return the 'extended_timeout' attribute in milliseconds"
441
 
        return _timedelta_to_milliseconds(self.extended_timeout)
442
 
    
443
 
    def interval_milliseconds(self):
444
 
        "Return the 'interval' attribute in milliseconds"
445
 
        return _timedelta_to_milliseconds(self.interval)
446
 
    
447
 
    def approval_delay_milliseconds(self):
448
 
        return _timedelta_to_milliseconds(self.approval_delay)
449
 
    
450
 
    def __init__(self, name = None, config=None):
451
 
        """Note: the 'checker' key in 'config' sets the
452
 
        'checker_command' attribute and *not* the 'checker'
453
 
        attribute."""
 
453
    client_defaults = { "timeout": "PT5M",
 
454
                        "extended_timeout": "PT15M",
 
455
                        "interval": "PT2M",
 
456
                        "checker": "fping -q -- %%(host)s",
 
457
                        "host": "",
 
458
                        "approval_delay": "PT0S",
 
459
                        "approval_duration": "PT1S",
 
460
                        "approved_by_default": "True",
 
461
                        "enabled": "True",
 
462
                        }
 
463
    
 
464
    @staticmethod
 
465
    def config_parser(config):
 
466
        """Construct a new dict of client settings of this form:
 
467
        { client_name: {setting_name: value, ...}, ...}
 
468
        with exceptions for any special settings as defined above.
 
469
        NOTE: Must be a pure function. Must return the same result
 
470
        value given the same arguments.
 
471
        """
 
472
        settings = {}
 
473
        for client_name in config.sections():
 
474
            section = dict(config.items(client_name))
 
475
            client = settings[client_name] = {}
 
476
            
 
477
            client["host"] = section["host"]
 
478
            # Reformat values from string types to Python types
 
479
            client["approved_by_default"] = config.getboolean(
 
480
                client_name, "approved_by_default")
 
481
            client["enabled"] = config.getboolean(client_name,
 
482
                                                  "enabled")
 
483
            
 
484
            client["fingerprint"] = (section["fingerprint"].upper()
 
485
                                     .replace(" ", ""))
 
486
            if "secret" in section:
 
487
                client["secret"] = section["secret"].decode("base64")
 
488
            elif "secfile" in section:
 
489
                with open(os.path.expanduser(os.path.expandvars
 
490
                                             (section["secfile"])),
 
491
                          "rb") as secfile:
 
492
                    client["secret"] = secfile.read()
 
493
            else:
 
494
                raise TypeError("No secret or secfile for section {}"
 
495
                                .format(section))
 
496
            client["timeout"] = string_to_delta(section["timeout"])
 
497
            client["extended_timeout"] = string_to_delta(
 
498
                section["extended_timeout"])
 
499
            client["interval"] = string_to_delta(section["interval"])
 
500
            client["approval_delay"] = string_to_delta(
 
501
                section["approval_delay"])
 
502
            client["approval_duration"] = string_to_delta(
 
503
                section["approval_duration"])
 
504
            client["checker_command"] = section["checker"]
 
505
            client["last_approval_request"] = None
 
506
            client["last_checked_ok"] = None
 
507
            client["last_checker_status"] = -2
 
508
        
 
509
        return settings
 
510
    
 
511
    def __init__(self, settings, name = None, server_settings=None):
454
512
        self.name = name
455
 
        if config is None:
456
 
            config = {}
 
513
        if server_settings is None:
 
514
            server_settings = {}
 
515
        self.server_settings = server_settings
 
516
        # adding all client settings
 
517
        for setting, value in settings.items():
 
518
            setattr(self, setting, value)
 
519
        
 
520
        if self.enabled:
 
521
            if not hasattr(self, "last_enabled"):
 
522
                self.last_enabled = datetime.datetime.utcnow()
 
523
            if not hasattr(self, "expires"):
 
524
                self.expires = (datetime.datetime.utcnow()
 
525
                                + self.timeout)
 
526
        else:
 
527
            self.last_enabled = None
 
528
            self.expires = None
 
529
        
457
530
        logger.debug("Creating client %r", self.name)
458
531
        # Uppercase and remove spaces from fingerprint for later
459
532
        # comparison purposes with return value from the fingerprint()
460
533
        # function
461
 
        self.fingerprint = (config["fingerprint"].upper()
462
 
                            .replace(" ", ""))
463
534
        logger.debug("  Fingerprint: %s", self.fingerprint)
464
 
        if "secret" in config:
465
 
            self.secret = config["secret"].decode("base64")
466
 
        elif "secfile" in config:
467
 
            with open(os.path.expanduser(os.path.expandvars
468
 
                                         (config["secfile"])),
469
 
                      "rb") as secfile:
470
 
                self.secret = secfile.read()
471
 
        else:
472
 
            raise TypeError("No secret or secfile for client %s"
473
 
                            % self.name)
474
 
        self.host = config.get("host", "")
475
 
        self.created = datetime.datetime.utcnow()
476
 
        self.enabled = True
477
 
        self.last_approval_request = None
478
 
        self.last_enabled = datetime.datetime.utcnow()
479
 
        self.last_checked_ok = None
480
 
        self.last_checker_status = None
481
 
        self.timeout = string_to_delta(config["timeout"])
482
 
        self.extended_timeout = string_to_delta(config
483
 
                                                ["extended_timeout"])
484
 
        self.interval = string_to_delta(config["interval"])
 
535
        self.created = settings.get("created",
 
536
                                    datetime.datetime.utcnow())
 
537
        
 
538
        # attributes specific for this server instance
485
539
        self.checker = None
486
540
        self.checker_initiator_tag = None
487
541
        self.disable_initiator_tag = None
488
 
        self.expires = datetime.datetime.utcnow() + self.timeout
489
542
        self.checker_callback_tag = None
490
 
        self.checker_command = config["checker"]
491
543
        self.current_checker_command = None
492
 
        self._approved = None
493
 
        self.approved_by_default = config.get("approved_by_default",
494
 
                                              True)
 
544
        self.approved = None
495
545
        self.approvals_pending = 0
496
 
        self.approval_delay = string_to_delta(
497
 
            config["approval_delay"])
498
 
        self.approval_duration = string_to_delta(
499
 
            config["approval_duration"])
500
546
        self.changedstate = (multiprocessing_manager
501
547
                             .Condition(multiprocessing_manager
502
548
                                        .Lock()))
522
568
        if getattr(self, "enabled", False):
523
569
            # Already enabled
524
570
            return
525
 
        self.send_changedstate()
526
571
        self.expires = datetime.datetime.utcnow() + self.timeout
527
572
        self.enabled = True
528
573
        self.last_enabled = datetime.datetime.utcnow()
529
574
        self.init_checker()
 
575
        self.send_changedstate()
530
576
    
531
577
    def disable(self, quiet=True):
532
578
        """Disable this client."""
533
579
        if not getattr(self, "enabled", False):
534
580
            return False
535
581
        if not quiet:
536
 
            self.send_changedstate()
537
 
        if not quiet:
538
582
            logger.info("Disabling client %s", self.name)
539
 
        if getattr(self, "disable_initiator_tag", False):
 
583
        if getattr(self, "disable_initiator_tag", None) is not None:
540
584
            gobject.source_remove(self.disable_initiator_tag)
541
585
            self.disable_initiator_tag = None
542
586
        self.expires = None
543
 
        if getattr(self, "checker_initiator_tag", False):
 
587
        if getattr(self, "checker_initiator_tag", None) is not None:
544
588
            gobject.source_remove(self.checker_initiator_tag)
545
589
            self.checker_initiator_tag = None
546
590
        self.stop_checker()
547
591
        self.enabled = False
 
592
        if not quiet:
 
593
            self.send_changedstate()
548
594
        # Do not run this again if called by a gobject.timeout_add
549
595
        return False
550
596
    
554
600
    def init_checker(self):
555
601
        # Schedule a new checker to be started an 'interval' from now,
556
602
        # and every interval from then on.
 
603
        if self.checker_initiator_tag is not None:
 
604
            gobject.source_remove(self.checker_initiator_tag)
557
605
        self.checker_initiator_tag = (gobject.timeout_add
558
 
                                      (self.interval_milliseconds(),
 
606
                                      (int(self.interval
 
607
                                           .total_seconds() * 1000),
559
608
                                       self.start_checker))
560
609
        # Schedule a disable() when 'timeout' has passed
 
610
        if self.disable_initiator_tag is not None:
 
611
            gobject.source_remove(self.disable_initiator_tag)
561
612
        self.disable_initiator_tag = (gobject.timeout_add
562
 
                                   (self.timeout_milliseconds(),
563
 
                                    self.disable))
 
613
                                      (int(self.timeout
 
614
                                           .total_seconds() * 1000),
 
615
                                       self.disable))
564
616
        # Also start a new checker *right now*.
565
617
        self.start_checker()
566
618
    
569
621
        self.checker_callback_tag = None
570
622
        self.checker = None
571
623
        if os.WIFEXITED(condition):
572
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
624
            self.last_checker_status = os.WEXITSTATUS(condition)
573
625
            if self.last_checker_status == 0:
574
626
                logger.info("Checker for %(name)s succeeded",
575
627
                            vars(self))
582
634
            logger.warning("Checker for %(name)s crashed?",
583
635
                           vars(self))
584
636
    
585
 
    def checked_ok(self, timeout=None):
586
 
        """Bump up the timeout for this client.
587
 
        
588
 
        This should only be called when the client has been seen,
589
 
        alive and well.
590
 
        """
 
637
    def checked_ok(self):
 
638
        """Assert that the client has been seen, alive and well."""
 
639
        self.last_checked_ok = datetime.datetime.utcnow()
 
640
        self.last_checker_status = 0
 
641
        self.bump_timeout()
 
642
    
 
643
    def bump_timeout(self, timeout=None):
 
644
        """Bump up the timeout for this client."""
591
645
        if timeout is None:
592
646
            timeout = self.timeout
593
 
        self.last_checked_ok = datetime.datetime.utcnow()
594
647
        if self.disable_initiator_tag is not None:
595
648
            gobject.source_remove(self.disable_initiator_tag)
 
649
            self.disable_initiator_tag = None
596
650
        if getattr(self, "enabled", False):
597
651
            self.disable_initiator_tag = (gobject.timeout_add
598
 
                                          (_timedelta_to_milliseconds
599
 
                                           (timeout), self.disable))
 
652
                                          (int(timeout.total_seconds()
 
653
                                               * 1000), self.disable))
600
654
            self.expires = datetime.datetime.utcnow() + timeout
601
655
    
602
656
    def need_approval(self):
608
662
        If a checker already exists, leave it running and do
609
663
        nothing."""
610
664
        # The reason for not killing a running checker is that if we
611
 
        # did that, then if a checker (for some reason) started
612
 
        # running slowly and taking more than 'interval' time, the
613
 
        # client would inevitably timeout, since no checker would get
614
 
        # a chance to run to completion.  If we instead leave running
 
665
        # did that, and if a checker (for some reason) started running
 
666
        # slowly and taking more than 'interval' time, then the client
 
667
        # would inevitably timeout, since no checker would get a
 
668
        # chance to run to completion.  If we instead leave running
615
669
        # checkers alone, the checker would have to take more time
616
670
        # than 'timeout' for the client to be disabled, which is as it
617
671
        # should be.
619
673
        # If a checker exists, make sure it is not a zombie
620
674
        try:
621
675
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
622
 
        except (AttributeError, OSError) as error:
623
 
            if (isinstance(error, OSError)
624
 
                and error.errno != errno.ECHILD):
625
 
                raise error
 
676
        except AttributeError:
 
677
            pass
 
678
        except OSError as error:
 
679
            if error.errno != errno.ECHILD:
 
680
                raise
626
681
        else:
627
682
            if pid:
628
683
                logger.warning("Checker was a zombie")
631
686
                                      self.current_checker_command)
632
687
        # Start a new checker if needed
633
688
        if self.checker is None:
 
689
            # Escape attributes for the shell
 
690
            escaped_attrs = { attr:
 
691
                                  re.escape(unicode(getattr(self,
 
692
                                                            attr)))
 
693
                              for attr in self.runtime_expansions }
634
694
            try:
635
 
                # In case checker_command has exactly one % operator
636
 
                command = self.checker_command % self.host
637
 
            except TypeError:
638
 
                # Escape attributes for the shell
639
 
                escaped_attrs = dict(
640
 
                    (attr,
641
 
                     re.escape(unicode(str(getattr(self, attr, "")),
642
 
                                       errors=
643
 
                                       'replace')))
644
 
                    for attr in
645
 
                    self.runtime_expansions)
646
 
                
647
 
                try:
648
 
                    command = self.checker_command % escaped_attrs
649
 
                except TypeError as error:
650
 
                    logger.error('Could not format string "%s":'
651
 
                                 ' %s', self.checker_command, error)
652
 
                    return True # Try again later
 
695
                command = self.checker_command % escaped_attrs
 
696
            except TypeError as error:
 
697
                logger.error('Could not format string "%s"',
 
698
                             self.checker_command, exc_info=error)
 
699
                return True # Try again later
653
700
            self.current_checker_command = command
654
701
            try:
655
702
                logger.info("Starting checker %r for %s",
658
705
                # in normal mode, that is already done by daemon(),
659
706
                # and in debug mode we don't want to.  (Stdin is
660
707
                # always replaced by /dev/null.)
 
708
                # The exception is when not debugging but nevertheless
 
709
                # running in the foreground; use the previously
 
710
                # created wnull.
 
711
                popen_args = {}
 
712
                if (not self.server_settings["debug"]
 
713
                    and self.server_settings["foreground"]):
 
714
                    popen_args.update({"stdout": wnull,
 
715
                                       "stderr": wnull })
661
716
                self.checker = subprocess.Popen(command,
662
717
                                                close_fds=True,
663
 
                                                shell=True, cwd="/")
664
 
                self.checker_callback_tag = (gobject.child_watch_add
665
 
                                             (self.checker.pid,
666
 
                                              self.checker_callback,
667
 
                                              data=command))
668
 
                # The checker may have completed before the gobject
669
 
                # watch was added.  Check for this.
 
718
                                                shell=True, cwd="/",
 
719
                                                **popen_args)
 
720
            except OSError as error:
 
721
                logger.error("Failed to start subprocess",
 
722
                             exc_info=error)
 
723
                return True
 
724
            self.checker_callback_tag = (gobject.child_watch_add
 
725
                                         (self.checker.pid,
 
726
                                          self.checker_callback,
 
727
                                          data=command))
 
728
            # The checker may have completed before the gobject
 
729
            # watch was added.  Check for this.
 
730
            try:
670
731
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
 
                if pid:
672
 
                    gobject.source_remove(self.checker_callback_tag)
673
 
                    self.checker_callback(pid, status, command)
674
732
            except OSError as error:
675
 
                logger.error("Failed to start subprocess: %s",
676
 
                             error)
 
733
                if error.errno == errno.ECHILD:
 
734
                    # This should never happen
 
735
                    logger.error("Child process vanished",
 
736
                                 exc_info=error)
 
737
                    return True
 
738
                raise
 
739
            if pid:
 
740
                gobject.source_remove(self.checker_callback_tag)
 
741
                self.checker_callback(pid, status, command)
677
742
        # Re-run this periodically if run by gobject.timeout_add
678
743
        return True
679
744
    
686
751
            return
687
752
        logger.debug("Stopping checker for %(name)s", vars(self))
688
753
        try:
689
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
754
            self.checker.terminate()
690
755
            #time.sleep(0.5)
691
756
            #if self.checker.poll() is None:
692
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
757
            #    self.checker.kill()
693
758
        except OSError as error:
694
759
            if error.errno != errno.ESRCH: # No such process
695
760
                raise
712
777
    # "Set" method, so we fail early here:
713
778
    if byte_arrays and signature != "ay":
714
779
        raise ValueError("Byte arrays not supported for non-'ay'"
715
 
                         " signature %r" % signature)
 
780
                         " signature {!r}".format(signature))
716
781
    def decorator(func):
717
782
        func._dbus_is_property = True
718
783
        func._dbus_interface = dbus_interface
726
791
    return decorator
727
792
 
728
793
 
 
794
def dbus_interface_annotations(dbus_interface):
 
795
    """Decorator for marking functions returning interface annotations
 
796
    
 
797
    Usage:
 
798
    
 
799
    @dbus_interface_annotations("org.example.Interface")
 
800
    def _foo(self):  # Function name does not matter
 
801
        return {"org.freedesktop.DBus.Deprecated": "true",
 
802
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
803
                    "false"}
 
804
    """
 
805
    def decorator(func):
 
806
        func._dbus_is_interface = True
 
807
        func._dbus_interface = dbus_interface
 
808
        func._dbus_name = dbus_interface
 
809
        return func
 
810
    return decorator
 
811
 
 
812
 
 
813
def dbus_annotations(annotations):
 
814
    """Decorator to annotate D-Bus methods, signals or properties
 
815
    Usage:
 
816
    
 
817
    @dbus_service_property("org.example.Interface", signature="b",
 
818
                           access="r")
 
819
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
820
                        "org.freedesktop.DBus.Property."
 
821
                        "EmitsChangedSignal": "false"})
 
822
    def Property_dbus_property(self):
 
823
        return dbus.Boolean(False)
 
824
    """
 
825
    def decorator(func):
 
826
        func._dbus_annotations = annotations
 
827
        return func
 
828
    return decorator
 
829
 
 
830
 
729
831
class DBusPropertyException(dbus.exceptions.DBusException):
730
832
    """A base class for D-Bus property-related exceptions
731
833
    """
754
856
    """
755
857
    
756
858
    @staticmethod
757
 
    def _is_dbus_property(obj):
758
 
        return getattr(obj, "_dbus_is_property", False)
 
859
    def _is_dbus_thing(thing):
 
860
        """Returns a function testing if an attribute is a D-Bus thing
 
861
        
 
862
        If called like _is_dbus_thing("method") it returns a function
 
863
        suitable for use as predicate to inspect.getmembers().
 
864
        """
 
865
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
866
                                   False)
759
867
    
760
 
    def _get_all_dbus_properties(self):
 
868
    def _get_all_dbus_things(self, thing):
761
869
        """Returns a generator of (name, attribute) pairs
762
870
        """
763
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
871
        return ((getattr(athing.__get__(self), "_dbus_name",
 
872
                         name),
 
873
                 athing.__get__(self))
764
874
                for cls in self.__class__.__mro__
765
 
                for name, prop in
766
 
                inspect.getmembers(cls, self._is_dbus_property))
 
875
                for name, athing in
 
876
                inspect.getmembers(cls,
 
877
                                   self._is_dbus_thing(thing)))
767
878
    
768
879
    def _get_dbus_property(self, interface_name, property_name):
769
880
        """Returns a bound method if one exists which is a D-Bus
771
882
        """
772
883
        for cls in  self.__class__.__mro__:
773
884
            for name, value in (inspect.getmembers
774
 
                                (cls, self._is_dbus_property)):
 
885
                                (cls,
 
886
                                 self._is_dbus_thing("property"))):
775
887
                if (value._dbus_name == property_name
776
888
                    and value._dbus_interface == interface_name):
777
889
                    return value.__get__(self)
805
917
            # The byte_arrays option is not supported yet on
806
918
            # signatures other than "ay".
807
919
            if prop._dbus_signature != "ay":
808
 
                raise ValueError
809
 
            value = dbus.ByteArray(''.join(unichr(byte)
810
 
                                           for byte in value))
 
920
                raise ValueError("Byte arrays not supported for non-"
 
921
                                 "'ay' signature {!r}"
 
922
                                 .format(prop._dbus_signature))
 
923
            value = dbus.ByteArray(b''.join(chr(byte)
 
924
                                            for byte in value))
811
925
        prop(value)
812
926
    
813
927
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
819
933
        Note: Will not include properties with access="write".
820
934
        """
821
935
        properties = {}
822
 
        for name, prop in self._get_all_dbus_properties():
 
936
        for name, prop in self._get_all_dbus_things("property"):
823
937
            if (interface_name
824
938
                and interface_name != prop._dbus_interface):
825
939
                # Interface non-empty but did not match
840
954
                         path_keyword='object_path',
841
955
                         connection_keyword='connection')
842
956
    def Introspect(self, object_path, connection):
843
 
        """Standard D-Bus method, overloaded to insert property tags.
 
957
        """Overloading of standard D-Bus method.
 
958
        
 
959
        Inserts property tags and interface annotation tags.
844
960
        """
845
961
        xmlstring = dbus.service.Object.Introspect(self, object_path,
846
962
                                                   connection)
853
969
                e.setAttribute("access", prop._dbus_access)
854
970
                return e
855
971
            for if_tag in document.getElementsByTagName("interface"):
 
972
                # Add property tags
856
973
                for tag in (make_tag(document, name, prop)
857
974
                            for name, prop
858
 
                            in self._get_all_dbus_properties()
 
975
                            in self._get_all_dbus_things("property")
859
976
                            if prop._dbus_interface
860
977
                            == if_tag.getAttribute("name")):
861
978
                    if_tag.appendChild(tag)
 
979
                # Add annotation tags
 
980
                for typ in ("method", "signal", "property"):
 
981
                    for tag in if_tag.getElementsByTagName(typ):
 
982
                        annots = dict()
 
983
                        for name, prop in (self.
 
984
                                           _get_all_dbus_things(typ)):
 
985
                            if (name == tag.getAttribute("name")
 
986
                                and prop._dbus_interface
 
987
                                == if_tag.getAttribute("name")):
 
988
                                annots.update(getattr
 
989
                                              (prop,
 
990
                                               "_dbus_annotations",
 
991
                                               {}))
 
992
                        for name, value in annots.items():
 
993
                            ann_tag = document.createElement(
 
994
                                "annotation")
 
995
                            ann_tag.setAttribute("name", name)
 
996
                            ann_tag.setAttribute("value", value)
 
997
                            tag.appendChild(ann_tag)
 
998
                # Add interface annotation tags
 
999
                for annotation, value in dict(
 
1000
                    itertools.chain.from_iterable(
 
1001
                        annotations().items()
 
1002
                        for name, annotations in
 
1003
                        self._get_all_dbus_things("interface")
 
1004
                        if name == if_tag.getAttribute("name")
 
1005
                        )).items():
 
1006
                    ann_tag = document.createElement("annotation")
 
1007
                    ann_tag.setAttribute("name", annotation)
 
1008
                    ann_tag.setAttribute("value", value)
 
1009
                    if_tag.appendChild(ann_tag)
862
1010
                # Add the names to the return values for the
863
1011
                # "org.freedesktop.DBus.Properties" methods
864
1012
                if (if_tag.getAttribute("name")
879
1027
        except (AttributeError, xml.dom.DOMException,
880
1028
                xml.parsers.expat.ExpatError) as error:
881
1029
            logger.error("Failed to override Introspection method",
882
 
                         error)
 
1030
                         exc_info=error)
883
1031
        return xmlstring
884
1032
 
885
1033
 
886
 
def datetime_to_dbus (dt, variant_level=0):
 
1034
def datetime_to_dbus(dt, variant_level=0):
887
1035
    """Convert a UTC datetime.datetime() to a D-Bus type."""
888
1036
    if dt is None:
889
1037
        return dbus.String("", variant_level = variant_level)
891
1039
                       variant_level=variant_level)
892
1040
 
893
1041
 
894
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
895
 
                                  .__metaclass__):
896
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
897
 
    will add additional D-Bus attributes matching a certain pattern.
 
1042
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1043
    """A class decorator; applied to a subclass of
 
1044
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1045
    interface names according to the "alt_interface_names" mapping.
 
1046
    Usage:
 
1047
    
 
1048
    @alternate_dbus_interfaces({"org.example.Interface":
 
1049
                                    "net.example.AlternateInterface"})
 
1050
    class SampleDBusObject(dbus.service.Object):
 
1051
        @dbus.service.method("org.example.Interface")
 
1052
        def SampleDBusMethod():
 
1053
            pass
 
1054
    
 
1055
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1056
    reachable via two interfaces: "org.example.Interface" and
 
1057
    "net.example.AlternateInterface", the latter of which will have
 
1058
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1059
    "true", unless "deprecate" is passed with a False value.
 
1060
    
 
1061
    This works for methods and signals, and also for D-Bus properties
 
1062
    (from DBusObjectWithProperties) and interfaces (from the
 
1063
    dbus_interface_annotations decorator).
898
1064
    """
899
 
    def __new__(mcs, name, bases, attr):
900
 
        # Go through all the base classes which could have D-Bus
901
 
        # methods, signals, or properties in them
902
 
        for base in (b for b in bases
903
 
                     if issubclass(b, dbus.service.Object)):
904
 
            # Go though all attributes of the base class
905
 
            for attrname, attribute in inspect.getmembers(base):
 
1065
    def wrapper(cls):
 
1066
        for orig_interface_name, alt_interface_name in (
 
1067
            alt_interface_names.items()):
 
1068
            attr = {}
 
1069
            interface_names = set()
 
1070
            # Go though all attributes of the class
 
1071
            for attrname, attribute in inspect.getmembers(cls):
906
1072
                # Ignore non-D-Bus attributes, and D-Bus attributes
907
1073
                # with the wrong interface name
908
1074
                if (not hasattr(attribute, "_dbus_interface")
909
1075
                    or not attribute._dbus_interface
910
 
                    .startswith("se.recompile.Mandos")):
 
1076
                    .startswith(orig_interface_name)):
911
1077
                    continue
912
1078
                # Create an alternate D-Bus interface name based on
913
1079
                # the current name
914
1080
                alt_interface = (attribute._dbus_interface
915
 
                                 .replace("se.recompile.Mandos",
916
 
                                          "se.bsnet.fukt.Mandos"))
 
1081
                                 .replace(orig_interface_name,
 
1082
                                          alt_interface_name))
 
1083
                interface_names.add(alt_interface)
917
1084
                # Is this a D-Bus signal?
918
1085
                if getattr(attribute, "_dbus_is_signal", False):
919
 
                    # Extract the original non-method function by
920
 
                    # black magic
 
1086
                    # Extract the original non-method undecorated
 
1087
                    # function by black magic
921
1088
                    nonmethod_func = (dict(
922
1089
                            zip(attribute.func_code.co_freevars,
923
1090
                                attribute.__closure__))["func"]
934
1101
                                nonmethod_func.func_name,
935
1102
                                nonmethod_func.func_defaults,
936
1103
                                nonmethod_func.func_closure)))
 
1104
                    # Copy annotations, if any
 
1105
                    try:
 
1106
                        new_function._dbus_annotations = (
 
1107
                            dict(attribute._dbus_annotations))
 
1108
                    except AttributeError:
 
1109
                        pass
937
1110
                    # Define a creator of a function to call both the
938
 
                    # old and new functions, so both the old and new
939
 
                    # signals gets sent when the function is called
 
1111
                    # original and alternate functions, so both the
 
1112
                    # original and alternate signals gets sent when
 
1113
                    # the function is called
940
1114
                    def fixscope(func1, func2):
941
1115
                        """This function is a scope container to pass
942
1116
                        func1 and func2 to the "call_both" function
949
1123
                        return call_both
950
1124
                    # Create the "call_both" function and add it to
951
1125
                    # the class
952
 
                    attr[attrname] = fixscope(attribute,
953
 
                                              new_function)
 
1126
                    attr[attrname] = fixscope(attribute, new_function)
954
1127
                # Is this a D-Bus method?
955
1128
                elif getattr(attribute, "_dbus_is_method", False):
956
1129
                    # Create a new, but exactly alike, function
967
1140
                                        attribute.func_name,
968
1141
                                        attribute.func_defaults,
969
1142
                                        attribute.func_closure)))
 
1143
                    # Copy annotations, if any
 
1144
                    try:
 
1145
                        attr[attrname]._dbus_annotations = (
 
1146
                            dict(attribute._dbus_annotations))
 
1147
                    except AttributeError:
 
1148
                        pass
970
1149
                # Is this a D-Bus property?
971
1150
                elif getattr(attribute, "_dbus_is_property", False):
972
1151
                    # Create a new, but exactly alike, function
986
1165
                                        attribute.func_name,
987
1166
                                        attribute.func_defaults,
988
1167
                                        attribute.func_closure)))
989
 
        return type.__new__(mcs, name, bases, attr)
990
 
 
991
 
 
 
1168
                    # Copy annotations, if any
 
1169
                    try:
 
1170
                        attr[attrname]._dbus_annotations = (
 
1171
                            dict(attribute._dbus_annotations))
 
1172
                    except AttributeError:
 
1173
                        pass
 
1174
                # Is this a D-Bus interface?
 
1175
                elif getattr(attribute, "_dbus_is_interface", False):
 
1176
                    # Create a new, but exactly alike, function
 
1177
                    # object.  Decorate it to be a new D-Bus interface
 
1178
                    # with the alternate D-Bus interface name.  Add it
 
1179
                    # to the class.
 
1180
                    attr[attrname] = (dbus_interface_annotations
 
1181
                                      (alt_interface)
 
1182
                                      (types.FunctionType
 
1183
                                       (attribute.func_code,
 
1184
                                        attribute.func_globals,
 
1185
                                        attribute.func_name,
 
1186
                                        attribute.func_defaults,
 
1187
                                        attribute.func_closure)))
 
1188
            if deprecate:
 
1189
                # Deprecate all alternate interfaces
 
1190
                iname="_AlternateDBusNames_interface_annotation{}"
 
1191
                for interface_name in interface_names:
 
1192
                    @dbus_interface_annotations(interface_name)
 
1193
                    def func(self):
 
1194
                        return { "org.freedesktop.DBus.Deprecated":
 
1195
                                     "true" }
 
1196
                    # Find an unused name
 
1197
                    for aname in (iname.format(i)
 
1198
                                  for i in itertools.count()):
 
1199
                        if aname not in attr:
 
1200
                            attr[aname] = func
 
1201
                            break
 
1202
            if interface_names:
 
1203
                # Replace the class with a new subclass of it with
 
1204
                # methods, signals, etc. as created above.
 
1205
                cls = type(b"{}Alternate".format(cls.__name__),
 
1206
                           (cls,), attr)
 
1207
        return cls
 
1208
    return wrapper
 
1209
 
 
1210
 
 
1211
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1212
                                "se.bsnet.fukt.Mandos"})
992
1213
class ClientDBus(Client, DBusObjectWithProperties):
993
1214
    """A Client class using D-Bus
994
1215
    
1005
1226
    def __init__(self, bus = None, *args, **kwargs):
1006
1227
        self.bus = bus
1007
1228
        Client.__init__(self, *args, **kwargs)
1008
 
        
1009
 
        self._approvals_pending = 0
1010
1229
        # Only now, when this client is initialized, can it show up on
1011
1230
        # the D-Bus
1012
1231
        client_object_name = unicode(self.name).translate(
1016
1235
                                 ("/clients/" + client_object_name))
1017
1236
        DBusObjectWithProperties.__init__(self, self.bus,
1018
1237
                                          self.dbus_object_path)
1019
 
        
 
1238
    
1020
1239
    def notifychangeproperty(transform_func,
1021
1240
                             dbus_name, type_func=lambda x: x,
1022
1241
                             variant_level=1):
1030
1249
                   to the D-Bus.  Default: no transform
1031
1250
        variant_level: D-Bus variant level.  Default: 1
1032
1251
        """
1033
 
        attrname = "_{0}".format(dbus_name)
 
1252
        attrname = "_{}".format(dbus_name)
1034
1253
        def setter(self, value):
1035
1254
            if hasattr(self, "dbus_object_path"):
1036
1255
                if (not hasattr(self, attrname) or
1045
1264
        
1046
1265
        return property(lambda self: getattr(self, attrname), setter)
1047
1266
    
1048
 
    
1049
1267
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1050
1268
    approvals_pending = notifychangeproperty(dbus.Boolean,
1051
1269
                                             "ApprovalPending",
1058
1276
                                       checker is not None)
1059
1277
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1060
1278
                                           "LastCheckedOK")
 
1279
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1280
                                               "LastCheckerStatus")
1061
1281
    last_approval_request = notifychangeproperty(
1062
1282
        datetime_to_dbus, "LastApprovalRequest")
1063
1283
    approved_by_default = notifychangeproperty(dbus.Boolean,
1064
1284
                                               "ApprovedByDefault")
1065
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1285
    approval_delay = notifychangeproperty(dbus.UInt64,
1066
1286
                                          "ApprovalDelay",
1067
1287
                                          type_func =
1068
 
                                          _timedelta_to_milliseconds)
 
1288
                                          lambda td: td.total_seconds()
 
1289
                                          * 1000)
1069
1290
    approval_duration = notifychangeproperty(
1070
 
        dbus.UInt16, "ApprovalDuration",
1071
 
        type_func = _timedelta_to_milliseconds)
 
1291
        dbus.UInt64, "ApprovalDuration",
 
1292
        type_func = lambda td: td.total_seconds() * 1000)
1072
1293
    host = notifychangeproperty(dbus.String, "Host")
1073
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1074
 
                                   type_func =
1075
 
                                   _timedelta_to_milliseconds)
 
1294
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1295
                                   type_func = lambda td:
 
1296
                                       td.total_seconds() * 1000)
1076
1297
    extended_timeout = notifychangeproperty(
1077
 
        dbus.UInt16, "ExtendedTimeout",
1078
 
        type_func = _timedelta_to_milliseconds)
1079
 
    interval = notifychangeproperty(dbus.UInt16,
 
1298
        dbus.UInt64, "ExtendedTimeout",
 
1299
        type_func = lambda td: td.total_seconds() * 1000)
 
1300
    interval = notifychangeproperty(dbus.UInt64,
1080
1301
                                    "Interval",
1081
1302
                                    type_func =
1082
 
                                    _timedelta_to_milliseconds)
 
1303
                                    lambda td: td.total_seconds()
 
1304
                                    * 1000)
1083
1305
    checker_command = notifychangeproperty(dbus.String, "Checker")
1084
1306
    
1085
1307
    del notifychangeproperty
1113
1335
                                       *args, **kwargs)
1114
1336
    
1115
1337
    def start_checker(self, *args, **kwargs):
1116
 
        old_checker = self.checker
1117
 
        if self.checker is not None:
1118
 
            old_checker_pid = self.checker.pid
1119
 
        else:
1120
 
            old_checker_pid = None
 
1338
        old_checker_pid = getattr(self.checker, "pid", None)
1121
1339
        r = Client.start_checker(self, *args, **kwargs)
1122
1340
        # Only if new checker process was started
1123
1341
        if (self.checker is not None
1127
1345
        return r
1128
1346
    
1129
1347
    def _reset_approved(self):
1130
 
        self._approved = None
 
1348
        self.approved = None
1131
1349
        return False
1132
1350
    
1133
1351
    def approve(self, value=True):
 
1352
        self.approved = value
 
1353
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1354
                                * 1000), self._reset_approved)
1134
1355
        self.send_changedstate()
1135
 
        self._approved = value
1136
 
        gobject.timeout_add(_timedelta_to_milliseconds
1137
 
                            (self.approval_duration),
1138
 
                            self._reset_approved)
1139
 
    
1140
1356
    
1141
1357
    ## D-Bus methods, signals & properties
1142
1358
    _interface = "se.recompile.Mandos.Client"
1143
1359
    
 
1360
    ## Interfaces
 
1361
    
 
1362
    @dbus_interface_annotations(_interface)
 
1363
    def _foo(self):
 
1364
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1365
                     "false"}
 
1366
    
1144
1367
    ## Signals
1145
1368
    
1146
1369
    # CheckerCompleted - signal
1182
1405
        "D-Bus signal"
1183
1406
        return self.need_approval()
1184
1407
    
1185
 
    # NeRwequest - signal
1186
 
    @dbus.service.signal(_interface, signature="s")
1187
 
    def NewRequest(self, ip):
1188
 
        """D-Bus signal
1189
 
        Is sent after a client request a password.
1190
 
        """
1191
 
        pass
1192
 
    
1193
1408
    ## Methods
1194
1409
    
1195
1410
    # Approve - method
1245
1460
                           access="readwrite")
1246
1461
    def ApprovalDelay_dbus_property(self, value=None):
1247
1462
        if value is None:       # get
1248
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1463
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1464
                               * 1000)
1249
1465
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1250
1466
    
1251
1467
    # ApprovalDuration - property
1253
1469
                           access="readwrite")
1254
1470
    def ApprovalDuration_dbus_property(self, value=None):
1255
1471
        if value is None:       # get
1256
 
            return dbus.UInt64(_timedelta_to_milliseconds(
1257
 
                    self.approval_duration))
 
1472
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1473
                               * 1000)
1258
1474
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1259
1475
    
1260
1476
    # Name - property
1273
1489
    def Host_dbus_property(self, value=None):
1274
1490
        if value is None:       # get
1275
1491
            return dbus.String(self.host)
1276
 
        self.host = value
 
1492
        self.host = unicode(value)
1277
1493
    
1278
1494
    # Created - property
1279
1495
    @dbus_service_property(_interface, signature="s", access="read")
1280
1496
    def Created_dbus_property(self):
1281
 
        return dbus.String(datetime_to_dbus(self.created))
 
1497
        return datetime_to_dbus(self.created)
1282
1498
    
1283
1499
    # LastEnabled - property
1284
1500
    @dbus_service_property(_interface, signature="s", access="read")
1305
1521
            return
1306
1522
        return datetime_to_dbus(self.last_checked_ok)
1307
1523
    
 
1524
    # LastCheckerStatus - property
 
1525
    @dbus_service_property(_interface, signature="n",
 
1526
                           access="read")
 
1527
    def LastCheckerStatus_dbus_property(self):
 
1528
        return dbus.Int16(self.last_checker_status)
 
1529
    
1308
1530
    # Expires - property
1309
1531
    @dbus_service_property(_interface, signature="s", access="read")
1310
1532
    def Expires_dbus_property(self):
1320
1542
                           access="readwrite")
1321
1543
    def Timeout_dbus_property(self, value=None):
1322
1544
        if value is None:       # get
1323
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1545
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1546
        old_timeout = self.timeout
1324
1547
        self.timeout = datetime.timedelta(0, 0, 0, value)
1325
 
        if getattr(self, "disable_initiator_tag", None) is None:
1326
 
            return
1327
 
        # Reschedule timeout
1328
 
        gobject.source_remove(self.disable_initiator_tag)
1329
 
        self.disable_initiator_tag = None
1330
 
        self.expires = None
1331
 
        time_to_die = _timedelta_to_milliseconds((self
1332
 
                                                  .last_checked_ok
1333
 
                                                  + self.timeout)
1334
 
                                                 - datetime.datetime
1335
 
                                                 .utcnow())
1336
 
        if time_to_die <= 0:
1337
 
            # The timeout has passed
1338
 
            self.disable()
1339
 
        else:
1340
 
            self.expires = (datetime.datetime.utcnow()
1341
 
                            + datetime.timedelta(milliseconds =
1342
 
                                                 time_to_die))
1343
 
            self.disable_initiator_tag = (gobject.timeout_add
1344
 
                                          (time_to_die, self.disable))
 
1548
        # Reschedule disabling
 
1549
        if self.enabled:
 
1550
            now = datetime.datetime.utcnow()
 
1551
            self.expires += self.timeout - old_timeout
 
1552
            if self.expires <= now:
 
1553
                # The timeout has passed
 
1554
                self.disable()
 
1555
            else:
 
1556
                if (getattr(self, "disable_initiator_tag", None)
 
1557
                    is None):
 
1558
                    return
 
1559
                gobject.source_remove(self.disable_initiator_tag)
 
1560
                self.disable_initiator_tag = (
 
1561
                    gobject.timeout_add(
 
1562
                        int((self.expires - now).total_seconds()
 
1563
                            * 1000), self.disable))
1345
1564
    
1346
1565
    # ExtendedTimeout - property
1347
1566
    @dbus_service_property(_interface, signature="t",
1348
1567
                           access="readwrite")
1349
1568
    def ExtendedTimeout_dbus_property(self, value=None):
1350
1569
        if value is None:       # get
1351
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1570
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1571
                               * 1000)
1352
1572
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1353
1573
    
1354
1574
    # Interval - property
1356
1576
                           access="readwrite")
1357
1577
    def Interval_dbus_property(self, value=None):
1358
1578
        if value is None:       # get
1359
 
            return dbus.UInt64(self.interval_milliseconds())
 
1579
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1360
1580
        self.interval = datetime.timedelta(0, 0, 0, value)
1361
1581
        if getattr(self, "checker_initiator_tag", None) is None:
1362
1582
            return
1363
 
        # Reschedule checker run
1364
 
        gobject.source_remove(self.checker_initiator_tag)
1365
 
        self.checker_initiator_tag = (gobject.timeout_add
1366
 
                                      (value, self.start_checker))
1367
 
        self.start_checker()    # Start one now, too
 
1583
        if self.enabled:
 
1584
            # Reschedule checker run
 
1585
            gobject.source_remove(self.checker_initiator_tag)
 
1586
            self.checker_initiator_tag = (gobject.timeout_add
 
1587
                                          (value, self.start_checker))
 
1588
            self.start_checker()    # Start one now, too
1368
1589
    
1369
1590
    # Checker - property
1370
1591
    @dbus_service_property(_interface, signature="s",
1372
1593
    def Checker_dbus_property(self, value=None):
1373
1594
        if value is None:       # get
1374
1595
            return dbus.String(self.checker_command)
1375
 
        self.checker_command = value
 
1596
        self.checker_command = unicode(value)
1376
1597
    
1377
1598
    # CheckerRunning - property
1378
1599
    @dbus_service_property(_interface, signature="b",
1407
1628
            raise KeyError()
1408
1629
    
1409
1630
    def __getattribute__(self, name):
1410
 
        if(name == '_pipe'):
 
1631
        if name == '_pipe':
1411
1632
            return super(ProxyClient, self).__getattribute__(name)
1412
1633
        self._pipe.send(('getattr', name))
1413
1634
        data = self._pipe.recv()
1420
1641
            return func
1421
1642
    
1422
1643
    def __setattr__(self, name, value):
1423
 
        if(name == '_pipe'):
 
1644
        if name == '_pipe':
1424
1645
            return super(ProxyClient, self).__setattr__(name, value)
1425
1646
        self._pipe.send(('setattr', name, value))
1426
1647
 
1427
1648
 
1428
 
class ClientDBusTransitional(ClientDBus):
1429
 
    __metaclass__ = AlternateDBusNamesMetaclass
1430
 
 
1431
 
 
1432
1649
class ClientHandler(socketserver.BaseRequestHandler, object):
1433
1650
    """A class to handle client connections.
1434
1651
    
1470
1687
            logger.debug("Protocol version: %r", line)
1471
1688
            try:
1472
1689
                if int(line.strip().split()[0]) > 1:
1473
 
                    raise RuntimeError
 
1690
                    raise RuntimeError(line)
1474
1691
            except (ValueError, IndexError, RuntimeError) as error:
1475
1692
                logger.error("Unknown protocol version: %s", error)
1476
1693
                return
1495
1712
                    logger.warning("Bad certificate: %s", error)
1496
1713
                    return
1497
1714
                logger.debug("Fingerprint: %s", fpr)
1498
 
                if self.server.use_dbus:
1499
 
                    # Emit D-Bus signal
1500
 
                    client.NewRequest(str(self.client_address))
1501
1715
                
1502
1716
                try:
1503
1717
                    client = ProxyClient(child_pipe, fpr,
1519
1733
                            client.Rejected("Disabled")
1520
1734
                        return
1521
1735
                    
1522
 
                    if client._approved or not client.approval_delay:
 
1736
                    if client.approved or not client.approval_delay:
1523
1737
                        #We are approved or approval is disabled
1524
1738
                        break
1525
 
                    elif client._approved is None:
 
1739
                    elif client.approved is None:
1526
1740
                        logger.info("Client %s needs approval",
1527
1741
                                    client.name)
1528
1742
                        if self.server.use_dbus:
1529
1743
                            # Emit D-Bus signal
1530
1744
                            client.NeedApproval(
1531
 
                                client.approval_delay_milliseconds(),
1532
 
                                client.approved_by_default)
 
1745
                                client.approval_delay.total_seconds()
 
1746
                                * 1000, client.approved_by_default)
1533
1747
                    else:
1534
1748
                        logger.warning("Client %s was not approved",
1535
1749
                                       client.name)
1541
1755
                    #wait until timeout or approved
1542
1756
                    time = datetime.datetime.now()
1543
1757
                    client.changedstate.acquire()
1544
 
                    (client.changedstate.wait
1545
 
                     (float(client._timedelta_to_milliseconds(delay)
1546
 
                            / 1000)))
 
1758
                    client.changedstate.wait(delay.total_seconds())
1547
1759
                    client.changedstate.release()
1548
1760
                    time2 = datetime.datetime.now()
1549
1761
                    if (time2 - time) >= delay:
1565
1777
                    try:
1566
1778
                        sent = session.send(client.secret[sent_size:])
1567
1779
                    except gnutls.errors.GNUTLSError as error:
1568
 
                        logger.warning("gnutls send failed")
 
1780
                        logger.warning("gnutls send failed",
 
1781
                                       exc_info=error)
1569
1782
                        return
1570
1783
                    logger.debug("Sent: %d, remaining: %d",
1571
1784
                                 sent, len(client.secret)
1574
1787
                
1575
1788
                logger.info("Sending secret to %s", client.name)
1576
1789
                # bump the timeout using extended_timeout
1577
 
                client.checked_ok(client.extended_timeout)
 
1790
                client.bump_timeout(client.extended_timeout)
1578
1791
                if self.server.use_dbus:
1579
1792
                    # Emit D-Bus signal
1580
1793
                    client.GotSecret()
1585
1798
                try:
1586
1799
                    session.bye()
1587
1800
                except gnutls.errors.GNUTLSError as error:
1588
 
                    logger.warning("GnuTLS bye failed")
 
1801
                    logger.warning("GnuTLS bye failed",
 
1802
                                   exc_info=error)
1589
1803
    
1590
1804
    @staticmethod
1591
1805
    def peer_certificate(session):
1656
1870
    def sub_process_main(self, request, address):
1657
1871
        try:
1658
1872
            self.finish_request(request, address)
1659
 
        except:
 
1873
        except Exception:
1660
1874
            self.handle_error(request, address)
1661
1875
        self.close_request(request)
1662
1876
    
1663
1877
    def process_request(self, request, address):
1664
1878
        """Start a new process to process the request."""
1665
1879
        proc = multiprocessing.Process(target = self.sub_process_main,
1666
 
                                       args = (request,
1667
 
                                               address))
 
1880
                                       args = (request, address))
1668
1881
        proc.start()
1669
1882
        return proc
1670
1883
 
1685
1898
    
1686
1899
    def add_pipe(self, parent_pipe, proc):
1687
1900
        """Dummy function; override as necessary"""
1688
 
        raise NotImplementedError
 
1901
        raise NotImplementedError()
1689
1902
 
1690
1903
 
1691
1904
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1698
1911
        use_ipv6:       Boolean; to use IPv6 or not
1699
1912
    """
1700
1913
    def __init__(self, server_address, RequestHandlerClass,
1701
 
                 interface=None, use_ipv6=True):
 
1914
                 interface=None, use_ipv6=True, socketfd=None):
 
1915
        """If socketfd is set, use that file descriptor instead of
 
1916
        creating a new one with socket.socket().
 
1917
        """
1702
1918
        self.interface = interface
1703
1919
        if use_ipv6:
1704
1920
            self.address_family = socket.AF_INET6
 
1921
        if socketfd is not None:
 
1922
            # Save the file descriptor
 
1923
            self.socketfd = socketfd
 
1924
            # Save the original socket.socket() function
 
1925
            self.socket_socket = socket.socket
 
1926
            # To implement --socket, we monkey patch socket.socket.
 
1927
            # 
 
1928
            # (When socketserver.TCPServer is a new-style class, we
 
1929
            # could make self.socket into a property instead of monkey
 
1930
            # patching socket.socket.)
 
1931
            # 
 
1932
            # Create a one-time-only replacement for socket.socket()
 
1933
            @functools.wraps(socket.socket)
 
1934
            def socket_wrapper(*args, **kwargs):
 
1935
                # Restore original function so subsequent calls are
 
1936
                # not affected.
 
1937
                socket.socket = self.socket_socket
 
1938
                del self.socket_socket
 
1939
                # This time only, return a new socket object from the
 
1940
                # saved file descriptor.
 
1941
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1942
            # Replace socket.socket() function with wrapper
 
1943
            socket.socket = socket_wrapper
 
1944
        # The socketserver.TCPServer.__init__ will call
 
1945
        # socket.socket(), which might be our replacement,
 
1946
        # socket_wrapper(), if socketfd was set.
1705
1947
        socketserver.TCPServer.__init__(self, server_address,
1706
1948
                                        RequestHandlerClass)
 
1949
    
1707
1950
    def server_bind(self):
1708
1951
        """This overrides the normal server_bind() function
1709
1952
        to bind to an interface if one was specified, and also NOT to
1717
1960
                try:
1718
1961
                    self.socket.setsockopt(socket.SOL_SOCKET,
1719
1962
                                           SO_BINDTODEVICE,
1720
 
                                           str(self.interface
1721
 
                                               + '\0'))
 
1963
                                           str(self.interface + '\0'))
1722
1964
                except socket.error as error:
1723
 
                    if error[0] == errno.EPERM:
1724
 
                        logger.error("No permission to"
1725
 
                                     " bind to interface %s",
1726
 
                                     self.interface)
1727
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1965
                    if error.errno == errno.EPERM:
 
1966
                        logger.error("No permission to bind to"
 
1967
                                     " interface %s", self.interface)
 
1968
                    elif error.errno == errno.ENOPROTOOPT:
1728
1969
                        logger.error("SO_BINDTODEVICE not available;"
1729
1970
                                     " cannot bind to interface %s",
1730
1971
                                     self.interface)
 
1972
                    elif error.errno == errno.ENODEV:
 
1973
                        logger.error("Interface %s does not exist,"
 
1974
                                     " cannot bind", self.interface)
1731
1975
                    else:
1732
1976
                        raise
1733
1977
        # Only bind(2) the socket if we really need to.
1736
1980
                if self.address_family == socket.AF_INET6:
1737
1981
                    any_address = "::" # in6addr_any
1738
1982
                else:
1739
 
                    any_address = socket.INADDR_ANY
 
1983
                    any_address = "0.0.0.0" # INADDR_ANY
1740
1984
                self.server_address = (any_address,
1741
1985
                                       self.server_address[1])
1742
1986
            elif not self.server_address[1]:
1763
2007
    """
1764
2008
    def __init__(self, server_address, RequestHandlerClass,
1765
2009
                 interface=None, use_ipv6=True, clients=None,
1766
 
                 gnutls_priority=None, use_dbus=True):
 
2010
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1767
2011
        self.enabled = False
1768
2012
        self.clients = clients
1769
2013
        if self.clients is None:
1773
2017
        IPv6_TCPServer.__init__(self, server_address,
1774
2018
                                RequestHandlerClass,
1775
2019
                                interface = interface,
1776
 
                                use_ipv6 = use_ipv6)
 
2020
                                use_ipv6 = use_ipv6,
 
2021
                                socketfd = socketfd)
1777
2022
    def server_activate(self):
1778
2023
        if self.enabled:
1779
2024
            return socketserver.TCPServer.server_activate(self)
1792
2037
    
1793
2038
    def handle_ipc(self, source, condition, parent_pipe=None,
1794
2039
                   proc = None, client_object=None):
1795
 
        condition_names = {
1796
 
            gobject.IO_IN: "IN",   # There is data to read.
1797
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1798
 
                                    # blocking).
1799
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1800
 
            gobject.IO_ERR: "ERR", # Error condition.
1801
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1802
 
                                    # broken, usually for pipes and
1803
 
                                    # sockets).
1804
 
            }
1805
 
        conditions_string = ' | '.join(name
1806
 
                                       for cond, name in
1807
 
                                       condition_names.iteritems()
1808
 
                                       if cond & condition)
1809
2040
        # error, or the other end of multiprocessing.Pipe has closed
1810
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2041
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1811
2042
            # Wait for other process to exit
1812
2043
            proc.join()
1813
2044
            return False
1871
2102
        return True
1872
2103
 
1873
2104
 
 
2105
def rfc3339_duration_to_delta(duration):
 
2106
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2107
    
 
2108
    >>> rfc3339_duration_to_delta("P7D")
 
2109
    datetime.timedelta(7)
 
2110
    >>> rfc3339_duration_to_delta("PT60S")
 
2111
    datetime.timedelta(0, 60)
 
2112
    >>> rfc3339_duration_to_delta("PT60M")
 
2113
    datetime.timedelta(0, 3600)
 
2114
    >>> rfc3339_duration_to_delta("PT24H")
 
2115
    datetime.timedelta(1)
 
2116
    >>> rfc3339_duration_to_delta("P1W")
 
2117
    datetime.timedelta(7)
 
2118
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2119
    datetime.timedelta(0, 330)
 
2120
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2121
    datetime.timedelta(1, 200)
 
2122
    """
 
2123
    
 
2124
    # Parsing an RFC 3339 duration with regular expressions is not
 
2125
    # possible - there would have to be multiple places for the same
 
2126
    # values, like seconds.  The current code, while more esoteric, is
 
2127
    # cleaner without depending on a parsing library.  If Python had a
 
2128
    # built-in library for parsing we would use it, but we'd like to
 
2129
    # avoid excessive use of external libraries.
 
2130
    
 
2131
    # New type for defining tokens, syntax, and semantics all-in-one
 
2132
    Token = collections.namedtuple("Token",
 
2133
                                   ("regexp", # To match token; if
 
2134
                                              # "value" is not None,
 
2135
                                              # must have a "group"
 
2136
                                              # containing digits
 
2137
                                    "value",  # datetime.timedelta or
 
2138
                                              # None
 
2139
                                    "followers")) # Tokens valid after
 
2140
                                                  # this token
 
2141
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2142
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2143
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2144
    token_second = Token(re.compile(r"(\d+)S"),
 
2145
                         datetime.timedelta(seconds=1),
 
2146
                         frozenset((token_end,)))
 
2147
    token_minute = Token(re.compile(r"(\d+)M"),
 
2148
                         datetime.timedelta(minutes=1),
 
2149
                         frozenset((token_second, token_end)))
 
2150
    token_hour = Token(re.compile(r"(\d+)H"),
 
2151
                       datetime.timedelta(hours=1),
 
2152
                       frozenset((token_minute, token_end)))
 
2153
    token_time = Token(re.compile(r"T"),
 
2154
                       None,
 
2155
                       frozenset((token_hour, token_minute,
 
2156
                                  token_second)))
 
2157
    token_day = Token(re.compile(r"(\d+)D"),
 
2158
                      datetime.timedelta(days=1),
 
2159
                      frozenset((token_time, token_end)))
 
2160
    token_month = Token(re.compile(r"(\d+)M"),
 
2161
                        datetime.timedelta(weeks=4),
 
2162
                        frozenset((token_day, token_end)))
 
2163
    token_year = Token(re.compile(r"(\d+)Y"),
 
2164
                       datetime.timedelta(weeks=52),
 
2165
                       frozenset((token_month, token_end)))
 
2166
    token_week = Token(re.compile(r"(\d+)W"),
 
2167
                       datetime.timedelta(weeks=1),
 
2168
                       frozenset((token_end,)))
 
2169
    token_duration = Token(re.compile(r"P"), None,
 
2170
                           frozenset((token_year, token_month,
 
2171
                                      token_day, token_time,
 
2172
                                      token_week)))
 
2173
    # Define starting values
 
2174
    value = datetime.timedelta() # Value so far
 
2175
    found_token = None
 
2176
    followers = frozenset((token_duration,)) # Following valid tokens
 
2177
    s = duration                # String left to parse
 
2178
    # Loop until end token is found
 
2179
    while found_token is not token_end:
 
2180
        # Search for any currently valid tokens
 
2181
        for token in followers:
 
2182
            match = token.regexp.match(s)
 
2183
            if match is not None:
 
2184
                # Token found
 
2185
                if token.value is not None:
 
2186
                    # Value found, parse digits
 
2187
                    factor = int(match.group(1), 10)
 
2188
                    # Add to value so far
 
2189
                    value += factor * token.value
 
2190
                # Strip token from string
 
2191
                s = token.regexp.sub("", s, 1)
 
2192
                # Go to found token
 
2193
                found_token = token
 
2194
                # Set valid next tokens
 
2195
                followers = found_token.followers
 
2196
                break
 
2197
        else:
 
2198
            # No currently valid tokens were found
 
2199
            raise ValueError("Invalid RFC 3339 duration")
 
2200
    # End token found
 
2201
    return value
 
2202
 
 
2203
 
1874
2204
def string_to_delta(interval):
1875
2205
    """Parse a string and return a datetime.timedelta
1876
2206
    
1887
2217
    >>> string_to_delta('5m 30s')
1888
2218
    datetime.timedelta(0, 330)
1889
2219
    """
 
2220
    
 
2221
    try:
 
2222
        return rfc3339_duration_to_delta(interval)
 
2223
    except ValueError:
 
2224
        pass
 
2225
    
1890
2226
    timevalue = datetime.timedelta(0)
1891
2227
    for s in interval.split():
1892
2228
        try:
1903
2239
            elif suffix == "w":
1904
2240
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1905
2241
            else:
1906
 
                raise ValueError("Unknown suffix %r" % suffix)
1907
 
        except (ValueError, IndexError) as e:
 
2242
                raise ValueError("Unknown suffix {!r}"
 
2243
                                 .format(suffix))
 
2244
        except IndexError as e:
1908
2245
            raise ValueError(*(e.args))
1909
2246
        timevalue += delta
1910
2247
    return timevalue
1923
2260
        sys.exit()
1924
2261
    if not noclose:
1925
2262
        # Close all standard open file descriptors
1926
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2263
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1927
2264
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1928
 
            raise OSError(errno.ENODEV,
1929
 
                          "%s not a character device"
1930
 
                          % os.path.devnull)
 
2265
            raise OSError(errno.ENODEV, "{} not a character device"
 
2266
                          .format(os.devnull))
1931
2267
        os.dup2(null, sys.stdin.fileno())
1932
2268
        os.dup2(null, sys.stdout.fileno())
1933
2269
        os.dup2(null, sys.stderr.fileno())
1942
2278
    
1943
2279
    parser = argparse.ArgumentParser()
1944
2280
    parser.add_argument("-v", "--version", action="version",
1945
 
                        version = "%%(prog)s %s" % version,
 
2281
                        version = "%(prog)s {}".format(version),
1946
2282
                        help="show version number and exit")
1947
2283
    parser.add_argument("-i", "--interface", metavar="IF",
1948
2284
                        help="Bind to interface IF")
1954
2290
                        help="Run self-test")
1955
2291
    parser.add_argument("--debug", action="store_true",
1956
2292
                        help="Debug mode; run in foreground and log"
1957
 
                        " to terminal")
 
2293
                        " to terminal", default=None)
1958
2294
    parser.add_argument("--debuglevel", metavar="LEVEL",
1959
2295
                        help="Debug level for stdout output")
1960
2296
    parser.add_argument("--priority", help="GnuTLS"
1967
2303
                        " files")
1968
2304
    parser.add_argument("--no-dbus", action="store_false",
1969
2305
                        dest="use_dbus", help="Do not provide D-Bus"
1970
 
                        " system bus interface")
 
2306
                        " system bus interface", default=None)
1971
2307
    parser.add_argument("--no-ipv6", action="store_false",
1972
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2308
                        dest="use_ipv6", help="Do not use IPv6",
 
2309
                        default=None)
1973
2310
    parser.add_argument("--no-restore", action="store_false",
1974
2311
                        dest="restore", help="Do not restore stored"
1975
 
                        " state")
 
2312
                        " state", default=None)
 
2313
    parser.add_argument("--socket", type=int,
 
2314
                        help="Specify a file descriptor to a network"
 
2315
                        " socket to use instead of creating one")
1976
2316
    parser.add_argument("--statedir", metavar="DIR",
1977
2317
                        help="Directory to save/restore state in")
 
2318
    parser.add_argument("--foreground", action="store_true",
 
2319
                        help="Run in foreground", default=None)
 
2320
    parser.add_argument("--no-zeroconf", action="store_false",
 
2321
                        dest="zeroconf", help="Do not use Zeroconf",
 
2322
                        default=None)
1978
2323
    
1979
2324
    options = parser.parse_args()
1980
2325
    
1981
2326
    if options.check:
1982
2327
        import doctest
1983
 
        doctest.testmod()
1984
 
        sys.exit()
 
2328
        fail_count, test_count = doctest.testmod()
 
2329
        sys.exit(os.EX_OK if fail_count == 0 else 1)
1985
2330
    
1986
2331
    # Default values for config file for server-global settings
1987
2332
    server_defaults = { "interface": "",
1989
2334
                        "port": "",
1990
2335
                        "debug": "False",
1991
2336
                        "priority":
1992
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2337
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1993
2338
                        "servicename": "Mandos",
1994
2339
                        "use_dbus": "True",
1995
2340
                        "use_ipv6": "True",
1996
2341
                        "debuglevel": "",
1997
2342
                        "restore": "True",
1998
 
                        "statedir": "/var/lib/mandos"
 
2343
                        "socket": "",
 
2344
                        "statedir": "/var/lib/mandos",
 
2345
                        "foreground": "False",
 
2346
                        "zeroconf": "True",
1999
2347
                        }
2000
2348
    
2001
2349
    # Parse config file for server-global settings
2006
2354
    # Convert the SafeConfigParser object to a dict
2007
2355
    server_settings = server_config.defaults()
2008
2356
    # Use the appropriate methods on the non-string config options
2009
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2357
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2010
2358
        server_settings[option] = server_config.getboolean("DEFAULT",
2011
2359
                                                           option)
2012
2360
    if server_settings["port"]:
2013
2361
        server_settings["port"] = server_config.getint("DEFAULT",
2014
2362
                                                       "port")
 
2363
    if server_settings["socket"]:
 
2364
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2365
                                                         "socket")
 
2366
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2367
        # over with an opened os.devnull.  But we don't want this to
 
2368
        # happen with a supplied network socket.
 
2369
        if 0 <= server_settings["socket"] <= 2:
 
2370
            server_settings["socket"] = os.dup(server_settings
 
2371
                                               ["socket"])
2015
2372
    del server_config
2016
2373
    
2017
2374
    # Override the settings from the config file with command line
2019
2376
    for option in ("interface", "address", "port", "debug",
2020
2377
                   "priority", "servicename", "configdir",
2021
2378
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2022
 
                   "statedir"):
 
2379
                   "statedir", "socket", "foreground", "zeroconf"):
2023
2380
        value = getattr(options, option)
2024
2381
        if value is not None:
2025
2382
            server_settings[option] = value
2028
2385
    for option in server_settings.keys():
2029
2386
        if type(server_settings[option]) is str:
2030
2387
            server_settings[option] = unicode(server_settings[option])
 
2388
    # Force all boolean options to be boolean
 
2389
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2390
                   "foreground", "zeroconf"):
 
2391
        server_settings[option] = bool(server_settings[option])
 
2392
    # Debug implies foreground
 
2393
    if server_settings["debug"]:
 
2394
        server_settings["foreground"] = True
2031
2395
    # Now we have our good server settings in "server_settings"
2032
2396
    
2033
2397
    ##################################################################
2034
2398
    
 
2399
    if (not server_settings["zeroconf"] and
 
2400
        not (server_settings["port"]
 
2401
             or server_settings["socket"] != "")):
 
2402
            parser.error("Needs port or socket to work without"
 
2403
                         " Zeroconf")
 
2404
    
2035
2405
    # For convenience
2036
2406
    debug = server_settings["debug"]
2037
2407
    debuglevel = server_settings["debuglevel"]
2039
2409
    use_ipv6 = server_settings["use_ipv6"]
2040
2410
    stored_state_path = os.path.join(server_settings["statedir"],
2041
2411
                                     stored_state_file)
 
2412
    foreground = server_settings["foreground"]
 
2413
    zeroconf = server_settings["zeroconf"]
2042
2414
    
2043
2415
    if debug:
2044
 
        initlogger(logging.DEBUG)
 
2416
        initlogger(debug, logging.DEBUG)
2045
2417
    else:
2046
2418
        if not debuglevel:
2047
 
            initlogger()
 
2419
            initlogger(debug)
2048
2420
        else:
2049
2421
            level = getattr(logging, debuglevel.upper())
2050
 
            initlogger(level)
 
2422
            initlogger(debug, level)
2051
2423
    
2052
2424
    if server_settings["servicename"] != "Mandos":
2053
2425
        syslogger.setFormatter(logging.Formatter
2054
 
                               ('Mandos (%s) [%%(process)d]:'
2055
 
                                ' %%(levelname)s: %%(message)s'
2056
 
                                % server_settings["servicename"]))
 
2426
                               ('Mandos ({}) [%(process)d]:'
 
2427
                                ' %(levelname)s: %(message)s'
 
2428
                                .format(server_settings
 
2429
                                        ["servicename"])))
2057
2430
    
2058
2431
    # Parse config file with clients
2059
 
    client_defaults = { "timeout": "5m",
2060
 
                        "extended_timeout": "15m",
2061
 
                        "interval": "2m",
2062
 
                        "checker": "fping -q -- %%(host)s",
2063
 
                        "host": "",
2064
 
                        "approval_delay": "0s",
2065
 
                        "approval_duration": "1s",
2066
 
                        }
2067
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2432
    client_config = configparser.SafeConfigParser(Client
 
2433
                                                  .client_defaults)
2068
2434
    client_config.read(os.path.join(server_settings["configdir"],
2069
2435
                                    "clients.conf"))
2070
2436
    
2071
2437
    global mandos_dbus_service
2072
2438
    mandos_dbus_service = None
2073
2439
    
 
2440
    socketfd = None
 
2441
    if server_settings["socket"] != "":
 
2442
        socketfd = server_settings["socket"]
2074
2443
    tcp_server = MandosServer((server_settings["address"],
2075
2444
                               server_settings["port"]),
2076
2445
                              ClientHandler,
2079
2448
                              use_ipv6=use_ipv6,
2080
2449
                              gnutls_priority=
2081
2450
                              server_settings["priority"],
2082
 
                              use_dbus=use_dbus)
2083
 
    if not debug:
2084
 
        pidfilename = "/var/run/mandos.pid"
 
2451
                              use_dbus=use_dbus,
 
2452
                              socketfd=socketfd)
 
2453
    if not foreground:
 
2454
        pidfilename = "/run/mandos.pid"
 
2455
        if not os.path.isdir("/run/."):
 
2456
            pidfilename = "/var/run/mandos.pid"
 
2457
        pidfile = None
2085
2458
        try:
2086
2459
            pidfile = open(pidfilename, "w")
2087
 
        except IOError:
2088
 
            logger.error("Could not open file %r", pidfilename)
 
2460
        except IOError as e:
 
2461
            logger.error("Could not open file %r", pidfilename,
 
2462
                         exc_info=e)
2089
2463
    
2090
 
    try:
2091
 
        uid = pwd.getpwnam("_mandos").pw_uid
2092
 
        gid = pwd.getpwnam("_mandos").pw_gid
2093
 
    except KeyError:
 
2464
    for name in ("_mandos", "mandos", "nobody"):
2094
2465
        try:
2095
 
            uid = pwd.getpwnam("mandos").pw_uid
2096
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2466
            uid = pwd.getpwnam(name).pw_uid
 
2467
            gid = pwd.getpwnam(name).pw_gid
 
2468
            break
2097
2469
        except KeyError:
2098
 
            try:
2099
 
                uid = pwd.getpwnam("nobody").pw_uid
2100
 
                gid = pwd.getpwnam("nobody").pw_gid
2101
 
            except KeyError:
2102
 
                uid = 65534
2103
 
                gid = 65534
 
2470
            continue
 
2471
    else:
 
2472
        uid = 65534
 
2473
        gid = 65534
2104
2474
    try:
2105
2475
        os.setgid(gid)
2106
2476
        os.setuid(uid)
2107
2477
    except OSError as error:
2108
 
        if error[0] != errno.EPERM:
2109
 
            raise error
 
2478
        if error.errno != errno.EPERM:
 
2479
            raise
2110
2480
    
2111
2481
    if debug:
2112
2482
        # Enable all possible GnuTLS debugging
2123
2493
         .gnutls_global_set_log_function(debug_gnutls))
2124
2494
        
2125
2495
        # Redirect stdin so all checkers get /dev/null
2126
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2496
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2127
2497
        os.dup2(null, sys.stdin.fileno())
2128
2498
        if null > 2:
2129
2499
            os.close(null)
2130
 
    else:
2131
 
        # No console logging
2132
 
        logger.removeHandler(console)
2133
2500
    
2134
2501
    # Need to fork before connecting to D-Bus
2135
 
    if not debug:
 
2502
    if not foreground:
2136
2503
        # Close all input and output, do double fork, etc.
2137
2504
        daemon()
2138
2505
    
 
2506
    # multiprocessing will use threads, so before we use gobject we
 
2507
    # need to inform gobject that threads will be used.
 
2508
    gobject.threads_init()
 
2509
    
2139
2510
    global main_loop
2140
2511
    # From the Avahi example code
2141
 
    DBusGMainLoop(set_as_default=True )
 
2512
    DBusGMainLoop(set_as_default=True)
2142
2513
    main_loop = gobject.MainLoop()
2143
2514
    bus = dbus.SystemBus()
2144
2515
    # End of Avahi example code
2150
2521
                            ("se.bsnet.fukt.Mandos", bus,
2151
2522
                             do_not_queue=True))
2152
2523
        except dbus.exceptions.NameExistsException as e:
2153
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2524
            logger.error("Disabling D-Bus:", exc_info=e)
2154
2525
            use_dbus = False
2155
2526
            server_settings["use_dbus"] = False
2156
2527
            tcp_server.use_dbus = False
2157
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2158
 
    service = AvahiServiceToSyslog(name =
2159
 
                                   server_settings["servicename"],
2160
 
                                   servicetype = "_mandos._tcp",
2161
 
                                   protocol = protocol, bus = bus)
2162
 
    if server_settings["interface"]:
2163
 
        service.interface = (if_nametoindex
2164
 
                             (str(server_settings["interface"])))
 
2528
    if zeroconf:
 
2529
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2530
        service = AvahiServiceToSyslog(name =
 
2531
                                       server_settings["servicename"],
 
2532
                                       servicetype = "_mandos._tcp",
 
2533
                                       protocol = protocol, bus = bus)
 
2534
        if server_settings["interface"]:
 
2535
            service.interface = (if_nametoindex
 
2536
                                 (str(server_settings["interface"])))
2165
2537
    
2166
2538
    global multiprocessing_manager
2167
2539
    multiprocessing_manager = multiprocessing.Manager()
2168
2540
    
2169
2541
    client_class = Client
2170
2542
    if use_dbus:
2171
 
        client_class = functools.partial(ClientDBusTransitional,
2172
 
                                         bus = bus)
2173
 
    
2174
 
    special_settings = {
2175
 
        # Some settings need to be accessd by special methods;
2176
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2177
 
        "approved_by_default":
2178
 
            lambda section:
2179
 
            client_config.getboolean(section, "approved_by_default"),
2180
 
        }
2181
 
    # Construct a new dict of client settings of this form:
2182
 
    # { client_name: {setting_name: value, ...}, ...}
2183
 
    # with exceptions for any special settings as defined above
2184
 
    client_settings = dict((clientname,
2185
 
                           dict((setting,
2186
 
                                 (value
2187
 
                                  if setting not in special_settings
2188
 
                                  else special_settings[setting]
2189
 
                                  (clientname)))
2190
 
                                for setting, value in
2191
 
                                client_config.items(clientname)))
2192
 
                          for clientname in client_config.sections())
2193
 
    
 
2543
        client_class = functools.partial(ClientDBus, bus = bus)
 
2544
    
 
2545
    client_settings = Client.config_parser(client_config)
2194
2546
    old_client_settings = {}
2195
 
    clients_data = []
 
2547
    clients_data = {}
 
2548
    
 
2549
    # This is used to redirect stdout and stderr for checker processes
 
2550
    global wnull
 
2551
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2552
    # Only used if server is running in foreground but not in debug
 
2553
    # mode
 
2554
    if debug or not foreground:
 
2555
        wnull.close()
2196
2556
    
2197
2557
    # Get client data and settings from last running state.
2198
2558
    if server_settings["restore"]:
2202
2562
                                                     (stored_state))
2203
2563
            os.remove(stored_state_path)
2204
2564
        except IOError as e:
2205
 
            logger.warning("Could not load persistent state: {0}"
2206
 
                           .format(e))
2207
 
            if e.errno != errno.ENOENT:
 
2565
            if e.errno == errno.ENOENT:
 
2566
                logger.warning("Could not load persistent state: {}"
 
2567
                                .format(os.strerror(e.errno)))
 
2568
            else:
 
2569
                logger.critical("Could not load persistent state:",
 
2570
                                exc_info=e)
2208
2571
                raise
 
2572
        except EOFError as e:
 
2573
            logger.warning("Could not load persistent state: "
 
2574
                           "EOFError:", exc_info=e)
2209
2575
    
2210
 
    with Crypto() as crypt:
2211
 
        for client in clients_data:
2212
 
            client_name = client["name"]
 
2576
    with PGPEngine() as pgp:
 
2577
        for client_name, client in clients_data.items():
 
2578
            # Skip removed clients
 
2579
            if client_name not in client_settings:
 
2580
                continue
2213
2581
            
2214
2582
            # Decide which value to use after restoring saved state.
2215
2583
            # We have three different values: Old config file,
2224
2592
                    if (name != "secret" and
2225
2593
                        value != old_client_settings[client_name]
2226
2594
                        [name]):
2227
 
                        setattr(client, name, value)
 
2595
                        client[name] = value
2228
2596
                except KeyError:
2229
2597
                    pass
2230
2598
            
2231
2599
            # Clients who has passed its expire date can still be
2232
 
            # enabled if its last checker was sucessful.  Clients
2233
 
            # whose checker failed before we stored its state is
2234
 
            # assumed to have failed all checkers during downtime.
2235
 
            if client["enabled"] and client["last_checked_ok"]:
2236
 
                if ((datetime.datetime.utcnow()
2237
 
                     - client["last_checked_ok"])
2238
 
                    > client["interval"]):
2239
 
                    if client["last_checker_status"] != 0:
 
2600
            # enabled if its last checker was successful.  Clients
 
2601
            # whose checker succeeded before we stored its state is
 
2602
            # assumed to have successfully run all checkers during
 
2603
            # downtime.
 
2604
            if client["enabled"]:
 
2605
                if datetime.datetime.utcnow() >= client["expires"]:
 
2606
                    if not client["last_checked_ok"]:
 
2607
                        logger.warning(
 
2608
                            "disabling client {} - Client never "
 
2609
                            "performed a successful checker"
 
2610
                            .format(client_name))
 
2611
                        client["enabled"] = False
 
2612
                    elif client["last_checker_status"] != 0:
 
2613
                        logger.warning(
 
2614
                            "disabling client {} - Client last"
 
2615
                            " checker failed with error code {}"
 
2616
                            .format(client_name,
 
2617
                                    client["last_checker_status"]))
2240
2618
                        client["enabled"] = False
2241
2619
                    else:
2242
2620
                        client["expires"] = (datetime.datetime
2243
2621
                                             .utcnow()
2244
2622
                                             + client["timeout"])
2245
 
            
2246
 
            client["changedstate"] = (multiprocessing_manager
2247
 
                                      .Condition
2248
 
                                      (multiprocessing_manager
2249
 
                                       .Lock()))
2250
 
            if use_dbus:
2251
 
                new_client = (ClientDBusTransitional.__new__
2252
 
                              (ClientDBusTransitional))
2253
 
                tcp_server.clients[client_name] = new_client
2254
 
                new_client.bus = bus
2255
 
                for name, value in client.iteritems():
2256
 
                    setattr(new_client, name, value)
2257
 
                client_object_name = unicode(client_name).translate(
2258
 
                    {ord("."): ord("_"),
2259
 
                     ord("-"): ord("_")})
2260
 
                new_client.dbus_object_path = (dbus.ObjectPath
2261
 
                                               ("/clients/"
2262
 
                                                + client_object_name))
2263
 
                DBusObjectWithProperties.__init__(new_client,
2264
 
                                                  new_client.bus,
2265
 
                                                  new_client
2266
 
                                                  .dbus_object_path)
2267
 
            else:
2268
 
                tcp_server.clients[client_name] = (Client.__new__
2269
 
                                                   (Client))
2270
 
                for name, value in client.iteritems():
2271
 
                    setattr(tcp_server.clients[client_name],
2272
 
                            name, value)
2273
 
            
 
2623
                        logger.debug("Last checker succeeded,"
 
2624
                                     " keeping {} enabled"
 
2625
                                     .format(client_name))
2274
2626
            try:
2275
 
                tcp_server.clients[client_name].secret = (
2276
 
                    crypt.decrypt(tcp_server.clients[client_name]
2277
 
                                  .encrypted_secret,
2278
 
                                  client_settings[client_name]
2279
 
                                  ["secret"]))
2280
 
            except CryptoError:
 
2627
                client["secret"] = (
 
2628
                    pgp.decrypt(client["encrypted_secret"],
 
2629
                                client_settings[client_name]
 
2630
                                ["secret"]))
 
2631
            except PGPError:
2281
2632
                # If decryption fails, we use secret from new settings
2282
 
                tcp_server.clients[client_name].secret = (
 
2633
                logger.debug("Failed to decrypt {} old secret"
 
2634
                             .format(client_name))
 
2635
                client["secret"] = (
2283
2636
                    client_settings[client_name]["secret"])
2284
2637
    
2285
 
    # Create/remove clients based on new changes made to config
2286
 
    for clientname in set(old_client_settings) - set(client_settings):
2287
 
        del tcp_server.clients[clientname]
2288
 
    for clientname in set(client_settings) - set(old_client_settings):
2289
 
        tcp_server.clients[clientname] = (client_class(name
2290
 
                                                       = clientname,
2291
 
                                                       config =
2292
 
                                                       client_settings
2293
 
                                                       [clientname]))
 
2638
    # Add/remove clients based on new changes made to config
 
2639
    for client_name in (set(old_client_settings)
 
2640
                        - set(client_settings)):
 
2641
        del clients_data[client_name]
 
2642
    for client_name in (set(client_settings)
 
2643
                        - set(old_client_settings)):
 
2644
        clients_data[client_name] = client_settings[client_name]
 
2645
    
 
2646
    # Create all client objects
 
2647
    for client_name, client in clients_data.items():
 
2648
        tcp_server.clients[client_name] = client_class(
 
2649
            name = client_name, settings = client,
 
2650
            server_settings = server_settings)
2294
2651
    
2295
2652
    if not tcp_server.clients:
2296
2653
        logger.warning("No clients defined")
2297
 
        
2298
 
    if not debug:
2299
 
        try:
2300
 
            with pidfile:
2301
 
                pid = os.getpid()
2302
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2303
 
            del pidfile
2304
 
        except IOError:
2305
 
            logger.error("Could not write to file %r with PID %d",
2306
 
                         pidfilename, pid)
2307
 
        except NameError:
2308
 
            # "pidfile" was never created
2309
 
            pass
 
2654
    
 
2655
    if not foreground:
 
2656
        if pidfile is not None:
 
2657
            try:
 
2658
                with pidfile:
 
2659
                    pid = os.getpid()
 
2660
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2661
            except IOError:
 
2662
                logger.error("Could not write to file %r with PID %d",
 
2663
                             pidfilename, pid)
 
2664
        del pidfile
2310
2665
        del pidfilename
2311
 
        
2312
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2313
2666
    
2314
2667
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2315
2668
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2316
2669
    
2317
2670
    if use_dbus:
2318
 
        class MandosDBusService(dbus.service.Object):
 
2671
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2672
                                        "se.bsnet.fukt.Mandos"})
 
2673
        class MandosDBusService(DBusObjectWithProperties):
2319
2674
            """A D-Bus proxy object"""
2320
2675
            def __init__(self):
2321
2676
                dbus.service.Object.__init__(self, bus, "/")
2322
2677
            _interface = "se.recompile.Mandos"
2323
2678
            
 
2679
            @dbus_interface_annotations(_interface)
 
2680
            def _foo(self):
 
2681
                return { "org.freedesktop.DBus.Property"
 
2682
                         ".EmitsChangedSignal":
 
2683
                             "false"}
 
2684
            
2324
2685
            @dbus.service.signal(_interface, signature="o")
2325
2686
            def ClientAdded(self, objpath):
2326
2687
                "D-Bus signal"
2368
2729
            
2369
2730
            del _interface
2370
2731
        
2371
 
        class MandosDBusServiceTransitional(MandosDBusService):
2372
 
            __metaclass__ = AlternateDBusNamesMetaclass
2373
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2732
        mandos_dbus_service = MandosDBusService()
2374
2733
    
2375
2734
    def cleanup():
2376
2735
        "Cleanup function; run on exit"
2377
 
        service.cleanup()
 
2736
        if zeroconf:
 
2737
            service.cleanup()
2378
2738
        
2379
2739
        multiprocessing.active_children()
 
2740
        wnull.close()
2380
2741
        if not (tcp_server.clients or client_settings):
2381
2742
            return
2382
2743
        
2383
2744
        # Store client before exiting. Secrets are encrypted with key
2384
2745
        # based on what config file has. If config file is
2385
2746
        # removed/edited, old secret will thus be unrecovable.
2386
 
        clients = []
2387
 
        with Crypto() as crypt:
 
2747
        clients = {}
 
2748
        with PGPEngine() as pgp:
2388
2749
            for client in tcp_server.clients.itervalues():
2389
2750
                key = client_settings[client.name]["secret"]
2390
 
                client.encrypted_secret = crypt.encrypt(client.secret,
2391
 
                                                        key)
 
2751
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2752
                                                      key)
2392
2753
                client_dict = {}
2393
2754
                
2394
 
                # A list of attributes that will not be stored when
2395
 
                # shutting down.
2396
 
                exclude = set(("bus", "changedstate", "secret"))
 
2755
                # A list of attributes that can not be pickled
 
2756
                # + secret.
 
2757
                exclude = { "bus", "changedstate", "secret",
 
2758
                            "checker", "server_settings" }
2397
2759
                for name, typ in (inspect.getmembers
2398
2760
                                  (dbus.service.Object)):
2399
2761
                    exclude.add(name)
2404
2766
                    if attr not in exclude:
2405
2767
                        client_dict[attr] = getattr(client, attr)
2406
2768
                
2407
 
                clients.append(client_dict)
 
2769
                clients[client.name] = client_dict
2408
2770
                del client_settings[client.name]["secret"]
2409
2771
        
2410
2772
        try:
2411
 
            with os.fdopen(os.open(stored_state_path,
2412
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2413
 
                                   0600), "wb") as stored_state:
 
2773
            with (tempfile.NamedTemporaryFile
 
2774
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2775
                   dir=os.path.dirname(stored_state_path),
 
2776
                   delete=False)) as stored_state:
2414
2777
                pickle.dump((clients, client_settings), stored_state)
 
2778
                tempname=stored_state.name
 
2779
            os.rename(tempname, stored_state_path)
2415
2780
        except (IOError, OSError) as e:
2416
 
            logger.warning("Could not save persistent state: {0}"
2417
 
                           .format(e))
2418
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2781
            if not debug:
 
2782
                try:
 
2783
                    os.remove(tempname)
 
2784
                except NameError:
 
2785
                    pass
 
2786
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2787
                logger.warning("Could not save persistent state: {}"
 
2788
                               .format(os.strerror(e.errno)))
 
2789
            else:
 
2790
                logger.warning("Could not save persistent state:",
 
2791
                               exc_info=e)
2419
2792
                raise
2420
2793
        
2421
2794
        # Delete all clients, and settings from config
2446
2819
    tcp_server.server_activate()
2447
2820
    
2448
2821
    # Find out what port we got
2449
 
    service.port = tcp_server.socket.getsockname()[1]
 
2822
    if zeroconf:
 
2823
        service.port = tcp_server.socket.getsockname()[1]
2450
2824
    if use_ipv6:
2451
2825
        logger.info("Now listening on address %r, port %d,"
2452
 
                    " flowinfo %d, scope_id %d"
2453
 
                    % tcp_server.socket.getsockname())
 
2826
                    " flowinfo %d, scope_id %d",
 
2827
                    *tcp_server.socket.getsockname())
2454
2828
    else:                       # IPv4
2455
 
        logger.info("Now listening on address %r, port %d"
2456
 
                    % tcp_server.socket.getsockname())
 
2829
        logger.info("Now listening on address %r, port %d",
 
2830
                    *tcp_server.socket.getsockname())
2457
2831
    
2458
2832
    #service.interface = tcp_server.socket.getsockname()[3]
2459
2833
    
2460
2834
    try:
2461
 
        # From the Avahi example code
2462
 
        try:
2463
 
            service.activate()
2464
 
        except dbus.exceptions.DBusException as error:
2465
 
            logger.critical("DBusException: %s", error)
2466
 
            cleanup()
2467
 
            sys.exit(1)
2468
 
        # End of Avahi example code
 
2835
        if zeroconf:
 
2836
            # From the Avahi example code
 
2837
            try:
 
2838
                service.activate()
 
2839
            except dbus.exceptions.DBusException as error:
 
2840
                logger.critical("D-Bus Exception", exc_info=error)
 
2841
                cleanup()
 
2842
                sys.exit(1)
 
2843
            # End of Avahi example code
2469
2844
        
2470
2845
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2471
2846
                             lambda *args, **kwargs:
2475
2850
        logger.debug("Starting main loop")
2476
2851
        main_loop.run()
2477
2852
    except AvahiError as error:
2478
 
        logger.critical("AvahiError: %s", error)
 
2853
        logger.critical("Avahi Error", exc_info=error)
2479
2854
        cleanup()
2480
2855
        sys.exit(1)
2481
2856
    except KeyboardInterrupt:
2486
2861
    # Must run before the D-Bus bus name gets deregistered
2487
2862
    cleanup()
2488
2863
 
2489
 
 
2490
2864
if __name__ == '__main__':
2491
2865
    main()