/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: 2013-06-23 15:30:34 UTC
  • Revision ID: teddy@recompile.se-20130623153034-u8oty17y51oc0xnl
TODO change only

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-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
65
67
import types
66
68
import binascii
67
69
import tempfile
 
70
import itertools
 
71
import collections
68
72
 
69
73
import dbus
70
74
import dbus.service
75
79
import ctypes.util
76
80
import xml.dom.minidom
77
81
import inspect
78
 
import GnuPGInterface
79
82
 
80
83
try:
81
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
88
    except ImportError:
86
89
        SO_BINDTODEVICE = None
87
90
 
88
 
version = "1.4.1"
 
91
version = "1.6.0"
89
92
stored_state_file = "clients.pickle"
90
93
 
91
94
logger = logging.getLogger()
136
139
class PGPEngine(object):
137
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
138
141
    def __init__(self):
139
 
        self.gnupg = GnuPGInterface.GnuPG()
140
142
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
141
 
        self.gnupg = GnuPGInterface.GnuPG()
142
 
        self.gnupg.options.meta_interactive = False
143
 
        self.gnupg.options.homedir = self.tempdir
144
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
145
 
                                              '--quiet'])
 
143
        self.gnupgargs = ['--batch',
 
144
                          '--home', self.tempdir,
 
145
                          '--force-mdc',
 
146
                          '--quiet',
 
147
                          '--no-use-agent']
146
148
    
147
149
    def __enter__(self):
148
150
        return self
149
151
    
150
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
    def __exit__(self, exc_type, exc_value, traceback):
151
153
        self._cleanup()
152
154
        return False
153
155
    
173
175
        return b"mandos" + binascii.hexlify(password)
174
176
    
175
177
    def encrypt(self, data, password):
176
 
        self.gnupg.passphrase = self.password_encode(password)
177
 
        with open(os.devnull) as devnull:
178
 
            try:
179
 
                proc = self.gnupg.run(['--symmetric'],
180
 
                                      create_fhs=['stdin', 'stdout'],
181
 
                                      attach_fhs={'stderr': devnull})
182
 
                with contextlib.closing(proc.handles['stdin']) as f:
183
 
                    f.write(data)
184
 
                with contextlib.closing(proc.handles['stdout']) as f:
185
 
                    ciphertext = f.read()
186
 
                proc.wait()
187
 
            except IOError as e:
188
 
                raise PGPError(e)
189
 
        self.gnupg.passphrase = None
 
178
        passphrase = self.password_encode(password)
 
179
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
180
                                         ) as passfile:
 
181
            passfile.write(passphrase)
 
182
            passfile.flush()
 
183
            proc = subprocess.Popen(['gpg', '--symmetric',
 
184
                                     '--passphrase-file',
 
185
                                     passfile.name]
 
186
                                    + self.gnupgargs,
 
187
                                    stdin = subprocess.PIPE,
 
188
                                    stdout = subprocess.PIPE,
 
189
                                    stderr = subprocess.PIPE)
 
190
            ciphertext, err = proc.communicate(input = data)
 
191
        if proc.returncode != 0:
 
192
            raise PGPError(err)
190
193
        return ciphertext
191
194
    
192
195
    def decrypt(self, data, password):
193
 
        self.gnupg.passphrase = self.password_encode(password)
194
 
        with open(os.devnull) as devnull:
195
 
            try:
196
 
                proc = self.gnupg.run(['--decrypt'],
197
 
                                      create_fhs=['stdin', 'stdout'],
198
 
                                      attach_fhs={'stderr': devnull})
199
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
200
 
                    f.write(data)
201
 
                with contextlib.closing(proc.handles['stdout']) as f:
202
 
                    decrypted_plaintext = f.read()
203
 
                proc.wait()
204
 
            except IOError as e:
205
 
                raise PGPError(e)
206
 
        self.gnupg.passphrase = None
 
196
        passphrase = self.password_encode(password)
 
197
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
198
                                         ) as passfile:
 
199
            passfile.write(passphrase)
 
200
            passfile.flush()
 
201
            proc = subprocess.Popen(['gpg', '--decrypt',
 
202
                                     '--passphrase-file',
 
203
                                     passfile.name]
 
204
                                    + self.gnupgargs,
 
205
                                    stdin = subprocess.PIPE,
 
206
                                    stdout = subprocess.PIPE,
 
207
                                    stderr = subprocess.PIPE)
 
208
            decrypted_plaintext, err = proc.communicate(input
 
209
                                                        = data)
 
210
        if proc.returncode != 0:
 
211
            raise PGPError(err)
207
212
        return decrypted_plaintext
208
213
 
209
214
 
210
 
 
211
215
class AvahiError(Exception):
212
216
    def __init__(self, value, *args, **kwargs):
213
217
        self.value = value
230
234
               Used to optionally bind to the specified interface.
231
235
    name: string; Example: 'Mandos'
232
236
    type: string; Example: '_mandos._tcp'.
233
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
237
     See <https://www.iana.org/assignments/service-names-port-numbers>
234
238
    port: integer; what port to announce
235
239
    TXT: list of strings; TXT record for the service
236
240
    domain: string; Domain to publish on, default to .local if empty.
242
246
    server: D-Bus Server
243
247
    bus: dbus.SystemBus()
244
248
    """
 
249
    
245
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
246
251
                 servicetype = None, port = None, TXT = None,
247
252
                 domain = "", host = "", max_renames = 32768,
260
265
        self.server = None
261
266
        self.bus = bus
262
267
        self.entry_group_state_changed_match = None
 
268
    
263
269
    def rename(self):
264
270
        """Derived from the Avahi example code"""
265
271
        if self.rename_count >= self.max_renames:
275
281
        try:
276
282
            self.add()
277
283
        except dbus.exceptions.DBusException as error:
278
 
            logger.critical("DBusException: %s", error)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
279
285
            self.cleanup()
280
286
            os._exit(1)
281
287
        self.rename_count += 1
 
288
    
282
289
    def remove(self):
283
290
        """Derived from the Avahi example code"""
284
291
        if self.entry_group_state_changed_match is not None:
286
293
            self.entry_group_state_changed_match = None
287
294
        if self.group is not None:
288
295
            self.group.Reset()
 
296
    
289
297
    def add(self):
290
298
        """Derived from the Avahi example code"""
291
299
        self.remove()
308
316
            dbus.UInt16(self.port),
309
317
            avahi.string_array_to_txt_array(self.TXT))
310
318
        self.group.Commit()
 
319
    
311
320
    def entry_group_state_changed(self, state, error):
312
321
        """Derived from the Avahi example code"""
313
322
        logger.debug("Avahi entry group state change: %i", state)
320
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
321
330
            logger.critical("Avahi: Error in group state changed %s",
322
331
                            unicode(error))
323
 
            raise AvahiGroupError("State changed: %s"
324
 
                                  % unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
 
334
    
325
335
    def cleanup(self):
326
336
        """Derived from the Avahi example code"""
327
337
        if self.group is not None:
332
342
                pass
333
343
            self.group = None
334
344
        self.remove()
 
345
    
335
346
    def server_state_changed(self, state, error=None):
336
347
        """Derived from the Avahi example code"""
337
348
        logger.debug("Avahi server state change: %i", state)
356
367
                logger.debug("Unknown state: %r", state)
357
368
            else:
358
369
                logger.debug("Unknown state: %r: %r", state, error)
 
370
    
359
371
    def activate(self):
360
372
        """Derived from the Avahi example code"""
361
373
        if self.server is None:
368
380
                                 self.server_state_changed)
369
381
        self.server_state_changed(self.server.GetState())
370
382
 
 
383
 
371
384
class AvahiServiceToSyslog(AvahiService):
372
385
    def rename(self):
373
386
        """Add the new name to the syslog messages"""
374
387
        ret = AvahiService.rename(self)
375
388
        syslogger.setFormatter(logging.Formatter
376
 
                               ('Mandos (%s) [%%(process)d]:'
377
 
                                ' %%(levelname)s: %%(message)s'
378
 
                                % self.name))
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
379
392
        return ret
380
393
 
 
394
 
381
395
def timedelta_to_milliseconds(td):
382
396
    "Convert a datetime.timedelta() to milliseconds"
383
397
    return ((td.days * 24 * 60 * 60 * 1000)
384
398
            + (td.seconds * 1000)
385
399
            + (td.microseconds // 1000))
386
 
        
 
400
 
 
401
 
387
402
class Client(object):
388
403
    """A representation of a client host served by this server.
389
404
    
414
429
    last_checked_ok: datetime.datetime(); (UTC) or None
415
430
    last_checker_status: integer between 0 and 255 reflecting exit
416
431
                         status of last checker. -1 reflects crashed
417
 
                         checker, or None.
 
432
                         checker, -2 means no checker completed yet.
418
433
    last_enabled: datetime.datetime(); (UTC) or None
419
434
    name:       string; from the config file, used in log messages and
420
435
                        D-Bus identifiers
421
436
    secret:     bytestring; sent verbatim (over TLS) to client
422
437
    timeout:    datetime.timedelta(); How long from last_checked_ok
423
438
                                      until this client is disabled
424
 
    extended_timeout:   extra long timeout when password has been sent
 
439
    extended_timeout:   extra long timeout when secret has been sent
425
440
    runtime_expansions: Allowed attributes for runtime expansion.
426
441
    expires:    datetime.datetime(); time (UTC) when a client will be
427
442
                disabled, or None
 
443
    server_settings: The server_settings dict from main()
