/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: 2013-10-20 15:25:09 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131020152509-zkhuy2yse76w10hg
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
  (purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
  (DM-Upload-Allowed): Removed.
  (mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
                    use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
  (pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
                                                    is "PT0S" - using
                                                    the new RFC 3339
                                                    duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
  (FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
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-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 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
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
66
 
import hashlib
 
68
import binascii
 
69
import tempfile
 
70
import itertools
 
71
import collections
67
72
 
68
73
import dbus
69
74
import dbus.service
74
79
import ctypes.util
75
80
import xml.dom.minidom
76
81
import inspect
77
 
import Crypto.Cipher.AES
78
82
 
79
83
try:
80
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
88
    except ImportError:
85
89
        SO_BINDTODEVICE = None
86
90
 
87
 
 
88
 
version = "1.4.1"
 
91
version = "1.6.1"
 
92
stored_state_file = "clients.pickle"
89
93
 
90
94
logger = logging.getLogger()
91
 
stored_state_path = "/var/lib/mandos/clients.pickle"
92
 
 
93
95
syslogger = (logging.handlers.SysLogHandler
94
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
97
              address = str("/dev/log")))
96
 
syslogger.setFormatter(logging.Formatter
97
 
                       ('Mandos [%(process)d]: %(levelname)s:'
98
 
                        ' %(message)s'))
99
 
logger.addHandler(syslogger)
100
 
 
101
 
console = logging.StreamHandler()
102
 
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
 
                                       ' [%(process)d]:'
104
 
                                       ' %(levelname)s:'
105
 
                                       ' %(message)s'))
106
 
logger.addHandler(console)
 
98
 
 
99
try:
 
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
                      (ctypes.util.find_library("c"))
 
102
                      .if_nametoindex)
 
103
except (OSError, AttributeError):
 
104
    def if_nametoindex(interface):
 
105
        "Get an interface index the hard way, i.e. using fcntl()"
 
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
107
        with contextlib.closing(socket.socket()) as s:
 
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
 
113
        return interface_index
 
114
 
 
115
 
 
116
def initlogger(debug, level=logging.WARNING):
 
117
    """init logger and add loglevel"""
 
118
    
 
119
    syslogger.setFormatter(logging.Formatter
 
120
                           ('Mandos [%(process)d]: %(levelname)s:'
 
121
                            ' %(message)s'))
 
122
    logger.addHandler(syslogger)
 
123
    
 
124
    if debug:
 
125
        console = logging.StreamHandler()
 
126
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
127
                                               ' [%(process)d]:'
 
128
                                               ' %(levelname)s:'
 
129
                                               ' %(message)s'))
 
130
        logger.addHandler(console)
 
131
    logger.setLevel(level)
 
132
 
 
133
 
 
134
class PGPError(Exception):
 
135
    """Exception if encryption/decryption fails"""
 
136
    pass
 
137
 
 
138
 
 
139
class PGPEngine(object):
 
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
141
    def __init__(self):
 
142
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
143
        self.gnupgargs = ['--batch',
 
144
                          '--home', self.tempdir,
 
145
                          '--force-mdc',
 
146
                          '--quiet',
 
147
                          '--no-use-agent']
 
148
    
 
149
    def __enter__(self):
 
150
        return self
 
151
    
 
152
    def __exit__(self, exc_type, exc_value, traceback):
 
153
        self._cleanup()
 
154
        return False
 
155
    
 
156
    def __del__(self):
 
157
        self._cleanup()
 
158
    
 
159
    def _cleanup(self):
 
160
        if self.tempdir is not None:
 
161
            # Delete contents of tempdir
 
162
            for root, dirs, files in os.walk(self.tempdir,
 
163
                                             topdown = False):
 
164
                for filename in files:
 
165
                    os.remove(os.path.join(root, filename))
 
166
                for dirname in dirs:
 
167
                    os.rmdir(os.path.join(root, dirname))
 
168
            # Remove tempdir
 
169
            os.rmdir(self.tempdir)
 
170
            self.tempdir = None
 
171
    
 
172
    def password_encode(self, password):
 
173
        # Passphrase can not be empty and can not contain newlines or
 
174
        # NUL bytes.  So we prefix it and hex encode it.
 
175
        return b"mandos" + binascii.hexlify(password)
 
176
    
 
177
    def encrypt(self, data, password):
 
178
        passphrase = self.password_encode(password)
 
179
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
180
                                         ) as passfile:
 
181
            passfile.write(passphrase)
 
182
            passfile.flush()
 
183
            proc = subprocess.Popen(['gpg', '--symmetric',
 
184
                                     '--passphrase-file',
 
185
                                     passfile.name]
 
186
                                    + self.gnupgargs,
 
187
                                    stdin = subprocess.PIPE,
 
188
                                    stdout = subprocess.PIPE,
 
189
                                    stderr = subprocess.PIPE)
 
190
            ciphertext, err = proc.communicate(input = data)
 
191
        if proc.returncode != 0:
 
192
            raise PGPError(err)
 
193
        return ciphertext
 
194
    
 
195
    def decrypt(self, data, password):
 
196
        passphrase = self.password_encode(password)
 
197
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
198
                                         ) as passfile:
 
199
            passfile.write(passphrase)
 
200
            passfile.flush()
 
201
            proc = subprocess.Popen(['gpg', '--decrypt',
 
202
                                     '--passphrase-file',
 
203
                                     passfile.name]
 
204
                                    + self.gnupgargs,
 
205
                                    stdin = subprocess.PIPE,
 
206
                                    stdout = subprocess.PIPE,
 
207
                                    stderr = subprocess.PIPE)
 
208
            decrypted_plaintext, err = proc.communicate(input
 
209
                                                        = data)
 
210
        if proc.returncode != 0:
 
211
            raise PGPError(err)
 
212
        return decrypted_plaintext
107
213
 
108
214
 
109
215
class AvahiError(Exception):
128
234
               Used to optionally bind to the specified interface.
129
235
    name: string; Example: 'Mandos'
130
236
    type: string; Example: '_mandos._tcp'.
131
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
237
     See <https://www.iana.org/assignments/service-names-port-numbers>
132
238
    port: integer; what port to announce
133
239
    TXT: list of strings; TXT record for the service
134
240
    domain: string; Domain to publish on, default to .local if empty.
140
246
    server: D-Bus Server
141
247
    bus: dbus.SystemBus()
142
248
    """
 
249
    
143
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
144
251
                 servicetype = None, port = None, TXT = None,
145
252
                 domain = "", host = "", max_renames = 32768,
158
265
        self.server = None
159
266
        self.bus = bus
160
267
        self.entry_group_state_changed_match = None
 
268
    
161
269
    def rename(self):
162
270
        """Derived from the Avahi example code"""
163
271
        if self.rename_count >= self.max_renames:
173
281
        try:
174
282
            self.add()
175
283
        except dbus.exceptions.DBusException as error:
176
 
            logger.critical("DBusException: %s", error)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
177
285
            self.cleanup()
178
286
            os._exit(1)
179
287
        self.rename_count += 1
 
288
    
180
289
    def remove(self):
181
290
        """Derived from the Avahi example code"""
182
291
        if self.entry_group_state_changed_match is not None:
184
293
            self.entry_group_state_changed_match = None
185
294
        if self.group is not None:
186
295
            self.group.Reset()
 
296
    
187
297
    def add(self):
188
298
        """Derived from the Avahi example code"""
189
299
        self.remove()
206
316
            dbus.UInt16(self.port),
207
317
            avahi.string_array_to_txt_array(self.TXT))
208
318
        self.group.Commit()
 
319
    
209
320
    def entry_group_state_changed(self, state, error):
210
321
        """Derived from the Avahi example code"""
211
322
        logger.debug("Avahi entry group state change: %i", state)
218
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
219
330
            logger.critical("Avahi: Error in group state changed %s",
220
331
                            unicode(error))
221
 
            raise AvahiGroupError("State changed: %s"
222
 
                                  % unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
 
334
    
223
335
    def cleanup(self):
224
336
        """Derived from the Avahi example code"""
225
337
        if self.group is not None:
226
338
            try:
227
339
                self.group.Free()
228
340
            except (dbus.exceptions.UnknownMethodException,
229
 
                    dbus.exceptions.DBusException) as e:
 
341
                    dbus.exceptions.DBusException):
230
342
                pass
231
343
            self.group = None
232
344
        self.remove()
 
345
    
233
346
    def server_state_changed(self, state, error=None):
234
347
        """Derived from the Avahi example code"""
235
348
        logger.debug("Avahi server state change: %i", state)
254
367
                logger.debug("Unknown state: %r", state)
255
368
            else:
256
369
                logger.debug("Unknown state: %r: %r", state, error)
 
370
    
257
371
    def activate(self):
258
372
        """Derived from the Avahi example code"""
259
373
        if self.server is None:
266
380
                                 self.server_state_changed)
267
381
        self.server_state_changed(self.server.GetState())
268
382
 
 
383
 
269
384
class AvahiServiceToSyslog(AvahiService):
270
385
    def rename(self):
271
386
        """Add the new name to the syslog messages"""
272
387
        ret = AvahiService.rename(self)
273
388
        syslogger.setFormatter(logging.Formatter
274
 
                               ('Mandos (%s) [%%(process)d]:'
275
 
                                ' %%(levelname)s: %%(message)s'
276
 
                                % self.name))
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
277
392
        return ret
278
393
 
279
 
def _timedelta_to_milliseconds(td):
 
394
 
 
395
def timedelta_to_milliseconds(td):
280
396
    "Convert a datetime.timedelta() to milliseconds"
281
397
    return ((td.days * 24 * 60 * 60 * 1000)
282
398
            + (td.seconds * 1000)
283
399
            + (td.microseconds // 1000))
284
 
        
 
400
 
 
401
 
285
402
class Client(object):
286
403
    """A representation of a client host served by this server.
287
404
    
288
405
    Attributes:
289
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
406
    approved:   bool(); 'None' if not yet approved/disapproved
290
407
    approval_delay: datetime.timedelta(); Time to wait for approval
291
408
    approval_duration: datetime.timedelta(); Duration of one approval
292
409
    checker:    subprocess.Popen(); a running checker process used
310
427
    interval:   datetime.timedelta(); How often to start a new checker
311
428
    last_approval_request: datetime.datetime(); (UTC) or None
312
429
    last_checked_ok: datetime.datetime(); (UTC) or None
313
 
    last_checker_status: integer between 0 and 255 reflecting exit status
314
 
                         of last checker. -1 reflect crashed checker,
315
 
                         or None.
316
 
    last_enabled: datetime.datetime(); (UTC)
 
430
    last_checker_status: integer between 0 and 255 reflecting exit
 
431
                         status of last checker. -1 reflects crashed
 
432
                         checker, -2 means no checker completed yet.
 
433
    last_enabled: datetime.datetime(); (UTC) or None
317
434
    name:       string; from the config file, used in log messages and
318
435
                        D-Bus identifiers
319
436
    secret:     bytestring; sent verbatim (over TLS) to client
320
437
    timeout:    datetime.timedelta(); How long from last_checked_ok
321
438
                                      until this client is disabled
322
 
    extended_timeout:   extra long timeout when password has been sent
 
439
    extended_timeout:   extra long timeout when secret has been sent
323
440
    runtime_expansions: Allowed attributes for runtime expansion.
324
441
    expires:    datetime.datetime(); time (UTC) when a client will be
325
442
                disabled, or None
 
443
    server_settings: The server_settings dict from main()
326
444
    """
327
445
    
328
446
    runtime_expansions = ("approval_delay", "approval_duration",
329
 
                          "created", "enabled", "fingerprint",
330
 
                          "host", "interval", "last_checked_ok",
 
447
                          "created", "enabled", "expires",
 
448
                          "fingerprint", "host", "interval",
 
449
                          "last_approval_request", "last_checked_ok",
331
450
                          "last_enabled", "name", "timeout")
 
451
    client_defaults = { "timeout": "PT5M",
 
452
                        "extended_timeout": "PT15M",
 
453
                        "interval": "PT2M",
 
454
                        "checker": "fping -q -- %%(host)s",
 
455
                        "host": "",
 
456
                        "approval_delay": "PT0S",
 
457
                        "approval_duration": "PT1S",
 
458
                        "approved_by_default": "True",
 
459
                        "enabled": "True",
 
460
                        }
332
461
    
333
462
    def timeout_milliseconds(self):
334
463
        "Return the 'timeout' attribute in milliseconds"
335
 
        return _timedelta_to_milliseconds(self.timeout)
 
464
        return timedelta_to_milliseconds(self.timeout)
336
465
    
337
466
    def extended_timeout_milliseconds(self):
338
467
        "Return the 'extended_timeout' attribute in milliseconds"
339
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
468
        return timedelta_to_milliseconds(self.extended_timeout)
340
469
    
341
470
    def interval_milliseconds(self):
342
471
        "Return the 'interval' attribute in milliseconds"
343
 
        return _timedelta_to_milliseconds(self.interval)
 
472
        return timedelta_to_milliseconds(self.interval)
344
473
    
345
474
    def approval_delay_milliseconds(self):
346
 
        return _timedelta_to_milliseconds(self.approval_delay)
347
 
    
348
 
    def __init__(self, name = None, config=None):
349
 
        """Note: the 'checker' key in 'config' sets the
