/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2014-03-27 21:24:33 UTC
  • Revision ID: teddy@recompile.se-20140327212433-oxdvfg1vsaagc6v0
Use fnmatch()in plugin-runner.

* plugin-runner.c (main): Use fnmatch().

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