428
444
    """
429
445
    
430
446
    runtime_expansions = ("approval_delay", "approval_duration",
431
 
                          "created", "enabled", "fingerprint",
432
 
                          "host", "interval", "last_checked_ok",
 
447
                          "created", "enabled", "expires",
 
448
                          "fingerprint", "host", "interval",
 
449
                          "last_approval_request", "last_checked_ok",
433
450
                          "last_enabled", "name", "timeout")
434
 
    client_defaults = { "timeout": "5m",
435
 
                        "extended_timeout": "15m",
436
 
                        "interval": "2m",
 
451
    client_defaults = { "timeout": "PT5M",
 
452
                        "extended_timeout": "PT15M",
 
453
                        "interval": "PT2M",
437
454
                        "checker": "fping -q -- %%(host)s",
438
455
                        "host": "",
439
 
                        "approval_delay": "0s",
440
 
                        "approval_duration": "1s",
 
456
                        "approval_delay": "PT0S",
 
457
                        "approval_duration": "PT1S",
441
458
                        "approved_by_default": "True",
442
459
                        "enabled": "True",
443
460
                        }
456
473
    
457
474
    def approval_delay_milliseconds(self):
458
475
        return timedelta_to_milliseconds(self.approval_delay)
459
 
 
 
476
    
460
477
    @staticmethod
461
478
    def config_parser(config):
462
 
        """ Construct a new dict of client settings of this form:
 
479
        """Construct a new dict of client settings of this form:
463
480
        { client_name: {setting_name: value, ...}, ...}
464
 
        with exceptions for any special settings as defined above"""
 
481
        with exceptions for any special settings as defined above.
 
482
        NOTE: Must be a pure function. Must return the same result
 
483
        value given the same arguments.
 
484
        """
465
485
        settings = {}
466
486
        for client_name in config.sections():
467
487
            section = dict(config.items(client_name))
471
491
            # Reformat values from string types to Python types
472
492
            client["approved_by_default"] = config.getboolean(
473
493
                client_name, "approved_by_default")
474
 
            client["enabled"] = config.getboolean(client_name, "enabled")
 
494
            client["enabled"] = config.getboolean(client_name,
 
495
                                                  "enabled")
475
496
            
476
497
            client["fingerprint"] = (section["fingerprint"].upper()
477
498
                                     .replace(" ", ""))
483
504
                          "rb") as secfile:
484
505
                    client["secret"] = secfile.read()
485
506
            else:
486
 
                raise TypeError("No secret or secfile for section %s"
487
 
                                % section)
 
507
                raise TypeError("No secret or secfile for section {0}"
 
508
                                .format(section))
488
509
            client["timeout"] = string_to_delta(section["timeout"])
489
510
            client["extended_timeout"] = string_to_delta(
490
511
                section["extended_timeout"])
496
517
            client["checker_command"] = section["checker"]
497
518
            client["last_approval_request"] = None
498
519
            client["last_checked_ok"] = None
499
 
            client["last_checker_status"] = None
500
 
            if client["enabled"]:
501
 
                client["last_enabled"] = datetime.datetime.utcnow()
502
 
                client["expires"] = (datetime.datetime.utcnow()
503
 
                                     + client["timeout"])
504
 
            else:
505
 
                client["last_enabled"] = None
506
 
                client["expires"] = None
507
 
 
 
520
            client["last_checker_status"] = -2
 
521
        
508
522
        return settings
509
 
        
510
 
        
511
 
    def __init__(self, settings, name = None):
512
 
        """Note: the 'checker' key in 'config' sets the
513
 
        'checker_command' attribute and *not* the 'checker'
514
 
        attribute."""
 
523
    
 
524
    def __init__(self, settings, name = None, server_settings=None):
515
525
        self.name = name
 
526
        if server_settings is None:
 
527
            server_settings = {}
 
528
        self.server_settings = server_settings
516
529
        # adding all client settings
517
530
        for setting, value in settings.iteritems():
518
531
            setattr(self, setting, value)
519
532
        
 
533
        if self.enabled:
 
534
            if not hasattr(self, "last_enabled"):
 
535
                self.last_enabled = datetime.datetime.utcnow()
 
536
            if not hasattr(self, "expires"):
 
537
                self.expires = (datetime.datetime.utcnow()
 
538
                                + self.timeout)
 
539
        else:
 
540
            self.last_enabled = None
 
541
            self.expires = None
 
542
        
520
543
        logger.debug("Creating client %r", self.name)
521
544
        # Uppercase and remove spaces from fingerprint for later
522
545
        # comparison purposes with return value from the fingerprint()
523
546
        # function
524
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
525
 
        self.created = settings.get("created", datetime.datetime.utcnow())
526
 
 
 
548
        self.created = settings.get("created",
 
549
                                    datetime.datetime.utcnow())
 
550
        
527
551
        # attributes specific for this server instance
528
552
        self.checker = None
529
553
        self.checker_initiator_tag = None
557
581
        if getattr(self, "enabled", False):
558
582
            # Already enabled
559
583
            return
560
 
        self.send_changedstate()
561
584
        self.expires = datetime.datetime.utcnow() + self.timeout
562
585
        self.enabled = True
563
586
        self.last_enabled = datetime.datetime.utcnow()
564
587
        self.init_checker()
 
588
        self.send_changedstate()
565
589
    
566
590
    def disable(self, quiet=True):
567
591
        """Disable this client."""
568
592
        if not getattr(self, "enabled", False):
569
593
            return False
570
594
        if not quiet:
571
 
            self.send_changedstate()
572
 
        if not quiet:
573
595
            logger.info("Disabling client %s", self.name)
574
 
        if getattr(self, "disable_initiator_tag", False):
 
596
        if getattr(self, "disable_initiator_tag", None) is not None:
575
597
            gobject.source_remove(self.disable_initiator_tag)
576
598
            self.disable_initiator_tag = None
577
599
        self.expires = None
578
 
        if getattr(self, "checker_initiator_tag", False):
 
600
        if getattr(self, "checker_initiator_tag", None) is not None:
579
601
            gobject.source_remove(self.checker_initiator_tag)
580
602
            self.checker_initiator_tag = None
581
603
        self.stop_checker()
582
604
        self.enabled = False
 
605
        if not quiet:
 
606
            self.send_changedstate()
583
607
        # Do not run this again if called by a gobject.timeout_add
584
608
        return False
585
609
    
589
613
    def init_checker(self):
590
614
        # Schedule a new checker to be started an 'interval' from now,
591
615
        # and every interval from then on.
 
616
        if self.checker_initiator_tag is not None:
 
617
            gobject.source_remove(self.checker_initiator_tag)
592
618
        self.checker_initiator_tag = (gobject.timeout_add
593
619
                                      (self.interval_milliseconds(),
594
620
                                       self.start_checker))
595
621
        # Schedule a disable() when 'timeout' has passed
 
622
        if self.disable_initiator_tag is not None:
 
623
            gobject.source_remove(self.disable_initiator_tag)
596
624
        self.disable_initiator_tag = (gobject.timeout_add
597
625
                                   (self.timeout_milliseconds(),
598
626
                                    self.disable))
617
645
            logger.warning("Checker for %(name)s crashed?",
618
646
                           vars(self))
619
647
    
620
 
    def checked_ok(self, timeout=None):
621
 
        """Bump up the timeout for this client.
622
 
        
623
 
        This should only be called when the client has been seen,
624
 
        alive and well.
625
 
        """
 
648
    def checked_ok(self):
 
649
        """Assert that the client has been seen, alive and well."""
 
650
        self.last_checked_ok = datetime.datetime.utcnow()
 
651
        self.last_checker_status = 0
 
652
        self.bump_timeout()
 
653
    
 
654
    def bump_timeout(self, timeout=None):
 
655
        """Bump up the timeout for this client."""
626
656
        if timeout is None:
627
657
            timeout = self.timeout
628
 
        self.last_checked_ok = datetime.datetime.utcnow()
629
658
        if self.disable_initiator_tag is not None:
630
659
            gobject.source_remove(self.disable_initiator_tag)
 
660
            self.disable_initiator_tag = None
631
661
        if getattr(self, "enabled", False):
632
662
            self.disable_initiator_tag = (gobject.timeout_add
633
663
                                          (timedelta_to_milliseconds
643
673
        If a checker already exists, leave it running and do
644
674
        nothing."""
645
675
        # The reason for not killing a running checker is that if we
646
 
        # did that, then if a checker (for some reason) started
647
 
        # running slowly and taking more than 'interval' time, the
648
 
        # client would inevitably timeout, since no checker would get
649
 
        # a chance to run to completion.  If we instead leave running
 
676
        # did that, and if a checker (for some reason) started running
 
677
        # slowly and taking more than 'interval' time, then the client
 
678
        # would inevitably timeout, since no checker would get a
 
679
        # chance to run to completion.  If we instead leave running
650
680
        # checkers alone, the checker would have to take more time
651
681
        # than 'timeout' for the client to be disabled, which is as it
652
682
        # should be.
666
696
                                      self.current_checker_command)
667
697
        # Start a new checker if needed
668
698
        if self.checker is None:
 
699
            # Escape attributes for the shell
 
700
            escaped_attrs = dict(
 
701
                (attr, re.escape(unicode(getattr(self, attr))))
 
702
                for attr in
 
703
                self.runtime_expansions)
669
704
            try:
670
 
                # In case checker_command has exactly one % operator
671
 
                command = self.checker_command % self.host
672
 
            except TypeError:
673
 
                # Escape attributes for the shell
674
 
                escaped_attrs = dict(
675
 
                    (attr,
676
 
                     re.escape(unicode(str(getattr(self, attr, "")),
677
 
                                       errors=
678
 
                                       'replace')))
679
 
                    for attr in
680
 
                    self.runtime_expansions)