350
 
        'checker_command' attribute and *not* the 'checker'
351
 
        attribute."""
 
475
        return timedelta_to_milliseconds(self.approval_delay)
 
476
    
 
477
    @staticmethod
 
478
    def config_parser(config):
 
479
        """Construct a new dict of client settings of this form:
 
480
        { client_name: {setting_name: value, ...}, ...}
 
481
        with exceptions for any special settings as defined above.
 
482
        NOTE: Must be a pure function. Must return the same result
 
483
        value given the same arguments.
 
484
        """
 
485
        settings = {}
 
486
        for client_name in config.sections():
 
487
            section = dict(config.items(client_name))
 
488
            client = settings[client_name] = {}
 
489
            
 
490
            client["host"] = section["host"]
 
491
            # Reformat values from string types to Python types
 
492
            client["approved_by_default"] = config.getboolean(
 
493
                client_name, "approved_by_default")
 
494
            client["enabled"] = config.getboolean(client_name,
 
495
                                                  "enabled")
 
496
            
 
497
            client["fingerprint"] = (section["fingerprint"].upper()
 
498
                                     .replace(" ", ""))
 
499
            if "secret" in section:
 
500
                client["secret"] = section["secret"].decode("base64")
 
501
            elif "secfile" in section:
 
502
                with open(os.path.expanduser(os.path.expandvars
 
503
                                             (section["secfile"])),
 
504
                          "rb") as secfile:
 
505
                    client["secret"] = secfile.read()
 
506
            else:
 
507
                raise TypeError("No secret or secfile for section {0}"
 
508
                                .format(section))
 
509
            client["timeout"] = string_to_delta(section["timeout"])
 
510
            client["extended_timeout"] = string_to_delta(
 
511
                section["extended_timeout"])
 
512
            client["interval"] = string_to_delta(section["interval"])
 
513
            client["approval_delay"] = string_to_delta(
 
514
                section["approval_delay"])
 
515
            client["approval_duration"] = string_to_delta(
 
516
                section["approval_duration"])
 
517
            client["checker_command"] = section["checker"]
 
518
            client["last_approval_request"] = None
 
519
            client["last_checked_ok"] = None
 
520
            client["last_checker_status"] = -2
 
521
        
 
522
        return settings
 
523
    
 
524
    def __init__(self, settings, name = None, server_settings=None):
352
525
        self.name = name
353
 
        if config is None:
354
 
            config = {}
 
526
        if server_settings is None:
 
527
            server_settings = {}
 
528
        self.server_settings = server_settings
 
529
        # adding all client settings
 
530
        for setting, value in settings.iteritems():
 
531
            setattr(self, setting, value)
 
532
        
 
533
        if self.enabled:
 
534
            if not hasattr(self, "last_enabled"):
 
535
                self.last_enabled = datetime.datetime.utcnow()
 
536
            if not hasattr(self, "expires"):
 
537
                self.expires = (datetime.datetime.utcnow()
 
538
                                + self.timeout)
 
539
        else:
 
540
            self.last_enabled = None
 
541
            self.expires = None
 
542
        
355
543
        logger.debug("Creating client %r", self.name)
356
544
        # Uppercase and remove spaces from fingerprint for later
357
545
        # comparison purposes with return value from the fingerprint()
358
546
        # function
359
 
        self.fingerprint = (config["fingerprint"].upper()
360
 
                            .replace(" ", ""))
361
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
362
 
        if "secret" in config:
363
 
            self.secret = config["secret"].decode("base64")
364
 
        elif "secfile" in config:
365
 
            with open(os.path.expanduser(os.path.expandvars
366
 
                                         (config["secfile"])),
367
 
                      "rb") as secfile:
368
 
                self.secret = secfile.read()
369
 
        else:
370
 
            raise TypeError("No secret or secfile for client %s"
371
 
                            % self.name)
372
 
        self.host = config.get("host", "")
373
 
        self.created = datetime.datetime.utcnow()
374
 
        self.enabled = True
375
 
        self.last_approval_request = None
376
 
        self.last_enabled = datetime.datetime.utcnow()
377
 
        self.last_checked_ok = None
378
 
        self.last_checker_status = None
379
 
        self.timeout = string_to_delta(config["timeout"])
380
 
        self.extended_timeout = string_to_delta(config
381
 
                                                ["extended_timeout"])
382
 
        self.interval = string_to_delta(config["interval"])
 
548
        self.created = settings.get("created",
 
549
                                    datetime.datetime.utcnow())
 
550
        
 
551
        # attributes specific for this server instance
383
552
        self.checker = None
384
553
        self.checker_initiator_tag = None
385
554
        self.disable_initiator_tag = None
386
 
        self.expires = datetime.datetime.utcnow() + self.timeout
387
555
        self.checker_callback_tag = None
388
 
        self.checker_command = config["checker"]
389
556
        self.current_checker_command = None
390
 
        self._approved = None
391
 
        self.approved_by_default = config.get("approved_by_default",
392
 
                                              True)
 
557
        self.approved = None
393
558
        self.approvals_pending = 0
394
 
        self.approval_delay = string_to_delta(
395
 
            config["approval_delay"])
396
 
        self.approval_duration = string_to_delta(
397
 
            config["approval_duration"])
398
559
        self.changedstate = (multiprocessing_manager
399
560
                             .Condition(multiprocessing_manager
400
561
                                        .Lock()))
401
 
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
 
562
        self.client_structure = [attr for attr in
 
563
                                 self.__dict__.iterkeys()
 
564
                                 if not attr.startswith("_")]
402
565
        self.client_structure.append("client_structure")
403
 
 
404
 
 
 
566
        
405
567
        for name, t in inspect.getmembers(type(self),
406
 
                                          lambda obj: isinstance(obj, property)):
 
568
                                          lambda obj:
 
569
                                              isinstance(obj,
 
570
                                                         property)):
407
571
            if not name.startswith("_"):
408
572
                self.client_structure.append(name)
409
573
    
417
581
        if getattr(self, "enabled", False):
418
582
            # Already enabled
419
583
            return
420
 
        self.send_changedstate()
421
584
        self.expires = datetime.datetime.utcnow() + self.timeout
422
585
        self.enabled = True
423
586
        self.last_enabled = datetime.datetime.utcnow()
424
587
        self.init_checker()
 
588
        self.send_changedstate()
425
589
    
426
590
    def disable(self, quiet=True):
427
591
        """Disable this client."""
428
592
        if not getattr(self, "enabled", False):
429
593
            return False
430
594
        if not quiet:
431
 
            self.send_changedstate()
432
 
        if not quiet:
433
595
            logger.info("Disabling client %s", self.name)
434
 
        if getattr(self, "disable_initiator_tag", False):
 
596
        if getattr(self, "disable_initiator_tag", None) is not None:
435
597
            gobject.source_remove(self.disable_initiator_tag)
436
598
            self.disable_initiator_tag = None
437
599
        self.expires = None
438
 
        if getattr(self, "checker_initiator_tag", False):
 
600
        if getattr(self, "checker_initiator_tag", None) is not None:
439
601
            gobject.source_remove(self.checker_initiator_tag)
440
602
            self.checker_initiator_tag = None
441
603
        self.stop_checker()
442
604
        self.enabled = False
 
605
        if not quiet:
 
606
            self.send_changedstate()
443
607
        # Do not run this again if called by a gobject.timeout_add
444
608
        return False
445
609
    
446
610
    def __del__(self):
447
611
        self.disable()
448
 
 
 
612
    
449
613
    def init_checker(self):
450
614
        # Schedule a new checker to be started an 'interval' from now,
451
615
        # and every interval from then on.
 
616
        if self.checker_initiator_tag is not None:
 
617
            gobject.source_remove(self.checker_initiator_tag)
452
618
        self.checker_initiator_tag = (gobject.timeout_add
453
619
                                      (self.interval_milliseconds(),
454
620
                                       self.start_checker))
455
621
        # Schedule a disable() when 'timeout' has passed
 
622
        if self.disable_initiator_tag is not None:
 
623
            gobject.source_remove(self.disable_initiator_tag)
456
624
        self.disable_initiator_tag = (gobject.timeout_add
457
625
                                   (self.timeout_milliseconds(),
458
626
                                    self.disable))
459
627
        # Also start a new checker *right now*.
460
628
        self.start_checker()
461
 
 
462
 
        
 
629
    
463
630
    def checker_callback(self, pid, condition, command):
464
631
        """The checker has completed, so take appropriate actions."""
465
632
        self.checker_callback_tag = None
466
633
        self.checker = None
467
634
        if os.WIFEXITED(condition):
468
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
635
            self.last_checker_status = os.WEXITSTATUS(condition)
469
636
            if self.last_checker_status == 0:
470
637
                logger.info("Checker for %(name)s succeeded",
471
638
                            vars(self))
478
645
            logger.warning("Checker for %(name)s crashed?",
479
646
                           vars(self))
480
647
    
481
 
    def checked_ok(self, timeout=None):
482
 
        """Bump up the timeout for this client.
483
 
        
484
 
        This should only be called when the client has been seen,
485
 
        alive and well.
486
 
        """
 
648
    def checked_ok(self):
 
649
        """Assert that the client has been seen, alive and well."""
 
650
        self.last_checked_ok = datetime.datetime.utcnow()
 
651
        self.last_checker_status = 0
 
652
        self.bump_timeout()
 
653
    
 
654
    def bump_timeout(self, timeout=None):
 
655
        """Bump up the timeout for this client."""
487
656
        if timeout is None:
488
657
            timeout = self.timeout
489
 
        self.last_checked_ok = datetime.datetime.utcnow()
490
658
        if self.disable_initiator_tag is not None:
491
659
            gobject.source_remove(self.disable_initiator_tag)
 
660
            self.disable_initiator_tag = None
492
661
        if getattr(self, "enabled", False):
493
662
            self.disable_initiator_tag = (gobject.timeout_add
494
 
                                          (_timedelta_to_milliseconds
 
663
                                          (timedelta_to_milliseconds
495
664
                                           (timeout), self.disable))
496
665
            self.expires = datetime.datetime.utcnow() + timeout
497
666
    
504
673
        If a checker already exists, leave it running and do
505
674
        nothing."""
506
675
        # The reason for not killing a running checker is that if we
507
 
        # did that, then if a checker (for some reason) started
508
 
        # running slowly and taking more than 'interval' time, the
509
 
        # client would inevitably timeout, since no checker would get
510
 
        # a chance to run to completion.  If we instead leave running
 
676
        # did that, and if a checker (for some reason) started running
 
677
        # slowly and taking more than 'interval' time, then the client
 
678
        # would inevitably timeout, since no checker would get a
 
679
        # chance to run to completion.  If we instead leave running
511
680
        # checkers alone, the checker would have to take more time
512
681
        # than 'timeout' for the client to be disabled, which is as it
513
682
        # should be.
527
696
                                      self.current_checker_command)
528
697
        # Start a new checker if needed
529
698
        if self.checker is None:
 
699
            # Escape attributes for the shell
 
700
            escaped_attrs = dict(
 
701
                (attr, re.escape(unicode(getattr(self, attr))))
 
702
                for attr in
 
703
                self.runtime_expansions)
530
704
            try:
531
 
                # In case checker_command has exactly one % operator
532
 
                command = self.checker_command % self.host
533
 
            except TypeError:
534
 
                # Escape attributes for the shell
535
 
                escaped_attrs = dict(
536
 
                    (attr,
537
 
                     re.escape(unicode(str(getattr(self, attr, "")),
538
 
                                       errors=
539
 
                                       'replace')))
540
 
                    for attr in
541
 
                    self.runtime_expansions)