681
 
                
682
 
                try:
683
 
                    command = self.checker_command % escaped_attrs
684
 
                except TypeError as error:
685
 
                    logger.error('Could not format string "%s":'
686
 
                                 ' %s', self.checker_command, error)
687
 
                    return True # Try again later
 
705
                command = self.checker_command % escaped_attrs
 
706
            except TypeError as error:
 
707
                logger.error('Could not format string "%s"',
 
708
                             self.checker_command, exc_info=error)
 
709
                return True # Try again later
688
710
            self.current_checker_command = command
689
711
            try:
690
712
                logger.info("Starting checker %r for %s",
693
715
                # in normal mode, that is already done by daemon(),
694
716
                # and in debug mode we don't want to.  (Stdin is
695
717
                # always replaced by /dev/null.)
 
718
                # The exception is when not debugging but nevertheless
 
719
                # running in the foreground; use the previously
 
720
                # created wnull.
 
721
                popen_args = {}
 
722
                if (not self.server_settings["debug"]
 
723
                    and self.server_settings["foreground"]):
 
724
                    popen_args.update({"stdout": wnull,
 
725
                                       "stderr": wnull })
696
726
                self.checker = subprocess.Popen(command,
697
727
                                                close_fds=True,
698
 
                                                shell=True, cwd="/")
699
 
                self.checker_callback_tag = (gobject.child_watch_add
700
 
                                             (self.checker.pid,
701
 
                                              self.checker_callback,
702
 
                                              data=command))
703
 
                # The checker may have completed before the gobject
704
 
                # watch was added.  Check for this.
 
728
                                                shell=True, cwd="/",
 
729
                                                **popen_args)
 
730
            except OSError as error:
 
731
                logger.error("Failed to start subprocess",
 
732
                             exc_info=error)
 
733
                return True
 
734
            self.checker_callback_tag = (gobject.child_watch_add
 
735
                                         (self.checker.pid,
 
736
                                          self.checker_callback,
 
737
                                          data=command))
 
738
            # The checker may have completed before the gobject
 
739
            # watch was added.  Check for this.
 
740
            try:
705
741
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
706
 
                if pid:
707
 
                    gobject.source_remove(self.checker_callback_tag)
708
 
                    self.checker_callback(pid, status, command)
709
742
            except OSError as error:
710
 
                logger.error("Failed to start subprocess: %s",
711
 
                             error)
 
743
                if error.errno == errno.ECHILD:
 
744
                    # This should never happen
 
745
                    logger.error("Child process vanished",
 
746
                                 exc_info=error)
 
747
                    return True
 
748
                raise
 
749
            if pid:
 
750
                gobject.source_remove(self.checker_callback_tag)
 
751
                self.checker_callback(pid, status, command)
712
752
        # Re-run this periodically if run by gobject.timeout_add
713
753
        return True
714
754
    
721
761
            return
722
762
        logger.debug("Stopping checker for %(name)s", vars(self))
723
763
        try:
724
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
764
            self.checker.terminate()
725
765
            #time.sleep(0.5)
726
766
            #if self.checker.poll() is None:
727
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
767
            #    self.checker.kill()
728
768
        except OSError as error:
729
769
            if error.errno != errno.ESRCH: # No such process
730
770
                raise
747
787
    # "Set" method, so we fail early here:
748
788
    if byte_arrays and signature != "ay":
749
789
        raise ValueError("Byte arrays not supported for non-'ay'"
750
 
                         " signature %r" % signature)
 
790
                         " signature {0!r}".format(signature))
751
791
    def decorator(func):
752
792
        func._dbus_is_property = True
753
793
        func._dbus_interface = dbus_interface
761
801
    return decorator
762
802
 
763
803
 
 
804
def dbus_interface_annotations(dbus_interface):
 
805
    """Decorator for marking functions returning interface annotations
 
806
    
 
807
    Usage:
 
808
    
 
809
    @dbus_interface_annotations("org.example.Interface")
 
810
    def _foo(self):  # Function name does not matter
 
811
        return {"org.freedesktop.DBus.Deprecated": "true",
 
812
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
813
                    "false"}
 
814
    """
 
815
    def decorator(func):
 
816
        func._dbus_is_interface = True
 
817
        func._dbus_interface = dbus_interface
 
818
        func._dbus_name = dbus_interface
 
819
        return func
 
820
    return decorator
 
821
 
 
822
 
 
823
def dbus_annotations(annotations):
 
824
    """Decorator to annotate D-Bus methods, signals or properties
 
825
    Usage:
 
826
    
 
827
    @dbus_service_property("org.example.Interface", signature="b",
 
828
                           access="r")
 
829
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
830
                        "org.freedesktop.DBus.Property."
 
831
                        "EmitsChangedSignal": "false"})
 
832
    def Property_dbus_property(self):
 
833
        return dbus.Boolean(False)
 
834
    """
 
835
    def decorator(func):
 
836
        func._dbus_annotations = annotations
 
837
        return func
 
838
    return decorator
 
839
 
 
840
 
764
841
class DBusPropertyException(dbus.exceptions.DBusException):
765
842
    """A base class for D-Bus property-related exceptions
766
843
    """
789
866
    """
790
867
    
791
868
    @staticmethod
792
 
    def _is_dbus_property(obj):
793
 
        return getattr(obj, "_dbus_is_property", False)
 
869
    def _is_dbus_thing(thing):
 
870
        """Returns a function testing if an attribute is a D-Bus thing
 
871
        
 
872
        If called like _is_dbus_thing("method") it returns a function
 
873
        suitable for use as predicate to inspect.getmembers().
 
874
        """
 
875
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
876
                                   False)
794
877
    
795
 
    def _get_all_dbus_properties(self):
 
878
    def _get_all_dbus_things(self, thing):
796
879
        """Returns a generator of (name, attribute) pairs
797
880
        """
798
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
881
        return ((getattr(athing.__get__(self), "_dbus_name",
 
882
                         name),
 
883
                 athing.__get__(self))
799
884
                for cls in self.__class__.__mro__
800
 
                for name, prop in
801
 
                inspect.getmembers(cls, self._is_dbus_property))
 
885
                for name, athing in
 
886
                inspect.getmembers(cls,
 
887
                                   self._is_dbus_thing(thing)))
802
888
    
803
889
    def _get_dbus_property(self, interface_name, property_name):
804
890
        """Returns a bound method if one exists which is a D-Bus
806
892
        """
807
893
        for cls in  self.__class__.__mro__:
808
894
            for name, value in (inspect.getmembers
809
 
                                (cls, self._is_dbus_property)):
 
895
                                (cls,
 
896
                                 self._is_dbus_thing("property"))):
810
897
                if (value._dbus_name == property_name
811
898
                    and value._dbus_interface == interface_name):
812
899
                    return value.__get__(self)
841
928
            # signatures other than "ay".
842
929
            if prop._dbus_signature != "ay":
843
930
                raise ValueError
844
 
            value = dbus.ByteArray(''.join(unichr(byte)
845
 
                                           for byte in value))
 
931
            value = dbus.ByteArray(b''.join(chr(byte)
 
932
                                            for byte in value))
846
933
        prop(value)
847
934
    
848
935
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
854
941
        Note: Will not include properties with access="write".
855
942
        """
856
943
        properties = {}
857
 
        for name, prop in self._get_all_dbus_properties():
 
944
        for name, prop in self._get_all_dbus_things("property"):
858
945
            if (interface_name
859
946
                and interface_name != prop._dbus_interface):
860
947
                # Interface non-empty but did not match
875
962
                         path_keyword='object_path',
876
963
                         connection_keyword='connection')
877
964
    def Introspect(self, object_path, connection):
878
 
        """Standard D-Bus method, overloaded to insert property tags.
 
965
        """Overloading of standard D-Bus method.
 
966
        
 
967
        Inserts property tags and interface annotation tags.
879
968
        """
880
969
        xmlstring = dbus.service.Object.Introspect(self, object_path,
881
970
                                                   connection)
888
977
                e.setAttribute("access", prop._dbus_access)
889
978
                return e
890
979
            for if_tag in document.getElementsByTagName("interface"):
 
980
                # Add property tags
891
981
                for tag in (make_tag(document, name, prop)
892
982
                            for name, prop
893
 
                            in self._get_all_dbus_properties()
 
983
                            in self._get_all_dbus_things("property")
894
984
                            if prop._dbus_interface
895
985
                            == if_tag.getAttribute("name")):
896
986
                    if_tag.appendChild(tag)
 
987
                # Add annotation tags
 
988
                for typ in ("method", "signal", "property"):
 
989
                    for tag in if_tag.getElementsByTagName(typ):
 
990
                        annots = dict()
 
991
                        for name, prop in (self.
 
992
                                           _get_all_dbus_things(typ)):
 
993
                            if (name == tag.getAttribute("name")
 
994
                                and prop._dbus_interface
 
995
                                == if_tag.getAttribute("name")):
 
996
                                annots.update(getattr
 
997
                                              (prop,
 
998
                                               "_dbus_annotations",
 
999
                                               {}))
 
1000
                        for name, value in annots.iteritems():
 
1001
                            ann_tag = document.createElement(
 
1002
                                "annotation")
 
1003
                            ann_tag.setAttribute("name", name)
 
1004
                            ann_tag.setAttribute("value", value)
 
1005
                            tag.appendChild(ann_tag)
 
1006
                # Add interface annotation tags
 
1007
                for annotation, value in dict(
 
1008
                    itertools.chain.from_iterable(
 
1009
                        annotations().iteritems()
 
1010
                        for name, annotations in
 
1011
                        self._get_all_dbus_things("interface")
 
1012
                        if name == if_tag.getAttribute("name")
 
1013
                        )).iteritems():
 
1014
                    ann_tag = document.createElement("annotation")
 
1015
                    ann_tag.setAttribute("name", annotation)
 
1016
                    ann_tag.setAttribute("value", value)
 
1017
                    if_tag.appendChild(ann_tag)
897
1018
                # Add the names to the return values for the
898
1019
                # "org.freedesktop.DBus.Properties" methods
899
1020
                if (if_tag.getAttribute("name")
914
1035
        except (AttributeError, xml.dom.DOMException,
915
1036
                xml.parsers.expat.ExpatError) as error:
916
1037
            logger.error("Failed to override Introspection method",
917
 
                         error)
 
1038
                         exc_info=error)
918
1039
        return xmlstring
919
1040
 
920
1041
 
921
 
def datetime_to_dbus (dt, variant_level=0):
 
1042
def datetime_to_dbus(dt, variant_level=0):
922
1043
    """Convert a UTC datetime.datetime() to a D-Bus type."""
923
1044
    if dt is None:
924
1045
        return dbus.String("", variant_level = variant_level)
926
1047
                       variant_level=variant_level)
927
1048
 
928
1049
 
929
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
930
 
                                  .__metaclass__):
931
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
932
 
    will add additional D-Bus attributes matching a certain pattern.
 
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1051
    """A class decorator; applied to a subclass of
 
1052
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1053
    interface names according to the "alt_interface_names" mapping.
 
1054
    Usage:
 
1055
    
 
1056
    @alternate_dbus_interfaces({"org.example.Interface":
 
1057
                                    "net.example.AlternateInterface"})
 
1058
    class SampleDBusObject(dbus.service.Object):
 
1059
        @dbus.service.method("org.example.Interface")
 
1060
        def SampleDBusMethod():
 
1061
            pass
 
1062
    
 
1063
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1064
    reachable via two interfaces: "org.example.Interface" and
 
1065
    "net.example.AlternateInterface", the latter of which will have
 
1066
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1067
    "true", unless "deprecate" is passed with a False value.
 
1068
    
 
1069
    This works for methods and signals, and also for D-Bus properties
 
1070
    (from DBusObjectWithProperties) and interfaces (from the
 
1071
    dbus_interface_annotations decorator).
933
1072
    """
934
 
    def __new__(mcs, name, bases, attr):
935
 
        # Go through all the base classes which could have D-Bus
936
 
        # methods, signals, or properties in them
937
 
        for base in (b for b in bases
938
 
                     if issubclass(b, dbus.service.Object)):
939
 
            # Go though all attributes of the base class
940
 
            for attrname, attribute in inspect.getmembers(base):
 
1073
    def wrapper(cls):
 
1074
        for orig_interface_name, alt_interface_name in (
 
1075
            alt_interface_names.iteritems()):
 
1076
            attr = {}
 
1077
            interface_names = set()
 
1078
            # Go though all attributes of the class
 
1079
            for attrname, attribute in inspect.getmembers(cls):
941
1080
                # Ignore non-D-Bus attributes, and D-Bus attributes
942
1081
                # with the wrong interface name
943
1082
                if (not hasattr(attribute, "_dbus_interface")
944
1083
                    or not attribute._dbus_interface
945
 
                    .startswith("se.recompile.Mandos")):
 
1084
                    .startswith(orig_interface_name)):
946
1085
                    continue
947
1086
                # Create an alternate D-Bus interface name based on
948
1087
                # the current name
949
1088
                alt_interface = (attribute._dbus_interface
950
 
                                 .replace("se.recompile.Mandos",
951
 
                                          "se.bsnet.fukt.Mandos"))
 
1089
                                 .replace(orig_interface_name,
 
1090
                                          alt_interface_name))
 
1091
                interface_names.add(alt_interface)
952
1092
                # Is this a D-Bus signal?
953
1093
                if getattr(attribute, "_dbus_is_signal", False):
954
 
                    # Extract the original non-method function by
955
 
                    # black magic
 
1094
                    # Extract the original non-method undecorated
 
1095
                    # function by black magic
956
1096
                    nonmethod_func = (dict(
957
1097
                            zip(attribute.func_code.co_freevars,
958
1098
                                attribute.__closure__))["func"]
969
1109
                                nonmethod_func.func_name,
970
1110
                                nonmethod_func.func_defaults,
971
1111
                                nonmethod_func.func_closure)))
 
1112
                    # Copy annotations, if any
 
1113
                    try:
 
1114
                        new_function._dbus_annotations = (
 
1115
                            dict(attribute._dbus_annotations))
 
1116
                    except AttributeError:
 
1117
                        pass
972
1118
                    # Define a creator of a function to call both the
973
 
                    # old and new functions, so both the old and new
974
 
                    # signals gets sent when the function is called
 
1119
                    # original and alternate functions, so both the
 
1120
                    # original and alternate signals gets sent when
 
1121
                    # the function is called
975
1122
                    def fixscope(func1, func2):
976
1123
                        """This function is a scope container to pass
977
1124
                        func1 and func2 to the "call_both" function
984
1131
                        return call_both
985
1132
                    # Create the "call_both" function and add it to
986
1133
                    # the class
987
 
                    attr[attrname] = fixscope(attribute,
988
 
                                              new_function)
 
1134
                    attr[attrname] = fixscope(attribute, new_function)
989
1135
                # Is this a D-Bus method?
990
1136
                elif getattr(attribute, "_dbus_is_method", False):
991
1137
                    # Create a new, but exactly alike, function
1002
1148
                                        attribute.func_name,
1003
1149
                                        attribute.func_defaults,
1004
1150
                                        attribute.func_closure)))
 
1151
                    # Copy annotations, if any
 
1152
                    try:
 
1153
                        attr[attrname]._dbus_annotations = (
 
1154
                            dict(attribute._dbus_annotations))
 
1155
                    except AttributeError:
 
1156
                        pass
1005
1157
                # Is this a D-Bus property?
1006
1158
                elif getattr(attribute, "_dbus_is_property", False):
1007
1159
                    # Create a new, but exactly alike, function
1021
1173
                                        attribute.func_name,
1022
1174
                                        attribute.func_defaults,
1023
1175
                                        attribute.func_closure)))
1024
 
        return type.__new__(mcs, name, bases, attr)
1025
 
 
1026
 
 
 
1176
                    # Copy annotations, if any
 
1177
                    try:
 
1178
                        attr[attrname]._dbus_annotations = (
 
1179
                            dict(attribute._dbus_annotations))
 
1180
                    except AttributeError:
 
1181
                        pass
 
1182
                # Is this a D-Bus interface?
 
1183
                elif getattr(attribute, "_dbus_is_interface", False):
 
1184
                    # Create a new, but exactly alike, function
 
1185
                    # object.  Decorate it to be a new D-Bus interface
 
1186
                    # with the alternate D-Bus interface name.  Add it
 
1187
                    # to the class.
 
1188
                    attr[attrname] = (dbus_interface_annotations
 
1189
                                      (alt_interface)
 
1190
                                      (types.FunctionType
 
1191
                                       (attribute.func_code,
 
1192
                                        attribute.func_globals,
 
1193
                                        attribute.func_name,
 
1194
                                        attribute.func_defaults,
 
1195
                                        attribute.func_closure)))
 
1196
            if deprecate:
 
1197
                # Deprecate all alternate interfaces
 
1198
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1199
                for interface_name in interface_names:
 
1200
                    @dbus_interface_annotations(interface_name)
 
1201
                    def func(self):
 
1202
                        return { "org.freedesktop.DBus.Deprecated":
 
1203
                                     "true" }
 
1204
                    # Find an unused name
 
1205
                    for aname in (iname.format(i)
 
1206
                                  for i in itertools.count()):
 
1207
                        if aname not in attr:
 
1208
                            attr[aname] = func
 
1209
                            break
 
1210
            if interface_names:
 
1211
                # Replace the class with a new subclass of it with
 
1212
                # methods, signals, etc. as created above.
 
1213
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1214
                           (cls,), attr)
 
1215
        return cls
 
1216
    return wrapper
 
1217
 
 
1218
 
 
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1220
                                "se.bsnet.fukt.Mandos"})