542
 
                
543
 
                try:
544
 
                    command = self.checker_command % escaped_attrs
545
 
                except TypeError as error:
546
 
                    logger.error('Could not format string "%s":'
547
 
                                 ' %s', self.checker_command, error)
548
 
                    return True # Try again later
 
705
                command = self.checker_command % escaped_attrs
 
706
            except TypeError as error:
 
707
                logger.error('Could not format string "%s"',
 
708
                             self.checker_command, exc_info=error)
 
709
                return True # Try again later
549
710
            self.current_checker_command = command
550
711
            try:
551
712
                logger.info("Starting checker %r for %s",
554
715
                # in normal mode, that is already done by daemon(),
555
716
                # and in debug mode we don't want to.  (Stdin is
556
717
                # always replaced by /dev/null.)
 
718
                # The exception is when not debugging but nevertheless
 
719
                # running in the foreground; use the previously
 
720
                # created wnull.
 
721
                popen_args = {}
 
722
                if (not self.server_settings["debug"]
 
723
                    and self.server_settings["foreground"]):
 
724
                    popen_args.update({"stdout": wnull,
 
725
                                       "stderr": wnull })
557
726
                self.checker = subprocess.Popen(command,
558
727
                                                close_fds=True,
559
 
                                                shell=True, cwd="/")
560
 
                self.checker_callback_tag = (gobject.child_watch_add
561
 
                                             (self.checker.pid,
562
 
                                              self.checker_callback,
563
 
                                              data=command))
564
 
                # The checker may have completed before the gobject
565
 
                # watch was added.  Check for this.
 
728
                                                shell=True, cwd="/",
 
729
                                                **popen_args)
 
730
            except OSError as error:
 
731
                logger.error("Failed to start subprocess",
 
732
                             exc_info=error)
 
733
                return True
 
734
            self.checker_callback_tag = (gobject.child_watch_add
 
735
                                         (self.checker.pid,
 
736
                                          self.checker_callback,
 
737
                                          data=command))
 
738
            # The checker may have completed before the gobject
 
739
            # watch was added.  Check for this.
 
740
            try:
566
741
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
567
 
                if pid:
568
 
                    gobject.source_remove(self.checker_callback_tag)
569
 
                    self.checker_callback(pid, status, command)
570
742
            except OSError as error:
571
 
                logger.error("Failed to start subprocess: %s",
572
 
                             error)
 
743
                if error.errno == errno.ECHILD:
 
744
                    # This should never happen
 
745
                    logger.error("Child process vanished",
 
746
                                 exc_info=error)
 
747
                    return True
 
748
                raise
 
749
            if pid:
 
750
                gobject.source_remove(self.checker_callback_tag)
 
751
                self.checker_callback(pid, status, command)
573
752
        # Re-run this periodically if run by gobject.timeout_add
574
753
        return True
575
754
    
582
761
            return
583
762
        logger.debug("Stopping checker for %(name)s", vars(self))
584
763
        try:
585
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
764
            self.checker.terminate()
586
765
            #time.sleep(0.5)
587
766
            #if self.checker.poll() is None:
588
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
767
            #    self.checker.kill()
589
768
        except OSError as error:
590
769
            if error.errno != errno.ESRCH: # No such process
591
770
                raise
592
771
        self.checker = None
593
772
 
594
 
    # Encrypts a client secret and stores it in a varible encrypted_secret
595
 
    def encrypt_secret(self, key):
596
 
        # Encryption-key need to be of a specific size, so we hash inputed key
597
 
        hasheng = hashlib.sha256()
598
 
        hasheng.update(key)
599
 
        encryptionkey = hasheng.digest()
600
 
 
601
 
        # Create validation hash so we know at decryption if it was sucessful
602
 
        hasheng = hashlib.sha256()
603
 
        hasheng.update(self.secret)
604
 
        validationhash = hasheng.digest()
605
 
 
606
 
        # Encrypt secret
607
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
608
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
609
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
610
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
611
 
        self.encrypted_secret = (ciphertext, iv)
612
 
 
613
 
    # Decrypt a encrypted client secret
614
 
    def decrypt_secret(self, key):
615
 
        # Decryption-key need to be of a specific size, so we hash inputed key
616
 
        hasheng = hashlib.sha256()
617
 
        hasheng.update(key)
618
 
        encryptionkey = hasheng.digest()
619
 
 
620
 
        # Decrypt encrypted secret
621
 
        ciphertext, iv = self.encrypted_secret
622
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
623
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
624
 
        plain = ciphereng.decrypt(ciphertext)
625
 
 
626
 
        # Validate decrypted secret to know if it was succesful
627
 
        hasheng = hashlib.sha256()
628
 
        validationhash = plain[:hasheng.digest_size]
629
 
        secret = plain[hasheng.digest_size:]
630
 
        hasheng.update(secret)
631
 
 
632
 
        # if validation fails, we use key as new secret. Otherwhise, we use
633
 
        # the decrypted secret
634
 
        if hasheng.digest() == validationhash:
635
 
            self.secret = secret
636
 
        else:
637
 
            self.secret = key
638
 
        del self.encrypted_secret
639
 
 
640
773
 
641
774
def dbus_service_property(dbus_interface, signature="v",
642
775
                          access="readwrite", byte_arrays=False):
654
787
    # "Set" method, so we fail early here:
655
788
    if byte_arrays and signature != "ay":
656
789
        raise ValueError("Byte arrays not supported for non-'ay'"
657
 
                         " signature %r" % signature)
 
790
                         " signature {0!r}".format(signature))
658
791
    def decorator(func):
659
792
        func._dbus_is_property = True
660
793
        func._dbus_interface = dbus_interface
668
801
    return decorator
669
802
 
670
803
 
 
804
def dbus_interface_annotations(dbus_interface):
 
805
    """Decorator for marking functions returning interface annotations
 
806
    
 
807
    Usage:
 
808
    
 
809
    @dbus_interface_annotations("org.example.Interface")
 
810
    def _foo(self):  # Function name does not matter
 
811
        return {"org.freedesktop.DBus.Deprecated": "true",
 
812
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
813
                    "false"}
 
814
    """
 
815
    def decorator(func):
 
816
        func._dbus_is_interface = True
 
817
        func._dbus_interface = dbus_interface
 
818
        func._dbus_name = dbus_interface
 
819
        return func
 
820
    return decorator
 
821
 
 
822
 
 
823
def dbus_annotations(annotations):
 
824
    """Decorator to annotate D-Bus methods, signals or properties
 
825
    Usage:
 
826
    
 
827
    @dbus_service_property("org.example.Interface", signature="b",
 
828
                           access="r")
 
829
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
830
                        "org.freedesktop.DBus.Property."
 
831
                        "EmitsChangedSignal": "false"})
 
832
    def Property_dbus_property(self):
 
833
        return dbus.Boolean(False)
 
834
    """
 
835
    def decorator(func):
 
836
        func._dbus_annotations = annotations
 
837
        return func
 
838
    return decorator
 
839
 
 
840
 
671
841
class DBusPropertyException(dbus.exceptions.DBusException):
672
842
    """A base class for D-Bus property-related exceptions
673
843
    """
696
866
    """
697
867
    
698
868
    @staticmethod
699
 
    def _is_dbus_property(obj):
700
 
        return getattr(obj, "_dbus_is_property", False)
 
869
    def _is_dbus_thing(thing):
 
870
        """Returns a function testing if an attribute is a D-Bus thing
 
871
        
 
872
        If called like _is_dbus_thing("method") it returns a function
 
873
        suitable for use as predicate to inspect.getmembers().
 
874
        """
 
875
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
876
                                   False)
701
877
    
702
 
    def _get_all_dbus_properties(self):
 
878
    def _get_all_dbus_things(self, thing):
703
879
        """Returns a generator of (name, attribute) pairs
704
880
        """
705
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
881
        return ((getattr(athing.__get__(self), "_dbus_name",
 
882
                         name),
 
883
                 athing.__get__(self))
706
884
                for cls in self.__class__.__mro__
707
 
                for name, prop in
708
 
                inspect.getmembers(cls, self._is_dbus_property))
 
885
                for name, athing in
 
886
                inspect.getmembers(cls,
 
887
                                   self._is_dbus_thing(thing)))
709
888
    
710
889
    def _get_dbus_property(self, interface_name, property_name):
711
890
        """Returns a bound method if one exists which is a D-Bus
713
892
        """
714
893
        for cls in  self.__class__.__mro__:
715
894
            for name, value in (inspect.getmembers
716
 
                                (cls, self._is_dbus_property)):
 
895
                                (cls,
 
896
                                 self._is_dbus_thing("property"))):
717
897
                if (value._dbus_name == property_name
718
898
                    and value._dbus_interface == interface_name):
719
899
                    return value.__get__(self)
748
928
            # signatures other than "ay".
749
929
            if prop._dbus_signature != "ay":
750
930
                raise ValueError
751
 
            value = dbus.ByteArray(''.join(unichr(byte)
752
 
                                           for byte in value))
 
931
            value = dbus.ByteArray(b''.join(chr(byte)
 
932
                                            for byte in value))
753
933
        prop(value)
754
934
    
755
935
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
760
940
        
761
941
        Note: Will not include properties with access="write".
762
942
        """
763
 
        all = {}
764
 
        for name, prop in self._get_all_dbus_properties():
 
943
        properties = {}
 
944
        for name, prop in self._get_all_dbus_things("property"):
765
945
            if (interface_name
766
946
                and interface_name != prop._dbus_interface):
767
947
                # Interface non-empty but did not match
771
951
                continue
772
952
            value = prop()
773
953
            if not hasattr(value, "variant_level"):
774
 
                all[name] = value
 
954
                properties[name] = value
775
955
                continue
776
 
            all[name] = type(value)(value, variant_level=
777
 
                                    value.variant_level+1)
778
 
        return dbus.Dictionary(all, signature="sv")
 
956
            properties[name] = type(value)(value, variant_level=
 
957
                                           value.variant_level+1)
 
958
        return dbus.Dictionary(properties, signature="sv")
779
959
    
780
960
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
781
961
                         out_signature="s",
782
962
                         path_keyword='object_path',
783
963
                         connection_keyword='connection')
784
964
    def Introspect(self, object_path, connection):
785
 
        """Standard D-Bus method, overloaded to insert property tags.
 
965
        """Overloading of standard D-Bus method.
 
966
        
 
967
        Inserts property tags and interface annotation tags.
786
968
        """
787
969
        xmlstring = dbus.service.Object.Introspect(self, object_path,
788
970
                                                   connection)
795
977
                e.setAttribute("access", prop._dbus_access)
796
978
                return e
797
979
            for if_tag in document.getElementsByTagName("interface"):
 
980
                # Add property tags
798
981
                for tag in (make_tag(document, name, prop)
799
982
                            for name, prop
800
 
                            in self._get_all_dbus_properties()
 
983
                            in self._get_all_dbus_things("property")
801
984
                            if prop._dbus_interface
802
985
                            == if_tag.getAttribute("name")):
803
986
                    if_tag.appendChild(tag)
 
987
                # Add annotation tags
 
988
                for typ in ("method", "signal", "property"):
 
989
                    for tag in if_tag.getElementsByTagName(typ):
 
990
                        annots = dict()
 
991
                        for name, prop in (self.
 
992
                                           _get_all_dbus_things(typ)):
 
993
                            if (name == tag.getAttribute("name")
 
994
                                and prop._dbus_interface
 
995
                                == if_tag.getAttribute("name")):
 
996
                                annots.update(getattr
 
997
                                              (prop,
 
998
                                               "_dbus_annotations",
 
999
                                               {}))
 
1000
                        for name, value in annots.iteritems():
 
1001
                            ann_tag = document.createElement(
 
1002
                                "annotation")
 
1003
                            ann_tag.setAttribute("name", name)
 
1004
                            ann_tag.setAttribute("value", value)
 
1005
                            tag.appendChild(ann_tag)
 
1006
                # Add interface annotation tags
 
1007
                for annotation, value in dict(
 
1008
                    itertools.chain.from_iterable(
 
1009
                        annotations().iteritems()
 
1010
                        for name, annotations in
 
1011
                        self._get_all_dbus_things("interface")
 
1012
                        if name == if_tag.getAttribute("name")
 
1013
                        )).iteritems():
 
1014
                    ann_tag = document.createElement("annotation")
 
1015
                    ann_tag.setAttribute("name", annotation)
 
1016
                    ann_tag.setAttribute("value", value)
 
1017
                    if_tag.appendChild(ann_tag)
804
1018
                # Add the names to the return values for the
805
1019
                # "org.freedesktop.DBus.Properties" methods
806
1020
                if (if_tag.getAttribute("name")
821
1035
        except (AttributeError, xml.dom.DOMException,
822
1036
                xml.parsers.expat.ExpatError) as error:
823
1037
            logger.error("Failed to override Introspection method",
824
 
                         error)
 
1038
                         exc_info=error)
825
1039
        return xmlstring
826
1040
 
827
1041
 
828
 
def datetime_to_dbus (dt, variant_level=0):
 
1042
def datetime_to_dbus(dt, variant_level=0):
829
1043
    """Convert a UTC datetime.datetime() to a D-Bus type."""
830
1044
    if dt is None:
831
1045
        return dbus.String("", variant_level = variant_level)
832
1046
    return dbus.String(dt.isoformat(),
833
1047
                       variant_level=variant_level)
834
1048
 
835
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
836
 
                                  .__metaclass__):
837
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
838
 
    will add additional D-Bus attributes matching a certain pattern.
 
1049
 
 
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1051
    """A class decorator; applied to a subclass of
 