1027
1221
class ClientDBus(Client, DBusObjectWithProperties):
1028
1222
    """A Client class using D-Bus
1029
1223
    
1040
1234
    def __init__(self, bus = None, *args, **kwargs):
1041
1235
        self.bus = bus
1042
1236
        Client.__init__(self, *args, **kwargs)
1043
 
        self._approvals_pending = 0
1044
 
        
1045
 
        self._approvals_pending = 0
1046
1237
        # Only now, when this client is initialized, can it show up on
1047
1238
        # the D-Bus
1048
1239
        client_object_name = unicode(self.name).translate(
1052
1243
                                 ("/clients/" + client_object_name))
1053
1244
        DBusObjectWithProperties.__init__(self, self.bus,
1054
1245
                                          self.dbus_object_path)
1055
 
        
 
1246
    
1056
1247
    def notifychangeproperty(transform_func,
1057
1248
                             dbus_name, type_func=lambda x: x,
1058
1249
                             variant_level=1):
1081
1272
        
1082
1273
        return property(lambda self: getattr(self, attrname), setter)
1083
1274
    
1084
 
    
1085
1275
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1086
1276
    approvals_pending = notifychangeproperty(dbus.Boolean,
1087
1277
                                             "ApprovalPending",
1094
1284
                                       checker is not None)
1095
1285
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1096
1286
                                           "LastCheckedOK")
 
1287
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1288
                                               "LastCheckerStatus")
1097
1289
    last_approval_request = notifychangeproperty(
1098
1290
        datetime_to_dbus, "LastApprovalRequest")
1099
1291
    approved_by_default = notifychangeproperty(dbus.Boolean,
1167
1359
        return False
1168
1360
    
1169
1361
    def approve(self, value=True):
1170
 
        self.send_changedstate()
1171
1362
        self.approved = value
1172
1363
        gobject.timeout_add(timedelta_to_milliseconds
1173
1364
                            (self.approval_duration),
1174
1365
                            self._reset_approved)
1175
 
    
 
1366
        self.send_changedstate()
1176
1367
    
1177
1368
    ## D-Bus methods, signals & properties
1178
1369
    _interface = "se.recompile.Mandos.Client"
1179
1370
    
 
1371
    ## Interfaces
 
1372
    
 
1373
    @dbus_interface_annotations(_interface)
 
1374
    def _foo(self):
 
1375
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1376
                     "false"}
 
1377
    
1180
1378
    ## Signals
1181
1379
    
1182
1380
    # CheckerCompleted - signal
1218
1416
        "D-Bus signal"
1219
1417
        return self.need_approval()
1220
1418
    
1221
 
    # NeRwequest - signal
1222
 
    @dbus.service.signal(_interface, signature="s")
1223
 
    def NewRequest(self, ip):
1224
 
        """D-Bus signal
1225
 
        Is sent after a client request a password.
1226
 
        """
1227
 
        pass
1228
 
    
1229
1419
    ## Methods
1230
1420
    
1231
1421
    # Approve - method
1341
1531
            return
1342
1532
        return datetime_to_dbus(self.last_checked_ok)
1343
1533
    
 
1534
    # LastCheckerStatus - property
 
1535
    @dbus_service_property(_interface, signature="n",
 
1536
                           access="read")
 
1537
    def LastCheckerStatus_dbus_property(self):
 
1538
        return dbus.Int16(self.last_checker_status)
 
1539
    
1344
1540
    # Expires - property
1345
1541
    @dbus_service_property(_interface, signature="s", access="read")
1346
1542
    def Expires_dbus_property(self):
1357
1553
    def Timeout_dbus_property(self, value=None):
1358
1554
        if value is None:       # get
1359
1555
            return dbus.UInt64(self.timeout_milliseconds())
 
1556
        old_timeout = self.timeout
1360
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
1361
 
        if getattr(self, "disable_initiator_tag", None) is None:
1362
 
            return
1363
 
        # Reschedule timeout
1364
 
        gobject.source_remove(self.disable_initiator_tag)
1365
 
        self.disable_initiator_tag = None
1366
 
        self.expires = None
1367
 
        time_to_die = timedelta_to_milliseconds((self
1368
 
                                                 .last_checked_ok
1369
 
                                                 + self.timeout)
1370
 
                                                - datetime.datetime
1371
 
                                                .utcnow())
1372
 
        if time_to_die <= 0:
1373
 
            # The timeout has passed
1374
 
            self.disable()
1375
 
        else:
1376
 
            self.expires = (datetime.datetime.utcnow()
1377
 
                            + datetime.timedelta(milliseconds =
1378
 
                                                 time_to_die))
1379
 
            self.disable_initiator_tag = (gobject.timeout_add
1380
 
                                          (time_to_die, self.disable))
 
1558
        # Reschedule disabling
 
1559
        if self.enabled:
 
1560
            now = datetime.datetime.utcnow()
 
1561
            self.expires += self.timeout - old_timeout
 
1562
            if self.expires <= now:
 
1563
                # The timeout has passed
 
1564
                self.disable()
 
1565
            else:
 
1566
                if (getattr(self, "disable_initiator_tag", None)
 
1567
                    is None):
 
1568
                    return
 
1569
                gobject.source_remove(self.disable_initiator_tag)
 
1570
                self.disable_initiator_tag = (
 
1571
                    gobject.timeout_add(
 
1572
                        timedelta_to_milliseconds(self.expires - now),
 
1573
                        self.disable))
1381
1574
    
1382
1575
    # ExtendedTimeout - property
1383
1576
    @dbus_service_property(_interface, signature="t",
1462
1655
        self._pipe.send(('setattr', name, value))
1463
1656
 
1464
1657
 
1465
 
class ClientDBusTransitional(ClientDBus):
1466
 
    __metaclass__ = AlternateDBusNamesMetaclass
1467
 
 
1468
 
 
1469
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
1470
1659
    """A class to handle client connections.
1471
1660
    
1539
1728
                except KeyError:
1540
1729
                    return
1541
1730
                
1542
 
                if self.server.use_dbus:
1543
 
                    # Emit D-Bus signal
1544
 
                    client.NewRequest(str(self.client_address))
1545
 
                
1546
1731
                if client.approval_delay:
1547
1732
                    delay = client.approval_delay
1548
1733
                    client.approvals_pending += 1
1579
1764
                    #wait until timeout or approved
1580
1765
                    time = datetime.datetime.now()
1581
1766
                    client.changedstate.acquire()
1582
 
                    (client.changedstate.wait
1583
 
                     (float(client.timedelta_to_milliseconds(delay)
1584
 
                            / 1000)))
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1585
1770
                    client.changedstate.release()
1586
1771
                    time2 = datetime.datetime.now()
1587
1772
                    if (time2 - time) >= delay:
1603
1788
                    try:
1604
1789
                        sent = session.send(client.secret[sent_size:])
1605
1790
                    except gnutls.errors.GNUTLSError as error:
1606
 
                        logger.warning("gnutls send failed")
 
1791
                        logger.warning("gnutls send failed",
 
1792
                                       exc_info=error)
1607
1793
                        return
1608
1794
                    logger.debug("Sent: %d, remaining: %d",
1609
1795
                                 sent, len(client.secret)
1612
1798
                
1613
1799
                logger.info("Sending secret to %s", client.name)
1614
1800
                # bump the timeout using extended_timeout
1615
 
                client.checked_ok(client.extended_timeout)
 
1801
                client.bump_timeout(client.extended_timeout)
1616
1802
                if self.server.use_dbus:
1617
1803
                    # Emit D-Bus signal
1618
1804
                    client.GotSecret()
1623
1809
                try:
1624
1810
                    session.bye()
1625
1811
                except gnutls.errors.GNUTLSError as error:
1626
 
                    logger.warning("GnuTLS bye failed")
 
1812
                    logger.warning("GnuTLS bye failed",
 
1813
                                   exc_info=error)
1627
1814
    
1628
1815
    @staticmethod
1629
1816
    def peer_certificate(session):
1701
1888
    def process_request(self, request, address):
1702
1889
        """Start a new process to process the request."""
1703
1890
        proc = multiprocessing.Process(target = self.sub_process_main,
1704
 
                                       args = (request,
1705
 
                                               address))
 
1891
                                       args = (request, address))
1706
1892
        proc.start()
1707
1893
        return proc
1708
1894
 
1736
1922
        use_ipv6:       Boolean; to use IPv6 or not
1737
1923
    """
1738
1924
    def __init__(self, server_address, RequestHandlerClass,
1739
 
                 interface=None, use_ipv6=True):
 
1925
                 interface=None, use_ipv6=True, socketfd=None):
 
1926
        """If socketfd is set, use that file descriptor instead of
 
1927
        creating a new one with socket.socket().
 
1928
        """
1740
1929
        self.interface = interface
1741
1930
        if use_ipv6:
1742
1931
            self.address_family = socket.AF_INET6
 
1932
        if socketfd is not None:
 
1933
            # Save the file descriptor
 
1934
            self.socketfd = socketfd
 
1935
            # Save the original socket.socket() function
 
1936
            self.socket_socket = socket.socket
 
1937
            # To implement --socket, we monkey patch socket.socket.
 
1938
            # 
 
1939
            # (When socketserver.TCPServer is a new-style class, we
 
1940
            # could make self.socket into a property instead of monkey
 
1941
            # patching socket.socket.)
 
1942
            # 
 
1943
            # Create a one-time-only replacement for socket.socket()
 
1944
            @functools.wraps(socket.socket)
 
1945
            def socket_wrapper(*args, **kwargs):
 
1946
                # Restore original function so subsequent calls are
 
1947
                # not affected.
 
1948
                socket.socket = self.socket_socket
 
1949
                del self.socket_socket
 
1950
                # This time only, return a new socket object from the
 
1951
                # saved file descriptor.
 
1952
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1953
            # Replace socket.socket() function with wrapper
 
1954
            socket.socket = socket_wrapper
 
1955
        # The socketserver.TCPServer.__init__ will call
 
1956
        # socket.socket(), which might be our replacement,
 
1957
        # socket_wrapper(), if socketfd was set.
1743
1958
        socketserver.TCPServer.__init__(self, server_address,
1744
1959
                                        RequestHandlerClass)
 
1960
    
1745
1961
    def server_bind(self):
1746
1962
        """This overrides the normal server_bind() function
1747
1963
        to bind to an interface if one was specified, and also NOT to
1755
1971
                try:
1756
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
1757
1973
                                           SO_BINDTODEVICE,
1758
 
                                           str(self.interface
1759
 
                                               + '\0'))
 
1974
                                           str(self.interface + '\0'))
1760
1975
                except socket.error as error:
1761
 
                    if error[0] == errno.EPERM:
1762
 
                        logger.error("No permission to"
1763
 
                                     " bind to interface %s",
1764
 
                                     self.interface)
1765
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1976
                    if error.errno == errno.EPERM:
 
1977
                        logger.error("No permission to bind to"
 
1978
                                     " interface %s", self.interface)
 
1979
                    elif error.errno == errno.ENOPROTOOPT:
1766
1980
                        logger.error("SO_BINDTODEVICE not available;"
1767
1981
                                     " cannot bind to interface %s",
1768
1982
                                     self.interface)
 
1983
                    elif error.errno == errno.ENODEV:
 
1984
                        logger.error("Interface %s does not exist,"
 
1985
                                     " cannot bind", self.interface)
1769
1986
                    else:
1770
1987
                        raise
1771
1988
        # Only bind(2) the socket if we really need to.
1774
1991
                if self.address_family == socket.AF_INET6:
1775
1992
                    any_address = "::" # in6addr_any
1776
1993
                else:
1777
 
                    any_address = socket.INADDR_ANY
 
1994
                    any_address = "0.0.0.0" # INADDR_ANY
1778
1995
                self.server_address = (any_address,
1779
1996
                                       self.server_address[1])
1780
1997
            elif not self.server_address[1]:
1801
2018
    """
1802
2019
    def __init__(self, server_address, RequestHandlerClass,
1803
2020
                 interface=None, use_ipv6=True, clients=None,
1804
 
                 gnutls_priority=None, use_dbus=True):
 
2021
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1805
2022
        self.enabled = False
1806
2023
        self.clients = clients
1807
2024
        if self.clients is None:
1811
2028
        IPv6_TCPServer.__init__(self, server_address,
1812
2029
                                RequestHandlerClass,
1813
2030
                                interface = interface,
1814
 
                                use_ipv6 = use_ipv6)
 
2031
                                use_ipv6 = use_ipv6,
 
2032
                                socketfd = socketfd)
1815
2033
    def server_activate(self):
1816
2034
        if self.enabled:
1817
2035
            return socketserver.TCPServer.server_activate(self)
1830
2048
    
1831
2049
    def handle_ipc(self, source, condition, parent_pipe=None,
1832
2050
                   proc = None, client_object=None):
1833
 
        condition_names = {
1834
 
            gobject.IO_IN: "IN",   # There is data to read.
1835
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1836
 
                                    # blocking).
1837
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1838
 
            gobject.IO_ERR: "ERR", # Error condition.
1839
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1840
 
                                    # broken, usually for pipes and
1841
 
                                    # sockets).
1842
 
            }
1843
 
        conditions_string = ' | '.join(name
1844
 
                                       for cond, name in
1845
 
                                       condition_names.iteritems()
1846
 
                                       if cond & condition)
1847
2051
        # error, or the other end of multiprocessing.Pipe has closed
1848
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2052
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1849
2053
            # Wait for other process to exit
1850
2054
            proc.join()
1851
2055
            return False
1909
2113
        return True
1910
2114
 
1911
2115
 
 
2116
def rfc3339_duration_to_delta(duration):
 
2117
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2118
    
 
2119
    >>> rfc3339_duration_to_delta("P7D")
 
2120
    datetime.timedelta(7)
 
2121
    >>> rfc3339_duration_to_delta("PT60S")
 
2122
    datetime.timedelta(0, 60)
 
2123
    >>> rfc3339_duration_to_delta("PT60M")
 
2124
    datetime.timedelta(0, 3600)
 
2125
    >>> rfc3339_duration_to_delta("PT24H")
 
2126
    datetime.timedelta(1)
 
2127
    >>> rfc3339_duration_to_delta("P1W")
 
2128
    datetime.timedelta(7)
 
2129
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2130
    datetime.timedelta(0, 330)
 
2131
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2132
    datetime.timedelta(1, 200)
 
2133
    """
 
2134
    
 
2135
    # Parsing an RFC 3339 duration with regular expressions is not
 
2136
    # possible - there would have to be multiple places for the same
 
2137
    # values, like seconds.  The current code, while more esoteric, is
 
2138
    # cleaner without depending on a parsing library.  If Python had a
 
2139
    # built-in library for parsing we would use it, but we'd like to
 
2140
    # avoid excessive use of external libraries.
 
2141
    
 
2142
    # New type for defining tokens, syntax, and semantics all-in-one
 
2143
    Token = collections.namedtuple("Token",
 
2144
                                   ("regexp", # To match token; if
 
2145
                                              # "value" is not None,
 
2146
                                              # must have a "group"
 
2147
                                              # containing digits
 
2148
                                    "value",  # datetime.timedelta or
 
2149
                                              # None
 
2150
                                    "followers")) # Tokens valid after
 
2151
                                                  # this token
 
2152
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2153
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2154
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2155
    token_second = Token(re.compile(r"(\d+)S"),
 
2156
                         datetime.timedelta(seconds=1),
 
2157
                         frozenset((token_end,)))
 
2158
    token_minute = Token(re.compile(r"(\d+)M"),
 
2159
                         datetime.timedelta(minutes=1),
 
2160
                         frozenset((token_second, token_end)))
 
2161
    token_hour = Token(re.compile(r"(\d+)H"),
 
2162
                       datetime.timedelta(hours=1),
 
2163
                       frozenset((token_minute, token_end)))
 
2164
    token_time = Token(re.compile(r"T"),
 
2165
                       None,
 
2166
                       frozenset((token_hour, token_minute,
 
2167
                                  token_second)))
 
2168
    token_day = Token(re.compile(r"(\d+)D"),
 
2169
                      datetime.timedelta(days=1),
 
2170
                      frozenset((token_time, token_end)))
 
2171
    token_month = Token(re.compile(r"(\d+)M"),
 
2172
                        datetime.timedelta(weeks=4),
 
2173
                        frozenset((token_day, token_end)))
 
2174
    token_year = Token(re.compile(r"(\d+)Y"),
 
2175
                       datetime.timedelta(weeks=52),
 
2176
                       frozenset((token_month, token_end)))
 
2177
    token_week = Token(re.compile(r"(\d+)W"),
 
2178
                       datetime.timedelta(weeks=1),
 
2179
                       frozenset((token_end,)))
 
2180
    token_duration = Token(re.compile(r"P"), None,
 
2181
                           frozenset((token_year, token_month,
 
2182
                                      token_day, token_time,
 
2183
                                      token_week))),
 
2184
    # Define starting values
 
2185
    value = datetime.timedelta() # Value so far
 
2186
    found_token = None
 
2187
    followers = frozenset(token_duration,) # Following valid tokens
 
2188
    s = duration                # String left to parse
 
2189
    # Loop until end token is found
 
2190
    while found_token is not token_end:
 
2191
        # Search for any currently valid tokens
 
2192
        for token in followers:
 
2193
            match = token.regexp.match(s)
 
2194
            if match is not None:
 
2195
                # Token found
 
2196
                if token.value is not None:
 
2197
                    # Value found, parse digits
 
2198
                    factor = int(match.group(1), 10)
 
2199
                    # Add to value so far
 
2200
                    value += factor * token.value
 
2201
                # Strip token from string
 
2202
                s = token.regexp.sub("", s, 1)
 
2203
                # Go to found token
 
2204
                found_token = token
 
2205
                # Set valid next tokens
 
2206
                followers = found_token.followers
 
2207
                break
 
2208
        else:
 
2209
            # No currently valid tokens were found
 
2210
            raise ValueError("Invalid RFC 3339 duration")
 
2211
    # End token found
 
2212
    return value
 
2213
 
 
2214
 
1912
2215
def string_to_delta(interval):
1913
2216
    """Parse a string and return a datetime.timedelta
1914
2217
    
1925
2228
    >>> string_to_delta('5m 30s')
1926
2229
    datetime.timedelta(0, 330)
1927
2230
    """
 
2231
    
 
2232
    try:
 
2233
        return rfc3339_duration_to_delta(interval)
 
2234
    except ValueError:
 
2235
        pass
 
2236
    
1928
2237
    timevalue = datetime.timedelta(0)
1929
2238
    for s in interval.split():
1930
2239
        try:
1941
2250
            elif suffix == "w":
1942
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1943
2252
            else:
1944
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2253
                raise ValueError("Unknown suffix {0!r}"
 
2254
                                 .format(suffix))
1945
2255
        except (ValueError, IndexError) as e:
1946
2256
            raise ValueError(*(e.args))
1947
2257
        timevalue += delta
1961
2271
        sys.exit()
1962
2272
    if not noclose:
1963
2273
        # Close all standard open file descriptors
1964
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1965
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1966
2276
            raise OSError(errno.ENODEV,
1967
 
                          "%s not a character device"
1968
 
                          % os.path.devnull)
 
2277
                          "{0} not a character device"
 
2278
                          .format(os.devnull))
1969
2279
        os.dup2(null, sys.stdin.fileno())
1970
2280
        os.dup2(null, sys.stdout.fileno())
1971
2281
        os.dup2(null, sys.stderr.fileno())
1980
2290
    
1981
2291
    parser = argparse.ArgumentParser()
1982
2292
    parser.add_argument("-v", "--version", action="version",
1983
 
                        version = "%%(prog)s %s" % version,
 
2293
                        version = "%(prog)s {0}".format(version),
1984
2294
                        help="show version number and exit")
1985
2295
    parser.add_argument("-i", "--interface", metavar="IF",
1986
2296
                        help="Bind to interface IF")
1992
2302
                        help="Run self-test")
1993
2303
    parser.add_argument("--debug", action="store_true",
1994
2304
                        help="Debug mode; run in foreground and log"
1995
 
                        " to terminal")
 