1052
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1053
    interface names according to the "alt_interface_names" mapping.
 
1054
    Usage:
 
1055
    
 
1056
    @alternate_dbus_interfaces({"org.example.Interface":
 
1057
                                    "net.example.AlternateInterface"})
 
1058
    class SampleDBusObject(dbus.service.Object):
 
1059
        @dbus.service.method("org.example.Interface")
 
1060
        def SampleDBusMethod():
 
1061
            pass
 
1062
    
 
1063
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1064
    reachable via two interfaces: "org.example.Interface" and
 
1065
    "net.example.AlternateInterface", the latter of which will have
 
1066
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1067
    "true", unless "deprecate" is passed with a False value.
 
1068
    
 
1069
    This works for methods and signals, and also for D-Bus properties
 
1070
    (from DBusObjectWithProperties) and interfaces (from the
 
1071
    dbus_interface_annotations decorator).
839
1072
    """
840
 
    def __new__(mcs, name, bases, attr):
841
 
        # Go through all the base classes which could have D-Bus
842
 
        # methods, signals, or properties in them
843
 
        for base in (b for b in bases
844
 
                     if issubclass(b, dbus.service.Object)):
845
 
            # Go though all attributes of the base class
846
 
            for attrname, attribute in inspect.getmembers(base):
 
1073
    def wrapper(cls):
 
1074
        for orig_interface_name, alt_interface_name in (
 
1075
            alt_interface_names.iteritems()):
 
1076
            attr = {}
 
1077
            interface_names = set()
 
1078
            # Go though all attributes of the class
 
1079
            for attrname, attribute in inspect.getmembers(cls):
847
1080
                # Ignore non-D-Bus attributes, and D-Bus attributes
848
1081
                # with the wrong interface name
849
1082
                if (not hasattr(attribute, "_dbus_interface")
850
1083
                    or not attribute._dbus_interface
851
 
                    .startswith("se.recompile.Mandos")):
 
1084
                    .startswith(orig_interface_name)):
852
1085
                    continue
853
1086
                # Create an alternate D-Bus interface name based on
854
1087
                # the current name
855
1088
                alt_interface = (attribute._dbus_interface
856
 
                                 .replace("se.recompile.Mandos",
857
 
                                          "se.bsnet.fukt.Mandos"))
 
1089
                                 .replace(orig_interface_name,
 
1090
                                          alt_interface_name))
 
1091
                interface_names.add(alt_interface)
858
1092
                # Is this a D-Bus signal?
859
1093
                if getattr(attribute, "_dbus_is_signal", False):
860
 
                    # Extract the original non-method function by
861
 
                    # black magic
 
1094
                    # Extract the original non-method undecorated
 
1095
                    # function by black magic
862
1096
                    nonmethod_func = (dict(
863
1097
                            zip(attribute.func_code.co_freevars,
864
1098
                                attribute.__closure__))["func"]
875
1109
                                nonmethod_func.func_name,
876
1110
                                nonmethod_func.func_defaults,
877
1111
                                nonmethod_func.func_closure)))
 
1112
                    # Copy annotations, if any
 
1113
                    try:
 
1114
                        new_function._dbus_annotations = (
 
1115
                            dict(attribute._dbus_annotations))
 
1116
                    except AttributeError:
 
1117
                        pass
878
1118
                    # Define a creator of a function to call both the
879
 
                    # old and new functions, so both the old and new
880
 
                    # signals gets sent when the function is called
 
1119
                    # original and alternate functions, so both the
 
1120
                    # original and alternate signals gets sent when
 
1121
                    # the function is called
881
1122
                    def fixscope(func1, func2):
882
1123
                        """This function is a scope container to pass
883
1124
                        func1 and func2 to the "call_both" function
890
1131
                        return call_both
891
1132
                    # Create the "call_both" function and add it to
892
1133
                    # the class
893
 
                    attr[attrname] = fixscope(attribute,
894
 
                                              new_function)
 
1134
                    attr[attrname] = fixscope(attribute, new_function)
895
1135
                # Is this a D-Bus method?
896
1136
                elif getattr(attribute, "_dbus_is_method", False):
897
1137
                    # Create a new, but exactly alike, function
908
1148
                                        attribute.func_name,
909
1149
                                        attribute.func_defaults,
910
1150
                                        attribute.func_closure)))
 
1151
                    # Copy annotations, if any
 
1152
                    try:
 
1153
                        attr[attrname]._dbus_annotations = (
 
1154
                            dict(attribute._dbus_annotations))
 
1155
                    except AttributeError:
 
1156
                        pass
911
1157
                # Is this a D-Bus property?
912
1158
                elif getattr(attribute, "_dbus_is_property", False):
913
1159
                    # Create a new, but exactly alike, function
927
1173
                                        attribute.func_name,
928
1174
                                        attribute.func_defaults,
929
1175
                                        attribute.func_closure)))
930
 
        return type.__new__(mcs, name, bases, attr)
931
 
 
 
1176
                    # Copy annotations, if any
 
1177
                    try:
 
1178
                        attr[attrname]._dbus_annotations = (
 
1179
                            dict(attribute._dbus_annotations))
 
1180
                    except AttributeError:
 
1181
                        pass
 
1182
                # Is this a D-Bus interface?
 
1183
                elif getattr(attribute, "_dbus_is_interface", False):
 
1184
                    # Create a new, but exactly alike, function
 
1185
                    # object.  Decorate it to be a new D-Bus interface
 
1186
                    # with the alternate D-Bus interface name.  Add it
 
1187
                    # to the class.
 
1188
                    attr[attrname] = (dbus_interface_annotations
 
1189
                                      (alt_interface)
 
1190
                                      (types.FunctionType
 
1191
                                       (attribute.func_code,
 
1192
                                        attribute.func_globals,
 
1193
                                        attribute.func_name,
 
1194
                                        attribute.func_defaults,
 
1195
                                        attribute.func_closure)))
 
1196
            if deprecate:
 
1197
                # Deprecate all alternate interfaces
 
1198
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1199
                for interface_name in interface_names:
 
1200
                    @dbus_interface_annotations(interface_name)
 
1201
                    def func(self):
 
1202
                        return { "org.freedesktop.DBus.Deprecated":
 
1203
                                     "true" }
 
1204
                    # Find an unused name
 
1205
                    for aname in (iname.format(i)
 
1206
                                  for i in itertools.count()):
 
1207
                        if aname not in attr:
 
1208
                            attr[aname] = func
 
1209
                            break
 
1210
            if interface_names:
 
1211
                # Replace the class with a new subclass of it with
 
1212
                # methods, signals, etc. as created above.
 
1213
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1214
                           (cls,), attr)
 
1215
        return cls
 
1216
    return wrapper
 
1217
 
 
1218
 
 
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1220
                                "se.bsnet.fukt.Mandos"})
932
1221
class ClientDBus(Client, DBusObjectWithProperties):
933
1222
    """A Client class using D-Bus
934
1223
    
945
1234
    def __init__(self, bus = None, *args, **kwargs):
946
1235
        self.bus = bus
947
1236
        Client.__init__(self, *args, **kwargs)
948
 
 
949
 
        self._approvals_pending = 0
950
1237
        # Only now, when this client is initialized, can it show up on
951
1238
        # the D-Bus
952
1239
        client_object_name = unicode(self.name).translate(
956
1243
                                 ("/clients/" + client_object_name))
957
1244
        DBusObjectWithProperties.__init__(self, self.bus,
958
1245
                                          self.dbus_object_path)
959
 
        
 
1246
    
960
1247
    def notifychangeproperty(transform_func,
961
1248
                             dbus_name, type_func=lambda x: x,
962
1249
                             variant_level=1):
963
1250
        """ Modify a variable so that it's a property which announces
964
1251
        its changes to DBus.
965
 
 
 
1252
        
966
1253
        transform_fun: Function that takes a value and a variant_level
967
1254
                       and transforms it to a D-Bus type.
968
1255
        dbus_name: D-Bus name of the variable
985
1272
        
986
1273
        return property(lambda self: getattr(self, attrname), setter)
987
1274
    
988
 
    
989
1275
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
990
1276
    approvals_pending = notifychangeproperty(dbus.Boolean,
991
1277
                                             "ApprovalPending",
998
1284
                                       checker is not None)
999
1285
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1000
1286
                                           "LastCheckedOK")
 
1287
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1288
                                               "LastCheckerStatus")
1001
1289
    last_approval_request = notifychangeproperty(
1002
1290
        datetime_to_dbus, "LastApprovalRequest")
1003
1291
    approved_by_default = notifychangeproperty(dbus.Boolean,
1004
1292
                                               "ApprovedByDefault")
1005
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1293
    approval_delay = notifychangeproperty(dbus.UInt64,
1006
1294
                                          "ApprovalDelay",
1007
1295
                                          type_func =
1008
 
                                          _timedelta_to_milliseconds)
 
1296
                                          timedelta_to_milliseconds)
1009
1297
    approval_duration = notifychangeproperty(
1010
 
        dbus.UInt16, "ApprovalDuration",
1011
 
        type_func = _timedelta_to_milliseconds)
 
1298
        dbus.UInt64, "ApprovalDuration",
 
1299
        type_func = timedelta_to_milliseconds)
1012
1300
    host = notifychangeproperty(dbus.String, "Host")
1013
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1301
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1014
1302
                                   type_func =
1015
 
                                   _timedelta_to_milliseconds)
 
1303
                                   timedelta_to_milliseconds)
1016
1304
    extended_timeout = notifychangeproperty(
1017
 
        dbus.UInt16, "ExtendedTimeout",
1018
 
        type_func = _timedelta_to_milliseconds)
1019
 
    interval = notifychangeproperty(dbus.UInt16,
 
1305
        dbus.UInt64, "ExtendedTimeout",
 
1306
        type_func = timedelta_to_milliseconds)
 
1307
    interval = notifychangeproperty(dbus.UInt64,
1020
1308
                                    "Interval",
1021
1309
                                    type_func =
1022
 
                                    _timedelta_to_milliseconds)
 
1310
                                    timedelta_to_milliseconds)
1023
1311
    checker_command = notifychangeproperty(dbus.String, "Checker")
1024
1312
    
1025
1313
    del notifychangeproperty
1067
1355
        return r
1068
1356
    
1069
1357
    def _reset_approved(self):
1070
 
        self._approved = None
 
1358
        self.approved = None
1071
1359
        return False
1072
1360
    
1073
1361
    def approve(self, value=True):
1074
 
        self.send_changedstate()
1075
 
        self._approved = value
1076
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1362
        self.approved = value
 
1363
        gobject.timeout_add(timedelta_to_milliseconds
1077
1364
                            (self.approval_duration),
1078
1365
                            self._reset_approved)
1079
 
    
 
1366
        self.send_changedstate()
1080
1367
    
1081
1368
    ## D-Bus methods, signals & properties
1082
1369
    _interface = "se.recompile.Mandos.Client"
1083
1370
    
 
1371
    ## Interfaces
 
1372
    
 
1373
    @dbus_interface_annotations(_interface)
 
1374
    def _foo(self):
 
1375
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1376
                     "false"}
 
1377
    
1084
1378
    ## Signals
1085
1379
    
1086
1380
    # CheckerCompleted - signal
1122
1416
        "D-Bus signal"
1123
1417
        return self.need_approval()
1124
1418
    
1125
 
    # NeRwequest - signal
1126
 
    @dbus.service.signal(_interface, signature="s")
1127
 
    def NewRequest(self, ip):
1128
 
        """D-Bus signal
1129
 
        Is sent after a client request a password.
1130
 
        """
1131
 
        pass
1132
 
 
1133
1419
    ## Methods
1134
1420
    
1135
1421
    # Approve - method
1193
1479
                           access="readwrite")
1194
1480
    def ApprovalDuration_dbus_property(self, value=None):
1195
1481
        if value is None:       # get
1196
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1482
            return dbus.UInt64(timedelta_to_milliseconds(
1197
1483
                    self.approval_duration))
1198
1484
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1199
1485
    
1213
1499
    def Host_dbus_property(self, value=None):
1214
1500
        if value is None:       # get
1215
1501
            return dbus.String(self.host)
1216
 
        self.host = value
 
1502
        self.host = unicode(value)
1217
1503
    
1218
1504
    # Created - property
1219
1505
    @dbus_service_property(_interface, signature="s", access="read")
1220
1506
    def Created_dbus_property(self):
1221
 
        return dbus.String(datetime_to_dbus(self.created))
 
1507
        return datetime_to_dbus(self.created)
1222
1508
    
1223
1509
    # LastEnabled - property
1224
1510
    @dbus_service_property(_interface, signature="s", access="read")
1245
1531
            return
1246
1532
        return datetime_to_dbus(self.last_checked_ok)
1247
1533
    
 
1534
    # LastCheckerStatus - property
 
1535
    @dbus_service_property(_interface, signature="n",
 
1536
                           access="read")
 
1537
    def LastCheckerStatus_dbus_property(self):
 
1538
        return dbus.Int16(self.last_checker_status)
 
1539
    
1248
1540
    # Expires - property
1249
1541
    @dbus_service_property(_interface, signature="s", access="read")
1250
1542
    def Expires_dbus_property(self):
1261
1553
    def Timeout_dbus_property(self, value=None):
1262
1554
        if value is None:       # get
1263
1555
            return dbus.UInt64(self.timeout_milliseconds())
 
1556
        old_timeout = self.timeout
1264
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
1265
 
        if getattr(self, "disable_initiator_tag", None) is None:
1266
 
            return
1267
 
        # Reschedule timeout
1268
 
        gobject.source_remove(self.disable_initiator_tag)
1269
 
        self.disable_initiator_tag = None
1270
 
        self.expires = None
1271
 
        time_to_die = _timedelta_to_milliseconds((self
1272
 
                                                  .last_checked_ok
1273
 
                                                  + self.timeout)
1274
 
                                                 - datetime.datetime
1275
 
                                                 .utcnow())
1276
 
        if time_to_die <= 0:
1277
 
            # The timeout has passed
1278
 
            self.disable()
1279
 
        else:
1280
 
            self.expires = (datetime.datetime.utcnow()
1281
 
                            + datetime.timedelta(milliseconds =
1282
 
                                                 time_to_die))
1283
 
            self.disable_initiator_tag = (gobject.timeout_add
1284
 
                                          (time_to_die, self.disable))
 
1558
        # Reschedule disabling
 
1559
        if self.enabled:
 
1560
            now = datetime.datetime.utcnow()
 
1561
            self.expires += self.timeout - old_timeout
 
1562
            if self.expires <= now:
 
1563
                # The timeout has passed
 
1564
                self.disable()
 
1565
            else:
 
1566
                if (getattr(self, "disable_initiator_tag", None)
 
1567
                    is None):
 
1568
                    return
 
1569
                gobject.source_remove(self.disable_initiator_tag)
 
1570
                self.disable_initiator_tag = (
 
1571
                    gobject.timeout_add(
 
1572
                        timedelta_to_milliseconds(self.expires - now),
 
1573
                        self.disable))
1285
1574
    
1286
1575
    # ExtendedTimeout - property
1287
1576
    @dbus_service_property(_interface, signature="t",
1300
1589
        self.interval = datetime.timedelta(0, 0, 0, value)
1301
1590
        if getattr(self, "checker_initiator_tag", None) is None:
1302
1591
            return
1303
 
        # Reschedule checker run
1304
 
        gobject.source_remove(self.checker_initiator_tag)
1305
 
        self.checker_initiator_tag = (gobject.timeout_add
1306
 
                                      (value, self.start_checker))
1307
 
        self.start_checker()    # Start one now, too
 
1592
        if self.enabled:
 
1593
            # Reschedule checker run
 
1594
            gobject.source_remove(self.checker_initiator_tag)
 
1595
            self.checker_initiator_tag = (gobject.timeout_add
 
1596
                                          (value, self.start_checker))
 
1597
            self.start_checker()    # Start one now, too
1308
1598
    
1309
1599
    # Checker - property
1310
1600
    @dbus_service_property(_interface, signature="s",
1312
1602
    def Checker_dbus_property(self, value=None):
1313
1603
        if value is None:       # get
1314
1604
            return dbus.String(self.checker_command)
1315
 
        self.checker_command = value
 
1605
        self.checker_command = unicode(value)
1316
1606
    
1317
1607
    # CheckerRunning - property
1318
1608
    @dbus_service_property(_interface, signature="b",
1347
1637
            raise KeyError()
1348
1638
    
1349
1639
    def __getattribute__(self, name):
1350
 
        if(name == '_pipe'):
 
1640
        if name == '_pipe':
1351
1641
            return super(ProxyClient, self).__getattribute__(name)
1352
1642
        self._pipe.send(('getattr', name))
1353
1643
        data = self._pipe.recv()
1360
1650
            return func
1361
1651
    
1362
1652
    def __setattr__(self, name, value):
1363
 
        if(name == '_pipe'):
 
1653
        if name == '_pipe':
1364
1654
            return super(ProxyClient, self).__setattr__(name, value)
1365
1655
        self._pipe.send(('setattr', name, value))
1366
1656
 
1367
 
class ClientDBusTransitional(ClientDBus):
1368
 
    __metaclass__ = AlternateDBusNamesMetaclass
1369
1657
 
1370
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
1371
1659
    """A class to handle client connections.
1433
1721
                    logger.warning("Bad certificate: %s", error)
1434
1722
                    return
1435
1723
                logger.debug("Fingerprint: %s", fpr)
1436
 
                if self.server.use_dbus:
1437
 
                    # Emit D-Bus signal
1438
 
                    client.NewRequest(str(self.client_address))
1439
1724
                
1440
1725
                try:
1441
1726
                    client = ProxyClient(child_pipe, fpr,
1457
1742
                            client.Rejected("Disabled")
1458
1743
                        return
1459
1744
                    
1460
 
                    if client._approved or not client.approval_delay:
 
1745
                    if client.approved or not client.approval_delay:
1461
1746
                        #We are approved or approval is disabled
1462
1747
                        break
1463
 
                    elif client._approved is None:
 
1748
                    elif client.approved is None:
1464
1749
                        logger.info("Client %s needs approval",
1465
1750
                                    client.name)
1466
1751
                        if self.server.use_dbus:
1479
1764
                    #wait until timeout or approved
1480
1765
                    time = datetime.datetime.now()
1481
1766
                    client.changedstate.acquire()
1482
 
                    (client.changedstate.wait
1483
 
                     (float(client._timedelta_to_milliseconds(delay)
1484
 
                            / 1000)))
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1485
1770
                    client.changedstate.release()
1486
1771
                    time2 = datetime.datetime.now()
1487
1772
                    if (time2 - time) >= delay:
1503
1788
                    try:
1504
1789
                        sent = session.send(client.secret[sent_size:])
1505
1790
                    except gnutls.errors.GNUTLSError as error:
1506
 
                        logger.warning("gnutls send failed")
 
1791
                        logger.warning("gnutls send failed",
 
1792
                                       exc_info=error)
1507
1793
                        return
1508
1794
                    logger.debug("Sent: %d, remaining: %d",
1509
1795
                                 sent, len(client.secret)
1512
1798
                
1513
1799
                logger.info("Sending secret to %s", client.name)
1514
1800
                # bump the timeout using extended_timeout
1515
 
                client.checked_ok(client.extended_timeout)
 
1801
                client.bump_timeout(client.extended_timeout)
1516
1802
                if self.server.use_dbus:
1517
1803
                    # Emit D-Bus signal
1518
1804
                    client.GotSecret()
1523
1809
                try:
1524
1810
                    session.bye()
1525
1811
                except gnutls.errors.GNUTLSError as error:
1526
 
                    logger.warning("GnuTLS bye failed")
 
1812
                    logger.warning("GnuTLS bye failed",
 
1813
                                   exc_info=error)
1527
1814
    
1528
1815
    @staticmethod
1529
1816
    def peer_certificate(session):
1585
1872
        # Convert the buffer to a Python bytestring
1586
1873
        fpr = ctypes.string_at(buf, buf_len.value)
1587
1874
        # Convert the bytestring to hexadecimal notation
1588
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1875
        hex_fpr = binascii.hexlify(fpr).upper()
1589
1876
        return hex_fpr
1590
1877
 
1591
1878
 
1594
1881
    def sub_process_main(self, request, address):
1595
1882
        try:
1596
1883
            self.finish_request(request, address)
1597
 
        except:
 
1884
        except Exception:
1598
1885
            self.handle_error(request, address)
1599
1886
        self.close_request(request)
1600
1887
    
1601
1888
    def process_request(self, request, address):
1602
1889
        """Start a new process to process the request."""
1603
1890
        proc = multiprocessing.Process(target = self.sub_process_main,
1604
 
                                       args = (request,
1605
 
                                               address))
 
1891
                                       args = (request, address))
1606
1892
        proc.start()
1607
1893
        return proc
1608
1894
 
1636
1922
        use_ipv6:       Boolean; to use IPv6 or not
1637
1923
    """
1638
1924
    def __init__(self, server_address, RequestHandlerClass,
1639
 
                 interface=None, use_ipv6=True):
 
1925
                 interface=None, use_ipv6=True, socketfd=None):
 
1926
        """If socketfd is set, use that file descriptor instead of
 
1927
        creating a new one with socket.socket().
 
1928
        """
1640
1929
        self.interface = interface
1641
1930
        if use_ipv6:
1642
1931
            self.address_family = socket.AF_INET6
 
1932
        if socketfd is not None:
 
1933
            # Save the file descriptor
 
1934
            self.socketfd = socketfd
 
1935
            # Save the original socket.socket() function
 
1936
            self.socket_socket = socket.socket
 
1937
            # To implement --socket, we monkey patch socket.socket.
 
1938
            # 
 
1939
            # (When socketserver.TCPServer is a new-style class, we
 
1940
            # could make self.socket into a property instead of monkey
 
1941
            # patching socket.socket.)
 
1942
            # 
 
1943
            # Create a one-time-only replacement for socket.socket()
 
1944
            @functools.wraps(socket.socket)
 
1945
            def socket_wrapper(*args, **kwargs):
 
1946
                # Restore original function so subsequent calls are
 
1947
                # not affected.
 
1948
                socket.socket = self.socket_socket
 
1949
                del self.socket_socket
 
1950
                # This time only, return a new socket object from the
 
1951
                # saved file descriptor.
 
1952
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1953
            # Replace socket.socket() function with wrapper
 
1954
            socket.socket = socket_wrapper
 
1955
        # The socketserver.TCPServer.__init__ will call
 
1956
        # socket.socket(), which might be our replacement,
 
1957
        # socket_wrapper(), if socketfd was set.
1643
1958
        socketserver.TCPServer.__init__(self, server_address,
1644
1959
                                        RequestHandlerClass)
 
1960
    
1645
1961
    def server_bind(self):
1646
1962
        """This overrides the normal server_bind() function
1647
1963
        to bind to an interface if one was specified, and also NOT to
1655
1971
                try:
1656
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
1657
1973
                                           SO_BINDTODEVICE,
1658
 
                                           str(self.interface
1659
 
                                               + '\0'))
 
1974
                                           str(self.interface + '\0'))
1660
1975
                except socket.error as error:
1661
 
                    if error[0] == errno.EPERM:
1662
 
                        logger.error("No permission to"
1663
 
                                     " bind to interface %s",
1664
 
                                     self.interface)
1665
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1976
                    if error.errno == errno.EPERM:
 
1977
                        logger.error("No permission to bind to"
 
1978
                                     " interface %s", self.interface)
 
1979
                    elif error.errno == errno.ENOPROTOOPT:
1666
1980
                        logger.error("SO_BINDTODEVICE not available;"
1667
1981
                                     " cannot bind to interface %s",
1668
1982
                                     self.interface)
 
1983
                    elif error.errno == errno.ENODEV:
 
1984
                        logger.error("Interface %s does not exist,"
 
1985
                                     " cannot bind", self.interface)
1669
1986
                    else:
1670
1987
                        raise
1671
1988
        # Only bind(2) the socket if we really need to.
1674
1991
                if self.address_family == socket.AF_INET6:
1675
1992
                    any_address = "::" # in6addr_any
1676
1993
                else:
1677
 
                    any_address = socket.INADDR_ANY
 
1994
                    any_address = "0.0.0.0" # INADDR_ANY
1678
1995
                self.server_address = (any_address,
1679
1996
                                       self.server_address[1])
1680
1997
            elif not self.server_address[1]:
1701
2018
    """
1702
2019
    def __init__(self, server_address, RequestHandlerClass,
1703
2020
                 interface=None, use_ipv6=True, clients=None,
1704
 
                 gnutls_priority=None, use_dbus=True):
 
2021
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1705
2022
        self.enabled = False
1706
2023
        self.clients = clients
1707
2024
        if self.clients is None:
1711
2028
        IPv6_TCPServer.__init__(self, server_address,
1712
2029
                                RequestHandlerClass,
1713
2030
                                interface = interface,
1714
 
                                use_ipv6 = use_ipv6)
 
2031
                                use_ipv6 = use_ipv6,
 
2032
                                socketfd = socketfd)
1715
2033
    def server_activate(self):
1716
2034
        if self.enabled:
1717
2035
            return socketserver.TCPServer.server_activate(self)
1730
2048
    
1731
2049
    def handle_ipc(self, source, condition, parent_pipe=None,
1732
2050
                   proc = None, client_object=None):
1733
 
        condition_names = {
1734
 
            gobject.IO_IN: "IN",   # There is data to read.
1735
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1736
 
                                    # blocking).
1737
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1738
 
            gobject.IO_ERR: "ERR", # Error condition.
1739
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1740
 
                                    # broken, usually for pipes and
1741
 
                                    # sockets).
1742
 
            }
1743
 
        conditions_string = ' | '.join(name
1744
 
                                       for cond, name in
1745
 
                                       condition_names.iteritems()
1746
 
                                       if cond & condition)
1747
2051
        # error, or the other end of multiprocessing.Pipe has closed
1748
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2052
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1749
2053
            # Wait for other process to exit
1750
2054
            proc.join()
1751
2055
            return False
1809
2113
        return True
1810
2114
 
1811
2115
 
 
2116
def rfc3339_duration_to_delta(duration):
 
2117
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2118
    
 
2119
    >>> rfc3339_duration_to_delta("P7D")
 
2120
    datetime.timedelta(7)
 
2121
    >>> rfc3339_duration_to_delta("PT60S")
 
2122
    datetime.timedelta(0, 60)
 
2123
    >>> rfc3339_duration_to_delta("PT60M")
 
2124
    datetime.timedelta(0, 3600)
 
2125
    >>> rfc3339_duration_to_delta("PT24H")
 
2126
    datetime.timedelta(1)
 
2127
    >>> rfc3339_duration_to_delta("P1W")
 
2128
    datetime.timedelta(7)
 
2129
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2130
    datetime.timedelta(0, 330)
 
2131
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2132
    datetime.timedelta(1, 200)
 
2133
    """
 
2134
    
 
2135
    # Parsing an RFC 3339 duration with regular expressions is not
 
2136
    # possible - there would have to be multiple places for the same
 
2137
    # values, like seconds.  The current code, while more esoteric, is
 
2138
    # cleaner without depending on a parsing library.  If Python had a
 
2139
    # built-in library for parsing we would use it, but we'd like to
 
2140
    # avoid excessive use of external libraries.
 
2141
    
 
2142
    # New type for defining tokens, syntax, and semantics all-in-one
 
2143
    Token = collections.namedtuple("Token",
 
2144
                                   ("regexp", # To match token; if
 
2145
                                              # "value" is not None,
 
2146
                                              # must have a "group"
 
2147
                                              # containing digits
 
2148
                                    "value",  # datetime.timedelta or
 
2149
                                              # None
 
2150
                                    "followers")) # Tokens valid after
 
2151
                                                  # this token
 
2152
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2153
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2154
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2155
    token_second = Token(re.compile(r"(\d+)S"),
 
2156
                         datetime.timedelta(seconds=1),
 
2157
                         frozenset((token_end,)))
 
2158
    token_minute = Token(re.compile(r"(\d+)M"),
 
2159
                         datetime.timedelta(minutes=1),
 
2160
                         frozenset((token_second, token_end)))
 
2161
    token_hour = Token(re.compile(r"(\d+)H"),
 
2162
                       datetime.timedelta(hours=1),
 
2163
                       frozenset((token_minute, token_end)))
 
2164
    token_time = Token(re.compile(r"T"),
 
2165
                       None,
 
2166
                       frozenset((token_hour, token_minute,
 
2167
                                  token_second)))
 
2168
    token_day = Token(re.compile(r"(\d+)D"),
 
2169
                      datetime.timedelta(days=1),
 
2170
                      frozenset((token_time, token_end)))
 
2171
    token_month = Token(re.compile(r"(\d+)M"),
 
2172
                        datetime.timedelta(weeks=4),
 
2173
                        frozenset((token_day, token_end)))
 
2174
    token_year = Token(re.compile(r"(\d+)Y"),
 
2175
                       datetime.timedelta(weeks=52),
 
2176
                       frozenset((token_month, token_end)))
 
2177
    token_week = Token(re.compile(r"(\d+)W"),
 
2178
                       datetime.timedelta(weeks=1),
 
2179
                       frozenset((token_end,)))
 
2180
    token_duration = Token(re.compile(r"P"), None,
 
2181
                           frozenset((token_year, token_month,
 
2182
                                      token_day, token_time,
 
2183
                                      token_week))),
 
2184
    # Define starting values
 
2185
    value = datetime.timedelta() # Value so far
 
2186
    found_token = None
 
2187
    followers = frozenset(token_duration,) # Following valid tokens
 
2188
    s = duration                # String left to parse
 
2189
    # Loop until end token is found
 
2190
    while found_token is not token_end:
 
2191
        # Search for any currently valid tokens
 
2192
        for token in followers:
 
2193
            match = token.regexp.match(s)
 
2194
            if match is not None:
 
2195
                # Token found
 
2196
                if token.value is not None:
 
2197
                    # Value found, parse digits
 
2198
                    factor = int(match.group(1), 10)
 
2199
                    # Add to value so far
 
2200
                    value += factor * token.value
 
2201
                # Strip token from string
 
2202
                s = token.regexp.sub("", s, 1)
 
2203
                # Go to found token
 
2204
                found_token = token
 
2205
                # Set valid next tokens
 
2206
                followers = found_token.followers
 
2207
                break
 
2208
        else:
 
2209
            # No currently valid tokens were found
 
2210
            raise ValueError("Invalid RFC 3339 duration")
 
2211
    # End token found
 
2212
    return value
 
2213
 
 
2214
 
1812
2215
def string_to_delta(interval):
1813
2216
    """Parse a string and return a datetime.timedelta
1814
2217
    
1825
2228
    >>> string_to_delta('5m 30s')
1826
2229
    datetime.timedelta(0, 330)
1827
2230
    """
 
2231
    
 
2232
    try:
 
2233
        return rfc3339_duration_to_delta(interval)
 
2234
    except ValueError:
 
2235
        pass
 
2236
    
1828
2237
    timevalue = datetime.timedelta(0)
1829
2238
    for s in interval.split():
1830
2239
        try:
1841
2250
            elif suffix == "w":
1842
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1843
2252
            else:
1844
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2253
                raise ValueError("Unknown suffix {0!r}"
 
2254
                                 .format(suffix))
1845
2255
        except (ValueError, IndexError) as e:
1846
2256
            raise ValueError(*(e.args))
1847
2257
        timevalue += delta
1848
2258
    return timevalue
1849
2259
 
1850
2260
 
1851
 
def if_nametoindex(interface):
1852
 
    """Call the C function if_nametoindex(), or equivalent
1853
 
    
1854
 
    Note: This function cannot accept a unicode string."""
1855
 
    global if_nametoindex
1856
 
    try:
1857
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1858
 
                          (ctypes.util.find_library("c"))
1859
 
                          .if_nametoindex)
1860
 
    except (OSError, AttributeError):
1861
 
        logger.warning("Doing if_nametoindex the hard way")
1862
 
        def if_nametoindex(interface):
1863
 
            "Get an interface index the hard way, i.e. using fcntl()"
1864
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1865
 
            with contextlib.closing(socket.socket()) as s:
1866
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1867
 
                                    struct.pack(str("16s16x"),
1868
 
                                                interface))
1869
 
            interface_index = struct.unpack(str("I"),
1870
 
                                            ifreq[16:20])[0]
1871
 
            return interface_index
1872
 
    return if_nametoindex(interface)
1873
 
 
1874
 
 
1875
2261
def daemon(nochdir = False, noclose = False):
1876
2262
    """See daemon(3).  Standard BSD Unix function.
1877
2263
    
1885
2271
        sys.exit()
1886
2272
    if not noclose:
1887
2273
        # Close all standard open file descriptors
1888
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1889
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1890
2276
            raise OSError(errno.ENODEV,
1891
 
                          "%s not a character device"
1892
 
                          % os.path.devnull)
 
2277
                          "{0} not a character device"
 
2278
                          .format(os.devnull))
1893
2279
        os.dup2(null, sys.stdin.fileno())
1894
2280
        os.dup2(null, sys.stdout.fileno())
1895
2281
        os.dup2(null, sys.stderr.fileno())
1904
2290
    
1905
2291
    parser = argparse.ArgumentParser()
1906
2292
    parser.add_argument("-v", "--version", action="version",
1907
 
                        version = "%%(prog)s %s" % version,
 
2293
                        version = "%(prog)s {0}".format(version),
1908
2294
                        help="show version number and exit")
1909
2295
    parser.add_argument("-i", "--interface", metavar="IF",
1910
2296
                        help="Bind to interface IF")
1916
2302
                        help="Run self-test")
1917
2303
    parser.add_argument("--debug", action="store_true",
1918
2304
                        help="Debug mode; run in foreground and log"
1919
 
                        " to terminal")
 
2305
                        " to terminal", default=None)
1920
2306
    parser.add_argument("--debuglevel", metavar="LEVEL",
1921
2307
                        help="Debug level for stdout output")
1922
2308
    parser.add_argument("--priority", help="GnuTLS"
1929
2315
                        " files")
1930
2316
    parser.add_argument("--no-dbus", action="store_false",
1931
2317
                        dest="use_dbus", help="Do not provide D-Bus"
1932
 
                        " system bus interface")
 
2318
                        " system bus interface", default=None)
1933
2319
    parser.add_argument("--no-ipv6", action="store_false",
1934
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2320
                        dest="use_ipv6", help="Do not use IPv6",
 
2321
                        default=None)
1935
2322
    parser.add_argument("--no-restore", action="store_false",
1936
 
                        dest="restore", help="Do not restore stored state",
1937
 
                        default=True)
1938
 
 
 
2323
                        dest="restore", help="Do not restore stored"
 
2324
                        " state", default=None)
 
2325
    parser.add_argument("--socket", type=int,
 
2326
                        help="Specify a file descriptor to a network"
 
2327
                        " socket to use instead of creating one")
 
2328
    parser.add_argument("--statedir", metavar="DIR",
 
2329
                        help="Directory to save/restore state in")
 
2330
    parser.add_argument("--foreground", action="store_true",
 
2331
                        help="Run in foreground", default=None)
 
2332
    
1939
2333
    options = parser.parse_args()
1940
2334
    
1941
2335
    if options.check:
1949
2343
                        "port": "",
1950
2344
                        "debug": "False",
1951
2345
                        "priority":
1952
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
1953
2347
                        "servicename": "Mandos",
1954
2348
                        "use_dbus": "True",
1955
2349
                        "use_ipv6": "True",
1956
2350
                        "debuglevel": "",
 
2351
                        "restore": "True",
 
2352
                        "socket": "",
 
2353
                        "statedir": "/var/lib/mandos",
 
2354
                        "foreground": "False",
1957
2355
                        }
1958
2356
    
1959
2357
    # Parse config file for server-global settings
1964
2362
    # Convert the SafeConfigParser object to a dict
1965
2363
    server_settings = server_config.defaults()
1966
2364
    # Use the appropriate methods on the non-string config options
1967
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2365
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1968
2366
        server_settings[option] = server_config.getboolean("DEFAULT",
1969
2367
                                                           option)
1970
2368
    if server_settings["port"]:
1971
2369
        server_settings["port"] = server_config.getint("DEFAULT",
1972
2370
                                                       "port")
 
2371
    if server_settings["socket"]:
 
2372
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2373
                                                         "socket")
 
2374
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2375
        # over with an opened os.devnull.  But we don't want this to
 
2376
        # happen with a supplied network socket.
 
2377
        if 0 <= server_settings["socket"] <= 2:
 
2378
            server_settings["socket"] = os.dup(server_settings
 
2379
                                               ["socket"])
1973
2380
    del server_config
1974
2381
    
1975
2382
    # Override the settings from the config file with command line
1976
2383
    # options, if set.
1977
2384
    for option in ("interface", "address", "port", "debug",
1978
2385
                   "priority", "servicename", "configdir",
1979
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2387
                   "statedir", "socket", "foreground"):
1980
2388
        value = getattr(options, option)
1981
2389
        if value is not None:
1982
2390
            server_settings[option] = value
1985
2393
    for option in server_settings.keys():
1986
2394
        if type(server_settings[option]) is str:
1987
2395
            server_settings[option] = unicode(server_settings[option])
 
2396
    # Force all boolean options to be boolean
 
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2398
                   "foreground"):
 
2399
        server_settings[option] = bool(server_settings[option])
 
2400
    # Debug implies foreground
 
2401
    if server_settings["debug"]:
 
2402
        server_settings["foreground"] = True
1988
2403
    # Now we have our good server settings in "server_settings"
1989
2404
    
1990
2405
    ##################################################################
1994
2409
    debuglevel = server_settings["debuglevel"]
1995
2410
    use_dbus = server_settings["use_dbus"]
1996
2411
    use_ipv6 = server_settings["use_ipv6"]
 
2412
    stored_state_path = os.path.join(server_settings["statedir"],
 
2413
                                     stored_state_file)
 
2414
    foreground = server_settings["foreground"]
 
2415
    
 
2416
    if debug:
 
2417
        initlogger(debug, logging.DEBUG)
 
2418
    else:
 
2419
        if not debuglevel:
 
2420
            initlogger(debug)
 
2421
        else:
 
2422
            level = getattr(logging, debuglevel.upper())
 
2423
            initlogger(debug, level)
1997
2424
    
1998
2425
    if server_settings["servicename"] != "Mandos":
1999
2426
        syslogger.setFormatter(logging.Formatter
2000
 
                               ('Mandos (%s) [%%(process)d]:'
2001
 
                                ' %%(levelname)s: %%(message)s'
2002
 
                                % server_settings["servicename"]))
 
2427
                               ('Mandos ({0}) [%(process)d]:'
 
2428
                                ' %(levelname)s: %(message)s'
 
2429
                                .format(server_settings
 
2430
                                        ["servicename"])))
2003
2431
    
2004
2432
    # Parse config file with clients
2005
 
    client_defaults = { "timeout": "5m",
2006
 
                        "extended_timeout": "15m",
2007
 
                        "interval": "2m",
2008
 
                        "checker": "fping -q -- %%(host)s",
2009
 
                        "host": "",
2010
 
                        "approval_delay": "0s",
2011
 
                        "approval_duration": "1s",
2012
 
                        }
2013
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2433
    client_config = configparser.SafeConfigParser(Client
 
2434
                                                  .client_defaults)
2014
2435
    client_config.read(os.path.join(server_settings["configdir"],
2015
2436
                                    "clients.conf"))
2016
2437
    
2025
2446
                              use_ipv6=use_ipv6,
2026
2447
                              gnutls_priority=
2027
2448
                              server_settings["priority"],
2028
 
                              use_dbus=use_dbus)
2029
 
    if not debug:
2030
 
        pidfilename = "/var/run/mandos.pid"
 
2449
                              use_dbus=use_dbus,
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
 
2452
    if not foreground:
 
2453
        pidfilename = "/run/mandos.pid"
 
2454
        pidfile = None
2031
2455
        try:
2032
2456
            pidfile = open(pidfilename, "w")
2033
 
        except IOError:
2034
 
            logger.error("Could not open file %r", pidfilename)
 
2457
        except IOError as e:
 
2458
            logger.error("Could not open file %r", pidfilename,
 
2459
                         exc_info=e)
2035
2460
    
2036
 
    try:
2037
 
        uid = pwd.getpwnam("_mandos").pw_uid
2038
 
        gid = pwd.getpwnam("_mandos").pw_gid
2039
 
    except KeyError:
 
2461
    for name in ("_mandos", "mandos", "nobody"):
2040
2462
        try:
2041
 
            uid = pwd.getpwnam("mandos").pw_uid
2042
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2463
            uid = pwd.getpwnam(name).pw_uid
 
2464
            gid = pwd.getpwnam(name).pw_gid
 
2465
            break
2043
2466
        except KeyError:
2044
 
            try:
2045
 
                uid = pwd.getpwnam("nobody").pw_uid
2046
 
                gid = pwd.getpwnam("nobody").pw_gid
2047
 
            except KeyError:
2048
 
                uid = 65534
2049
 
                gid = 65534
 
2467
            continue
 
2468
    else:
 
2469
        uid = 65534
 
2470
        gid = 65534
2050
2471
    try:
2051
2472
        os.setgid(gid)
2052
2473
        os.setuid(uid)
2053
2474
    except OSError as error:
2054
 
        if error[0] != errno.EPERM:
 
2475
        if error.errno != errno.EPERM:
2055
2476
            raise error
2056
2477
    
2057
 
    if not debug and not debuglevel:
2058
 
        logger.setLevel(logging.WARNING)
2059
 
    if debuglevel:
2060
 
        level = getattr(logging, debuglevel.upper())
2061
 
        logger.setLevel(level)
2062
 
    
2063
2478
    if debug:
2064
 
        logger.setLevel(logging.DEBUG)
2065
2479
        # Enable all possible GnuTLS debugging
2066
2480
        
2067
2481
        # "Use a log level over 10 to enable all debugging options."
2076
2490
         .gnutls_global_set_log_function(debug_gnutls))
2077
2491
        
2078
2492
        # Redirect stdin so all checkers get /dev/null
2079
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2493
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2080
2494
        os.dup2(null, sys.stdin.fileno())
2081
2495
        if null > 2:
2082
2496
            os.close(null)
2083
 
    else:
2084
 
        # No console logging
2085
 
        logger.removeHandler(console)
2086
2497
    
2087
2498
    # Need to fork before connecting to D-Bus
2088
 
    if not debug:
 
2499
    if not foreground:
2089
2500
        # Close all input and output, do double fork, etc.
2090
2501
        daemon()
2091
2502
    
 
2503
    # multiprocessing will use threads, so before we use gobject we
 
2504
    # need to inform gobject that threads will be used.
 
2505
    gobject.threads_init()
 
2506
    
2092
2507
    global main_loop
2093
2508
    # From the Avahi example code
2094
 
    DBusGMainLoop(set_as_default=True )
 
2509
    DBusGMainLoop(set_as_default=True)
2095
2510
    main_loop = gobject.MainLoop()
2096
2511
    bus = dbus.SystemBus()
2097
2512
    # End of Avahi example code
2103
2518
                            ("se.bsnet.fukt.Mandos", bus,
2104
2519
                             do_not_queue=True))
2105
2520
        except dbus.exceptions.NameExistsException as e:
2106
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2521
            logger.error("Disabling D-Bus:", exc_info=e)
2107
2522
            use_dbus = False
2108
2523
            server_settings["use_dbus"] = False
2109
2524
            tcp_server.use_dbus = False
2121
2536
    
2122
2537
    client_class = Client
2123
2538
    if use_dbus:
2124
 
        client_class = functools.partial(ClientDBusTransitional,
2125
 
                                         bus = bus)
2126
 
    
2127
 
    special_settings = {
2128
 
        # Some settings need to be accessd by special methods;
2129
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2130
 
        "approved_by_default":
2131
 
            lambda section:
2132
 
            client_config.getboolean(section, "approved_by_default"),
2133
 
        }
2134
 
    # Construct a new dict of client settings of this form:
2135
 
    # { client_name: {setting_name: value, ...}, ...}
2136
 
    # with exceptions for any special settings as defined above
2137
 
    client_settings = dict((clientname,
2138
 
                           dict((setting,
2139
 
                                 (value if setting not in special_settings
2140
 
                                  else special_settings[setting](clientname)))
2141
 
                                for setting, value in client_config.items(clientname)))
2142
 
                          for clientname in client_config.sections())
2143
 
    
 
2539
        client_class = functools.partial(ClientDBus, bus = bus)
 
2540
    
 
2541
    client_settings = Client.config_parser(client_config)
2144
2542
    old_client_settings = {}
2145
 
    clients_data = []
2146
 
 
2147
 
    # Get client data and settings from last running state. 
 
2543
    clients_data = {}
 
2544
    
 
2545
    # This is used to redirect stdout and stderr for checker processes
 
2546
    global wnull
 
2547
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2548
    # Only used if server is running in foreground but not in debug
 
2549
    # mode
 
2550
    if debug or not foreground:
 
2551
        wnull.close()
 
2552
    
 
2553
    # Get client data and settings from last running state.
2148
2554
    if server_settings["restore"]:
2149
2555
        try:
2150
2556
            with open(stored_state_path, "rb") as stored_state:
2151
 
                clients_data, old_client_settings = pickle.load(stored_state)
 
2557
                clients_data, old_client_settings = (pickle.load
 
2558
                                                     (stored_state))
2152
2559
            os.remove(stored_state_path)
2153
2560
        except IOError as e:
2154
 
            logger.warning("Could not load persistant state: {0}".format(e))
2155
 
            if e.errno != errno.ENOENT:
 
2561
            if e.errno == errno.ENOENT:
 
2562
                logger.warning("Could not load persistent state: {0}"
 
2563
                                .format(os.strerror(e.errno)))
 
2564
            else:
 
2565
                logger.critical("Could not load persistent state:",
 
2566
                                exc_info=e)
2156
2567
                raise
2157
 
 
2158
 
    for client in clients_data:
2159
 
        client_name = client["name"]
2160
 
        
2161
 
        # Decide which value to use after restoring saved state.
2162
 
        # We have three different values: Old config file,
2163
 
        # new config file, and saved state.
2164
 
        # New config value takes precedence if it differs from old
2165
 
        # config value, otherwise use saved state.
2166
 
        for name, value in client_settings[client_name].items():
 
2568
        except EOFError as e:
 
2569
            logger.warning("Could not load persistent state: "
 
2570
                           "EOFError:", exc_info=e)
 
2571
    
 
2572
    with PGPEngine() as pgp:
 
2573
        for client_name, client in clients_data.iteritems():
 
2574
            # Skip removed clients
 
2575
            if client_name not in client_settings:
 
2576
                continue
 
2577
            
 
2578
            # Decide which value to use after restoring saved state.
 
2579
            # We have three different values: Old config file,
 
2580
            # new config file, and saved state.
 
2581
            # New config value takes precedence if it differs from old
 
2582
            # config value, otherwise use saved state.
 
2583
            for name, value in client_settings[client_name].items():
 
2584
                try:
 
2585
                    # For each value in new config, check if it
 
2586
                    # differs from the old config value (Except for
 
2587
                    # the "secret" attribute)
 
2588
                    if (name != "secret" and
 
2589
                        value != old_client_settings[client_name]
 
2590
                        [name]):
 
2591
                        client[name] = value
 
2592
                except KeyError:
 
2593
                    pass
 
2594
            
 
2595
            # Clients who has passed its expire date can still be
 
2596
            # enabled if its last checker was successful.  Clients
 
2597
            # whose checker succeeded before we stored its state is
 
2598
            # assumed to have successfully run all checkers during
 
2599
            # downtime.
 
2600
            if client["enabled"]:
 
2601
                if datetime.datetime.utcnow() >= client["expires"]:
 
2602
                    if not client["last_checked_ok"]:
 
2603
                        logger.warning(
 
2604
                            "disabling client {0} - Client never "
 
2605
                            "performed a successful checker"
 
2606
                            .format(client_name))
 
2607
                        client["enabled"] = False
 
2608
                    elif client["last_checker_status"] != 0:
 
2609
                        logger.warning(
 
2610
                            "disabling client {0} - Client "
 
2611
                            "last checker failed with error code {1}"
 
2612
                            .format(client_name,
 
2613
                                    client["last_checker_status"]))
 
2614
                        client["enabled"] = False
 
2615
                    else:
 
2616
                        client["expires"] = (datetime.datetime
 
2617
                                             .utcnow()
 
2618
                                             + client["timeout"])
 
2619
                        logger.debug("Last checker succeeded,"
 
2620
                                     " keeping {0} enabled"
 
2621
                                     .format(client_name))
2167
2622
            try:
2168
 
                # For each value in new config, check if it differs
2169
 
                # from the old config value (Except for the "secret"
2170
 
                # attribute)
2171
 
                if name != "secret" and value != old_client_settings[client_name][name]:
2172
 
                    setattr(client, name, value)
2173
 
            except KeyError:
2174
 
                pass
2175
 
 
2176
 
        # Clients who has passed its expire date, can still be enabled if its
2177
 
        # last checker was sucessful. Clients who checkers failed before we
2178
 
        # stored it state is asumed to had failed checker during downtime.
2179
 
        if client["enabled"] and client["last_checked_ok"]:
2180
 
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2181
 
                > client["interval"]):
2182
 
                if client["last_checker_status"] != 0:
2183
 
                    client["enabled"] = False
2184
 
                else:
2185
 
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2186
 
 
2187
 
        client["changedstate"] = (multiprocessing_manager
2188
 
                                  .Condition(multiprocessing_manager
2189
 
                                             .Lock()))
2190
 
        if use_dbus:
2191
 
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2192
 
            tcp_server.clients[client_name] = new_client
2193
 
            new_client.bus = bus
2194
 
            for name, value in client.iteritems():
2195
 
                setattr(new_client, name, value)
2196
 
            client_object_name = unicode(client_name).translate(
2197
 
                {ord("."): ord("_"),
2198
 
                 ord("-"): ord("_")})
2199
 
            new_client.dbus_object_path = (dbus.ObjectPath
2200
 
                                     ("/clients/" + client_object_name))
2201
 
            DBusObjectWithProperties.__init__(new_client,
2202
 
                                              new_client.bus,
2203
 
                                              new_client.dbus_object_path)
2204
 
        else:
2205
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2206
 
            for name, value in client.iteritems():
2207
 
                setattr(tcp_server.clients[client_name], name, value)
2208
 
                
2209
 
        tcp_server.clients[client_name].decrypt_secret(
2210
 
            client_settings[client_name]["secret"])            
2211
 
        
2212
 
    # Create/remove clients based on new changes made to config
2213
 
    for clientname in set(old_client_settings) - set(client_settings):
2214
 
        del tcp_server.clients[clientname]
2215
 
    for clientname in set(client_settings) - set(old_client_settings):
2216
 
        tcp_server.clients[clientname] = (client_class(name = clientname,
2217
 
                                                       config =
2218
 
                                                       client_settings
2219
 
                                                       [clientname]))
2220
 
    
2221
 
 
 
2623
                client["secret"] = (
 
2624
                    pgp.decrypt(client["encrypted_secret"],
 
2625
                                client_settings[client_name]
 
2626
                                ["secret"]))
 
2627
            except PGPError:
 
2628
                # If decryption fails, we use secret from new settings
 
2629
                logger.debug("Failed to decrypt {0} old secret"
 
2630
                             .format(client_name))
 
2631
                client["secret"] = (
 
2632
                    client_settings[client_name]["secret"])
 
2633
    
 
2634
    # Add/remove clients based on new changes made to config
 
2635
    for client_name in (set(old_client_settings)
 
2636
                        - set(client_settings)):
 
2637
        del clients_data[client_name]
 
2638
    for client_name in (set(client_settings)
 
2639
                        - set(old_client_settings)):
 
2640
        clients_data[client_name] = client_settings[client_name]
 
2641
    
 
2642
    # Create all client objects
 
2643
    for client_name, client in clients_data.iteritems():
 
2644
        tcp_server.clients[client_name] = client_class(
 
2645
            name = client_name, settings = client,
 
2646
            server_settings = server_settings)
 
2647
    
2222
2648
    if not tcp_server.clients:
2223
2649
        logger.warning("No clients defined")
2224
 
        
2225
 
    if not debug:
2226
 
        try:
2227
 
            with pidfile:
2228
 
                pid = os.getpid()
2229
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2230
 
            del pidfile
2231
 
        except IOError:
2232
 
            logger.error("Could not write to file %r with PID %d",
2233
 
                         pidfilename, pid)
2234
 
        except NameError:
2235
 
            # "pidfile" was never created
2236
 
            pass
 
2650
    
 
2651
    if not foreground:
 
2652
        if pidfile is not None:
 
2653
            try:
 
2654
                with pidfile:
 
2655
                    pid = os.getpid()
 
2656
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2657
            except IOError:
 
2658
                logger.error("Could not write to file %r with PID %d",
 
2659
                             pidfilename, pid)
 
2660
        del pidfile
2237
2661
        del pidfilename
2238
 
        
2239
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2240
2662
    
2241
2663
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2242
2664
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2243
2665
    
2244
2666
    if use_dbus:
2245
 
        class MandosDBusService(dbus.service.Object):
 
2667
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2668
                                        "se.bsnet.fukt.Mandos"})
 
2669
        class MandosDBusService(DBusObjectWithProperties):
2246
2670
            """A D-Bus proxy object"""
2247
2671
            def __init__(self):
2248
2672
                dbus.service.Object.__init__(self, bus, "/")
2249
2673
            _interface = "se.recompile.Mandos"
2250
2674
            
 
2675
            @dbus_interface_annotations(_interface)
 
2676
            def _foo(self):
 
2677
                return { "org.freedesktop.DBus.Property"
 
2678
                         ".EmitsChangedSignal":
 
2679
                             "false"}
 
2680
            
2251
2681
            @dbus.service.signal(_interface, signature="o")
2252
2682
            def ClientAdded(self, objpath):
2253
2683
                "D-Bus signal"
2295
2725
            
2296
2726
            del _interface
2297
2727
        
2298
 
        class MandosDBusServiceTransitional(MandosDBusService):
2299
 
            __metaclass__ = AlternateDBusNamesMetaclass
2300
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2728
        mandos_dbus_service = MandosDBusService()
2301
2729
    
2302
2730
    def cleanup():
2303
2731
        "Cleanup function; run on exit"
2304
2732
        service.cleanup()
2305
2733
        
2306
2734
        multiprocessing.active_children()
 
2735
        wnull.close()
2307
2736
        if not (tcp_server.clients or client_settings):
2308
2737
            return
2309
 
 
2310
 
        # Store client before exiting. Secrets are encrypted with key based
2311
 
        # on what config file has. If config file is removed/edited, old
2312
 
        # secret will thus be unrecovable.
2313
 
        clients = []
2314
 
        for client in tcp_server.clients.itervalues():
2315
 
            client.encrypt_secret(client_settings[client.name]["secret"])
2316
 
 
2317
 
            client_dict = {}
2318
 
 
2319
 
            # A list of attributes that will not be stored when shuting down.
2320
 
            exclude = set(("bus", "changedstate", "secret"))            
2321
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2322
 
                exclude.add(name)
2323
 
                
2324
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2325
 
            for attr in client.client_structure:
2326
 
                if attr not in exclude:
2327
 
                    client_dict[attr] = getattr(client, attr)
2328
 
 
2329
 
            clients.append(client_dict) 
2330
 
            del client_settings[client.name]["secret"]
2331
 
            
 
2738
        
 
2739
        # Store client before exiting. Secrets are encrypted with key
 
2740
        # based on what config file has. If config file is
 
2741
        # removed/edited, old secret will thus be unrecovable.
 
2742
        clients = {}
 
2743
        with PGPEngine() as pgp:
 
2744
            for client in tcp_server.clients.itervalues():
 
2745
                key = client_settings[client.name]["secret"]
 
2746
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2747
                                                      key)
 
2748
                client_dict = {}
 
2749
                
 
2750
                # A list of attributes that can not be pickled
 
2751
                # + secret.
 
2752
                exclude = set(("bus", "changedstate", "secret",
 
2753
                               "checker", "server_settings"))
 
2754
                for name, typ in (inspect.getmembers
 
2755
                                  (dbus.service.Object)):
 
2756
                    exclude.add(name)
 
2757
                
 
2758
                client_dict["encrypted_secret"] = (client
 
2759
                                                   .encrypted_secret)
 
2760
                for attr in client.client_structure:
 
2761
                    if attr not in exclude:
 
2762
                        client_dict[attr] = getattr(client, attr)
 
2763
                
 
2764
                clients[client.name] = client_dict
 
2765
                del client_settings[client.name]["secret"]
 
2766
        
2332
2767
        try:
2333
 
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
 
2768
            with (tempfile.NamedTemporaryFile
 
2769
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2770
                   dir=os.path.dirname(stored_state_path),
 
2771
                   delete=False)) as stored_state:
2334
2772
                pickle.dump((clients, client_settings), stored_state)
2335
 
        except IOError as e:
2336
 
            logger.warning("Could not save persistant state: {0}".format(e))
2337
 
            if e.errno != errno.ENOENT:
2338
 
                raise
2339
 
 
 
2773
                tempname=stored_state.name
 
2774
            os.rename(tempname, stored_state_path)
 
2775
        except (IOError, OSError) as e:
 
2776
            if not debug:
 
2777
                try:
 
2778
                    os.remove(tempname)
 
2779
                except NameError:
 
2780
                    pass
 
2781
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2782
                logger.warning("Could not save persistent state: {0}"
 
2783
                               .format(os.strerror(e.errno)))
 
2784
            else:
 
2785
                logger.warning("Could not save persistent state:",
 
2786
                               exc_info=e)
 
2787
                raise e
 
2788
        
2340
2789
        # Delete all clients, and settings from config
2341
2790
        while tcp_server.clients:
2342
2791
            name, client = tcp_server.clients.popitem()
2360
2809
        # Need to initiate checking of clients
2361
2810
        if client.enabled:
2362
2811
            client.init_checker()
2363
 
 
2364
2812
    
2365
2813
    tcp_server.enable()
2366
2814
    tcp_server.server_activate()
2369
2817
    service.port = tcp_server.socket.getsockname()[1]
2370
2818
    if use_ipv6:
2371
2819
        logger.info("Now listening on address %r, port %d,"
2372
 
                    " flowinfo %d, scope_id %d"
2373
 
                    % tcp_server.socket.getsockname())
 
2820
                    " flowinfo %d, scope_id %d",
 
2821
                    *tcp_server.socket.getsockname())
2374
2822
    else:                       # IPv4
2375
 
        logger.info("Now listening on address %r, port %d"
2376
 
                    % tcp_server.socket.getsockname())
 
2823
        logger.info("Now listening on address %r, port %d",
 
2824
                    *tcp_server.socket.getsockname())
2377
2825
    
2378
2826
    #service.interface = tcp_server.socket.getsockname()[3]
2379
2827
    
2382
2830
        try:
2383
2831
            service.activate()
2384
2832
        except dbus.exceptions.DBusException as error:
2385
 
            logger.critical("DBusException: %s", error)
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
2386
2834
            cleanup()
2387
2835
            sys.exit(1)
2388
2836
        # End of Avahi example code
2395
2843
        logger.debug("Starting main loop")
2396
2844
        main_loop.run()
2397
2845
    except AvahiError as error:
2398
 
        logger.critical("AvahiError: %s", error)
 
2846
        logger.critical("Avahi Error", exc_info=error)
2399
2847
        cleanup()
2400
2848
        sys.exit(1)
2401
2849
    except KeyboardInterrupt:
2406
2854
    # Must run before the D-Bus bus name gets deregistered
2407
2855
    cleanup()
2408
2856
 
2409
 
 
2410
2857
if __name__ == '__main__':
2411
2858
    main()