2305
                        " to terminal", default=None)
1996
2306
    parser.add_argument("--debuglevel", metavar="LEVEL",
1997
2307
                        help="Debug level for stdout output")
1998
2308
    parser.add_argument("--priority", help="GnuTLS"
2005
2315
                        " files")
2006
2316
    parser.add_argument("--no-dbus", action="store_false",
2007
2317
                        dest="use_dbus", help="Do not provide D-Bus"
2008
 
                        " system bus interface")
 
2318
                        " system bus interface", default=None)
2009
2319
    parser.add_argument("--no-ipv6", action="store_false",
2010
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2320
                        dest="use_ipv6", help="Do not use IPv6",
 
2321
                        default=None)
2011
2322
    parser.add_argument("--no-restore", action="store_false",
2012
2323
                        dest="restore", help="Do not restore stored"
2013
 
                        " state")
 
2324
                        " state", default=None)
 
2325
    parser.add_argument("--socket", type=int,
 
2326
                        help="Specify a file descriptor to a network"
 
2327
                        " socket to use instead of creating one")
2014
2328
    parser.add_argument("--statedir", metavar="DIR",
2015
2329
                        help="Directory to save/restore state in")
 
2330
    parser.add_argument("--foreground", action="store_true",
 
2331
                        help="Run in foreground", default=None)
2016
2332
    
2017
2333
    options = parser.parse_args()
2018
2334
    
2027
2343
                        "port": "",
2028
2344
                        "debug": "False",
2029
2345
                        "priority":
2030
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2031
2347
                        "servicename": "Mandos",
2032
2348
                        "use_dbus": "True",
2033
2349
                        "use_ipv6": "True",
2034
2350
                        "debuglevel": "",
2035
2351
                        "restore": "True",
2036
 
                        "statedir": "/var/lib/mandos"
 
2352
                        "socket": "",
 
2353
                        "statedir": "/var/lib/mandos",
 
2354
                        "foreground": "False",
2037
2355
                        }
2038
2356
    
2039
2357
    # Parse config file for server-global settings
2044
2362
    # Convert the SafeConfigParser object to a dict
2045
2363
    server_settings = server_config.defaults()
2046
2364
    # Use the appropriate methods on the non-string config options
2047
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2365
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2048
2366
        server_settings[option] = server_config.getboolean("DEFAULT",
2049
2367
                                                           option)
2050
2368
    if server_settings["port"]:
2051
2369
        server_settings["port"] = server_config.getint("DEFAULT",
2052
2370
                                                       "port")
 
2371
    if server_settings["socket"]:
 
2372
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2373
                                                         "socket")
 
2374
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2375
        # over with an opened os.devnull.  But we don't want this to
 
2376
        # happen with a supplied network socket.
 
2377
        if 0 <= server_settings["socket"] <= 2:
 
2378
            server_settings["socket"] = os.dup(server_settings
 
2379
                                               ["socket"])
2053
2380
    del server_config
2054
2381
    
2055
2382
    # Override the settings from the config file with command line
2057
2384
    for option in ("interface", "address", "port", "debug",
2058
2385
                   "priority", "servicename", "configdir",
2059
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2060
 
                   "statedir"):
 
2387
                   "statedir", "socket", "foreground"):
2061
2388
        value = getattr(options, option)
2062
2389
        if value is not None:
2063
2390
            server_settings[option] = value
2066
2393
    for option in server_settings.keys():
2067
2394
        if type(server_settings[option]) is str:
2068
2395
            server_settings[option] = unicode(server_settings[option])
 
2396
    # Force all boolean options to be boolean
 
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2398
                   "foreground"):
 
2399
        server_settings[option] = bool(server_settings[option])
 
2400
    # Debug implies foreground
 
2401
    if server_settings["debug"]:
 
2402
        server_settings["foreground"] = True
2069
2403
    # Now we have our good server settings in "server_settings"
2070
2404
    
2071
2405
    ##################################################################
2077
2411
    use_ipv6 = server_settings["use_ipv6"]
2078
2412
    stored_state_path = os.path.join(server_settings["statedir"],
2079
2413
                                     stored_state_file)
 
2414
    foreground = server_settings["foreground"]
2080
2415
    
2081
2416
    if debug:
2082
2417
        initlogger(debug, logging.DEBUG)
2089
2424
    
2090
2425
    if server_settings["servicename"] != "Mandos":
2091
2426
        syslogger.setFormatter(logging.Formatter
2092
 
                               ('Mandos (%s) [%%(process)d]:'
2093
 
                                ' %%(levelname)s: %%(message)s'
2094
 
                                % server_settings["servicename"]))
 
2427
                               ('Mandos ({0}) [%(process)d]:'
 
2428
                                ' %(levelname)s: %(message)s'
 
2429
                                .format(server_settings
 
2430
                                        ["servicename"])))
2095
2431
    
2096
2432
    # Parse config file with clients
2097
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
2433
    client_config = configparser.SafeConfigParser(Client
 
2434
                                                  .client_defaults)
2098
2435
    client_config.read(os.path.join(server_settings["configdir"],
2099
2436
                                    "clients.conf"))
2100
2437
    
2109
2446
                              use_ipv6=use_ipv6,
2110
2447
                              gnutls_priority=
2111
2448
                              server_settings["priority"],
2112
 
                              use_dbus=use_dbus)
2113
 
    if not debug:
 
2449
                              use_dbus=use_dbus,
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
 
2452
    if not foreground:
2114
2453
        pidfilename = "/var/run/mandos.pid"
 
2454
        pidfile = None
2115
2455
        try:
2116
2456
            pidfile = open(pidfilename, "w")
2117
 
        except IOError:
2118
 
            logger.error("Could not open file %r", pidfilename)
 
2457
        except IOError as e:
 
2458
            logger.error("Could not open file %r", pidfilename,
 
2459
                         exc_info=e)
2119
2460
    
2120
 
    try:
2121
 
        uid = pwd.getpwnam("_mandos").pw_uid
2122
 
        gid = pwd.getpwnam("_mandos").pw_gid
2123
 
    except KeyError:
 
2461
    for name in ("_mandos", "mandos", "nobody"):
2124
2462
        try:
2125
 
            uid = pwd.getpwnam("mandos").pw_uid
2126
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2463
            uid = pwd.getpwnam(name).pw_uid
 
2464
            gid = pwd.getpwnam(name).pw_gid
 
2465
            break
2127
2466
        except KeyError:
2128
 
            try:
2129
 
                uid = pwd.getpwnam("nobody").pw_uid
2130
 
                gid = pwd.getpwnam("nobody").pw_gid
2131
 
            except KeyError:
2132
 
                uid = 65534
2133
 
                gid = 65534
 
2467
            continue
 
2468
    else:
 
2469
        uid = 65534
 
2470
        gid = 65534
2134
2471
    try:
2135
2472
        os.setgid(gid)
2136
2473
        os.setuid(uid)
2137
2474
    except OSError as error:
2138
 
        if error[0] != errno.EPERM:
 
2475
        if error.errno != errno.EPERM:
2139
2476
            raise error
2140
2477
    
2141
2478
    if debug:
2153
2490
         .gnutls_global_set_log_function(debug_gnutls))
2154
2491
        
2155
2492
        # Redirect stdin so all checkers get /dev/null
2156
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2493
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2157
2494
        os.dup2(null, sys.stdin.fileno())
2158
2495
        if null > 2:
2159
2496
            os.close(null)
2160
2497
    
2161
2498
    # Need to fork before connecting to D-Bus
2162
 
    if not debug:
 
2499
    if not foreground:
2163
2500
        # Close all input and output, do double fork, etc.
2164
2501
        daemon()
2165
2502
    
 
2503
    # multiprocessing will use threads, so before we use gobject we
 
2504
    # need to inform gobject that threads will be used.
2166
2505
    gobject.threads_init()
2167
2506
    
2168
2507
    global main_loop
2169
2508
    # From the Avahi example code
2170
 
    DBusGMainLoop(set_as_default=True )
 
2509
    DBusGMainLoop(set_as_default=True)
2171
2510
    main_loop = gobject.MainLoop()
2172
2511
    bus = dbus.SystemBus()
2173
2512
    # End of Avahi example code
2179
2518
                            ("se.bsnet.fukt.Mandos", bus,
2180
2519
                             do_not_queue=True))
2181
2520
        except dbus.exceptions.NameExistsException as e:
2182
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2521
            logger.error("Disabling D-Bus:", exc_info=e)
2183
2522
            use_dbus = False
2184
2523
            server_settings["use_dbus"] = False
2185
2524
            tcp_server.use_dbus = False
2197
2536
    
2198
2537
    client_class = Client
2199
2538
    if use_dbus:
2200
 
        client_class = functools.partial(ClientDBusTransitional,
2201
 
                                         bus = bus)
 
2539
        client_class = functools.partial(ClientDBus, bus = bus)
2202
2540
    
2203
2541
    client_settings = Client.config_parser(client_config)
2204
2542
    old_client_settings = {}
2205
2543
    clients_data = {}
2206
2544
    
 
2545
    # This is used to redirect stdout and stderr for checker processes
 
2546
    global wnull
 
2547
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2548
    # Only used if server is running in foreground but not in debug
 
2549
    # mode
 
2550
    if debug or not foreground:
 
2551
        wnull.close()
 
2552
    
2207
2553
    # Get client data and settings from last running state.
2208
2554
    if server_settings["restore"]:
2209
2555
        try:
2212
2558
                                                     (stored_state))
2213
2559
            os.remove(stored_state_path)
2214
2560
        except IOError as e:
2215
 
            logger.warning("Could not load persistent state: {0}"
2216
 
                           .format(e))
2217
 
            if e.errno != errno.ENOENT:
 
2561
            if e.errno == errno.ENOENT:
 
2562
                logger.warning("Could not load persistent state: {0}"
 
2563
                                .format(os.strerror(e.errno)))
 
2564
            else:
 
2565
                logger.critical("Could not load persistent state:",
 
2566
                                exc_info=e)
2218
2567
                raise
2219
2568
        except EOFError as e:
2220
2569
            logger.warning("Could not load persistent state: "
2221
 
                           "EOFError: {0}".format(e))
 
2570
                           "EOFError:", exc_info=e)
2222
2571
    
2223
2572
    with PGPEngine() as pgp:
2224
2573
        for client_name, client in clients_data.iteritems():
 
2574
            # Skip removed clients
 
2575
            if client_name not in client_settings:
 
2576
                continue
 
2577
            
2225
2578
            # Decide which value to use after restoring saved state.
2226
2579
            # We have three different values: Old config file,
2227
2580
            # new config file, and saved state.
2241
2594
            
2242
2595
            # Clients who has passed its expire date can still be
2243
2596
            # enabled if its last checker was successful.  Clients
2244
 
            # whose checker failed before we stored its state is
2245
 
            # assumed to have failed all checkers during downtime.
 
2597
            # whose checker succeeded before we stored its state is
 
2598
            # assumed to have successfully run all checkers during
 
2599
            # downtime.
2246
2600
            if client["enabled"]:
2247
2601
                if datetime.datetime.utcnow() >= client["expires"]:
2248
2602
                    if not client["last_checked_ok"]:
2249
2603
                        logger.warning(
2250
2604
                            "disabling client {0} - Client never "
2251
 
                            "performed a successfull checker"
2252
 
                            .format(client["name"]))
 
2605
                            "performed a successful checker"
 
2606
                            .format(client_name))
2253
2607
                        client["enabled"] = False
2254
2608
                    elif client["last_checker_status"] != 0:
2255
2609
                        logger.warning(
2256
2610
                            "disabling client {0} - Client "
2257
2611
                            "last checker failed with error code {1}"
2258
 
                            .format(client["name"],
 
2612
                            .format(client_name,
2259
2613
                                    client["last_checker_status"]))
2260
2614
                        client["enabled"] = False
2261
2615
                    else:
2262
2616
                        client["expires"] = (datetime.datetime
2263
2617
                                             .utcnow()
2264
2618
                                             + client["timeout"])
2265
 
                    
 
2619
                        logger.debug("Last checker succeeded,"
 
2620
                                     " keeping {0} enabled"
 
2621
                                     .format(client_name))
2266
2622
            try:
2267
2623
                client["secret"] = (
2268
2624
                    pgp.decrypt(client["encrypted_secret"],
2274
2630
                             .format(client_name))
2275
2631
                client["secret"] = (
2276
2632
                    client_settings[client_name]["secret"])
2277
 
 
2278
2633
    
2279
2634
    # Add/remove clients based on new changes made to config
2280
 
    for client_name in set(old_client_settings) - set(client_settings):
 
2635
    for client_name in (set(old_client_settings)
 
2636
                        - set(client_settings)):
2281
2637
        del clients_data[client_name]
2282
 
    for client_name in set(client_settings) - set(old_client_settings):
 
2638
    for client_name in (set(client_settings)
 
2639
                        - set(old_client_settings)):
2283
2640
        clients_data[client_name] = client_settings[client_name]
2284
 
 
2285
 
    # Create clients all clients
 
2641
    
 
2642
    # Create all client objects
2286
2643
    for client_name, client in clients_data.iteritems():
2287
2644
        tcp_server.clients[client_name] = client_class(
2288
 
            name = client_name, settings = client)
 
2645
            name = client_name, settings = client,
 
2646
            server_settings = server_settings)
2289
2647
    
2290
2648
    if not tcp_server.clients:
2291
2649
        logger.warning("No clients defined")
2292
 
        
2293
 
    if not debug:
2294
 
        try:
2295
 
            with pidfile:
2296
 
                pid = os.getpid()
2297
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2298
 
            del pidfile
2299
 
        except IOError:
2300
 
            logger.error("Could not write to file %r with PID %d",
2301
 
                         pidfilename, pid)
2302
 
        except NameError:
2303
 
            # "pidfile" was never created
2304
 
            pass
 
2650
    
 
2651
    if not foreground:
 
2652
        if pidfile is not None:
 
2653
            try:
 
2654
                with pidfile:
 
2655
                    pid = os.getpid()
 
2656
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2657
            except IOError:
 
2658
                logger.error("Could not write to file %r with PID %d",
 
2659
                             pidfilename, pid)
 
2660
        del pidfile
2305
2661
        del pidfilename
2306
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
2662
    
2308
2663
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2309
2664
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2310
2665
    
2311
2666
    if use_dbus:
2312
 
        class MandosDBusService(dbus.service.Object):
 
2667
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2668
                                        "se.bsnet.fukt.Mandos"})
 
2669
        class MandosDBusService(DBusObjectWithProperties):
2313
2670
            """A D-Bus proxy object"""
2314
2671
            def __init__(self):
2315
2672
                dbus.service.Object.__init__(self, bus, "/")
2316
2673
            _interface = "se.recompile.Mandos"
2317
2674
            
 
2675
            @dbus_interface_annotations(_interface)
 
2676
            def _foo(self):
 
2677
                return { "org.freedesktop.DBus.Property"
 
2678
                         ".EmitsChangedSignal":
 
2679
                             "false"}
 
2680
            
2318
2681
            @dbus.service.signal(_interface, signature="o")
2319
2682
            def ClientAdded(self, objpath):
2320
2683
                "D-Bus signal"
2362
2725
            
2363
2726
            del _interface
2364
2727
        
2365
 
        class MandosDBusServiceTransitional(MandosDBusService):
2366
 
            __metaclass__ = AlternateDBusNamesMetaclass
2367
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2728
        mandos_dbus_service = MandosDBusService()
2368
2729
    
2369
2730
    def cleanup():
2370
2731
        "Cleanup function; run on exit"
2371
2732
        service.cleanup()
2372
2733
        
2373
2734
        multiprocessing.active_children()
 
2735
        wnull.close()
2374
2736
        if not (tcp_server.clients or client_settings):
2375
2737
            return
2376
2738
        
2388
2750
                # A list of attributes that can not be pickled
2389
2751
                # + secret.
2390
2752
                exclude = set(("bus", "changedstate", "secret",
2391
 
                               "checker"))
 
2753
                               "checker", "server_settings"))
2392
2754
                for name, typ in (inspect.getmembers
2393
2755
                                  (dbus.service.Object)):
2394
2756
                    exclude.add(name)
2403
2765
                del client_settings[client.name]["secret"]
2404
2766
        
2405
2767
        try:
2406
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2407
 
                                                prefix="clients-",
2408
 
                                                dir=os.path.dirname
2409
 
                                                (stored_state_path))
2410
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2768
            with (tempfile.NamedTemporaryFile
 
2769
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2770
                   dir=os.path.dirname(stored_state_path),
 
2771
                   delete=False)) as stored_state:
2411
2772
                pickle.dump((clients, client_settings), stored_state)
 
2773
                tempname=stored_state.name
2412
2774
            os.rename(tempname, stored_state_path)
2413
2775
        except (IOError, OSError) as e:
2414
 
            logger.warning("Could not save persistent state: {0}"
2415
 
                           .format(e))
2416
2776
            if not debug:
2417
2777
                try:
2418
2778
                    os.remove(tempname)
2419
2779
                except NameError:
2420
2780
                    pass
2421
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2422
 
                                   errno.EEXIST)):
 
2781
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2782
                logger.warning("Could not save persistent state: {0}"
 
2783
                               .format(os.strerror(e.errno)))
 
2784
            else:
 
2785
                logger.warning("Could not save persistent state:",
 
2786
                               exc_info=e)
2423
2787
                raise e
2424
2788
        
2425
2789
        # Delete all clients, and settings from config
2453
2817
    service.port = tcp_server.socket.getsockname()[1]
2454
2818
    if use_ipv6:
2455
2819
        logger.info("Now listening on address %r, port %d,"
2456
 
                    " flowinfo %d, scope_id %d"
2457
 
                    % tcp_server.socket.getsockname())
 
2820
                    " flowinfo %d, scope_id %d",
 
2821
                    *tcp_server.socket.getsockname())
2458
2822
    else:                       # IPv4
2459
 
        logger.info("Now listening on address %r, port %d"
2460
 
                    % tcp_server.socket.getsockname())
 
2823
        logger.info("Now listening on address %r, port %d",
 
2824
                    *tcp_server.socket.getsockname())
2461
2825
    
2462
2826
    #service.interface = tcp_server.socket.getsockname()[3]
2463
2827
    
2466
2830
        try:
2467
2831
            service.activate()
2468
2832
        except dbus.exceptions.DBusException as error:
2469
 
            logger.critical("DBusException: %s", error)
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
2470
2834
            cleanup()
2471
2835
            sys.exit(1)
2472
2836
        # End of Avahi example code
2479
2843
        logger.debug("Starting main loop")
2480
2844
        main_loop.run()
2481
2845
    except AvahiError as error:
2482
 
        logger.critical("AvahiError: %s", error)
 
2846
        logger.critical("Avahi Error", exc_info=error)
2483
2847
        cleanup()
2484
2848
        sys.exit(1)
2485
2849
    except KeyboardInterrupt: