/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
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.1"
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',
146
 
                                              '--no-use-agent'])
 
143
        self.gnupgargs = ['--batch',
 
144
                          '--home', self.tempdir,
 
145
                          '--force-mdc',
 
146
                          '--quiet',
 
147
                          '--no-use-agent']
147
148
    
148
149
    def __enter__(self):
149
150
        return self
150
151
    
151
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
    def __exit__(self, exc_type, exc_value, traceback):
152
153
        self._cleanup()
153
154
        return False
154
155
    
174
175
        return b"mandos" + binascii.hexlify(password)
175
176
    
176
177
    def encrypt(self, data, password):
177
 
        self.gnupg.passphrase = self.password_encode(password)
178
 
        with open(os.devnull) as devnull:
179
 
            try:
180
 
                proc = self.gnupg.run(['--symmetric'],
181
 
                                      create_fhs=['stdin', 'stdout'],
182
 
                                      attach_fhs={'stderr': devnull})
183
 
                with contextlib.closing(proc.handles['stdin']) as f:
184
 
                    f.write(data)
185
 
                with contextlib.closing(proc.handles['stdout']) as f:
186
 
                    ciphertext = f.read()
187
 
                proc.wait()
188
 
            except IOError as e:
189
 
                raise PGPError(e)
190
 
        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)
191
193
        return ciphertext
192
194
    
193
195
    def decrypt(self, data, password):
194
 
        self.gnupg.passphrase = self.password_encode(password)
195
 
        with open(os.devnull) as devnull:
196
 
            try:
197
 
                proc = self.gnupg.run(['--decrypt'],
198
 
                                      create_fhs=['stdin', 'stdout'],
199
 
                                      attach_fhs={'stderr': devnull})
200
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
201
 
                    f.write(data)
202
 
                with contextlib.closing(proc.handles['stdout']) as f:
203
 
                    decrypted_plaintext = f.read()
204
 
                proc.wait()
205
 
            except IOError as e:
206
 
                raise PGPError(e)
207
 
        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)
208
212
        return decrypted_plaintext
209
213
 
210
214
 
211
 
 
212
215
class AvahiError(Exception):
213
216
    def __init__(self, value, *args, **kwargs):
214
217
        self.value = value
231
234
               Used to optionally bind to the specified interface.
232
235
    name: string; Example: 'Mandos'
233
236
    type: string; Example: '_mandos._tcp'.
234
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
237
     See <https://www.iana.org/assignments/service-names-port-numbers>
235
238
    port: integer; what port to announce
236
239
    TXT: list of strings; TXT record for the service
237
240
    domain: string; Domain to publish on, default to .local if empty.
243
246
    server: D-Bus Server
244
247
    bus: dbus.SystemBus()
245
248
    """
 
249
    
246
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
247
251
                 servicetype = None, port = None, TXT = None,
248
252
                 domain = "", host = "", max_renames = 32768,
261
265
        self.server = None
262
266
        self.bus = bus
263
267
        self.entry_group_state_changed_match = None
 
268
    
264
269
    def rename(self):
265
270
        """Derived from the Avahi example code"""
266
271
        if self.rename_count >= self.max_renames:
276
281
        try:
277
282
            self.add()
278
283
        except dbus.exceptions.DBusException as error:
279
 
            logger.critical("DBusException: %s", error)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
280
285
            self.cleanup()
281
286
            os._exit(1)
282
287
        self.rename_count += 1
 
288
    
283
289
    def remove(self):
284
290
        """Derived from the Avahi example code"""
285
291
        if self.entry_group_state_changed_match is not None:
287
293
            self.entry_group_state_changed_match = None
288
294
        if self.group is not None:
289
295
            self.group.Reset()
 
296
    
290
297
    def add(self):
291
298
        """Derived from the Avahi example code"""
292
299
        self.remove()
309
316
            dbus.UInt16(self.port),
310
317
            avahi.string_array_to_txt_array(self.TXT))
311
318
        self.group.Commit()
 
319
    
312
320
    def entry_group_state_changed(self, state, error):
313
321
        """Derived from the Avahi example code"""
314
322
        logger.debug("Avahi entry group state change: %i", state)
321
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
322
330
            logger.critical("Avahi: Error in group state changed %s",
323
331
                            unicode(error))
324
 
            raise AvahiGroupError("State changed: %s"
325
 
                                  % unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
 
334
    
326
335
    def cleanup(self):
327
336
        """Derived from the Avahi example code"""
328
337
        if self.group is not None:
333
342
                pass
334
343
            self.group = None
335
344
        self.remove()
 
345
    
336
346
    def server_state_changed(self, state, error=None):
337
347
        """Derived from the Avahi example code"""
338
348
        logger.debug("Avahi server state change: %i", state)
357
367
                logger.debug("Unknown state: %r", state)
358
368
            else:
359
369
                logger.debug("Unknown state: %r: %r", state, error)
 
370
    
360
371
    def activate(self):
361
372
        """Derived from the Avahi example code"""
362
373
        if self.server is None:
369
380
                                 self.server_state_changed)
370
381
        self.server_state_changed(self.server.GetState())
371
382
 
 
383
 
372
384
class AvahiServiceToSyslog(AvahiService):
373
385
    def rename(self):
374
386
        """Add the new name to the syslog messages"""
375
387
        ret = AvahiService.rename(self)
376
388
        syslogger.setFormatter(logging.Formatter
377
 
                               ('Mandos (%s) [%%(process)d]:'
378
 
                                ' %%(levelname)s: %%(message)s'
379
 
                                % self.name))
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
380
392
        return ret
381
393
 
 
394
 
382
395
def timedelta_to_milliseconds(td):
383
396
    "Convert a datetime.timedelta() to milliseconds"
384
397
    return ((td.days * 24 * 60 * 60 * 1000)
385
398
            + (td.seconds * 1000)
386
399
            + (td.microseconds // 1000))
387
 
        
 
400
 
 
401
 
388
402
class Client(object):
389
403
    """A representation of a client host served by this server.
390
404
    
415
429
    last_checked_ok: datetime.datetime(); (UTC) or None
416
430
    last_checker_status: integer between 0 and 255 reflecting exit
417
431
                         status of last checker. -1 reflects crashed
418
 
                         checker, or None.
 
432
                         checker, -2 means no checker completed yet.
419
433
    last_enabled: datetime.datetime(); (UTC) or None
420
434
    name:       string; from the config file, used in log messages and
421
435
                        D-Bus identifiers
422
436
    secret:     bytestring; sent verbatim (over TLS) to client
423
437
    timeout:    datetime.timedelta(); How long from last_checked_ok
424
438
                                      until this client is disabled
425
 
    extended_timeout:   extra long timeout when password has been sent
 
439
    extended_timeout:   extra long timeout when secret has been sent
426
440
    runtime_expansions: Allowed attributes for runtime expansion.
427
441
    expires:    datetime.datetime(); time (UTC) when a client will be
428
442
                disabled, or None
 
443
    server_settings: The server_settings dict from main()
429
444
    """
430
445
    
431
446
    runtime_expansions = ("approval_delay", "approval_duration",
432
 
                          "created", "enabled", "fingerprint",
433
 
                          "host", "interval", "last_checked_ok",
 
447
                          "created", "enabled", "expires",
 
448
                          "fingerprint", "host", "interval",
 
449
                          "last_approval_request", "last_checked_ok",
434
450
                          "last_enabled", "name", "timeout")
435
 
    client_defaults = { "timeout": "5m",
436
 
                        "extended_timeout": "15m",
437
 
                        "interval": "2m",
 
451
    client_defaults = { "timeout": "PT5M",
 
452
                        "extended_timeout": "PT15M",
 
453
                        "interval": "PT2M",
438
454
                        "checker": "fping -q -- %%(host)s",
439
455
                        "host": "",
440
 
                        "approval_delay": "0s",
441
 
                        "approval_duration": "1s",
 
456
                        "approval_delay": "PT0S",
 
457
                        "approval_duration": "PT1S",
442
458
                        "approved_by_default": "True",
443
459
                        "enabled": "True",
444
460
                        }
457
473
    
458
474
    def approval_delay_milliseconds(self):
459
475
        return timedelta_to_milliseconds(self.approval_delay)
460
 
 
 
476
    
461
477
    @staticmethod
462
478
    def config_parser(config):
463
479
        """Construct a new dict of client settings of this form:
475
491
            # Reformat values from string types to Python types
476
492
            client["approved_by_default"] = config.getboolean(
477
493
                client_name, "approved_by_default")
478
 
            client["enabled"] = config.getboolean(client_name, "enabled")
 
494
            client["enabled"] = config.getboolean(client_name,
 
495
                                                  "enabled")
479
496
            
480
497
            client["fingerprint"] = (section["fingerprint"].upper()
481
498
                                     .replace(" ", ""))
487
504
                          "rb") as secfile:
488
505
                    client["secret"] = secfile.read()
489
506
            else:
490
 
                raise TypeError("No secret or secfile for section %s"
491
 
                                % section)
 
507
                raise TypeError("No secret or secfile for section {0}"
 
508
                                .format(section))
492
509
            client["timeout"] = string_to_delta(section["timeout"])
493
510
            client["extended_timeout"] = string_to_delta(
494
511
                section["extended_timeout"])
500
517
            client["checker_command"] = section["checker"]
501
518
            client["last_approval_request"] = None
502
519
            client["last_checked_ok"] = None
503
 
            client["last_checker_status"] = None
 
520
            client["last_checker_status"] = -2
504
521
        
505
522
        return settings
506
 
        
507
 
        
508
 
    def __init__(self, settings, name = None):
509
 
        """Note: the 'checker' key in 'config' sets the
510
 
        'checker_command' attribute and *not* the 'checker'
511
 
        attribute."""
 
523
    
 
524
    def __init__(self, settings, name = None, server_settings=None):
512
525
        self.name = name
 
526
        if server_settings is None:
 
527
            server_settings = {}
 
528
        self.server_settings = server_settings
513
529
        # adding all client settings
514
530
        for setting, value in settings.iteritems():
515
531
            setattr(self, setting, value)
523
539
        else:
524
540
            self.last_enabled = None
525
541
            self.expires = None
526
 
       
 
542
        
527
543
        logger.debug("Creating client %r", self.name)
528
544
        # Uppercase and remove spaces from fingerprint for later
529
545
        # comparison purposes with return value from the fingerprint()
530
546
        # function
531
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
532
 
        self.created = settings.get("created", datetime.datetime.utcnow())
533
 
 
 
548
        self.created = settings.get("created",
 
549
                                    datetime.datetime.utcnow())
 
550
        
534
551
        # attributes specific for this server instance
535
552
        self.checker = None
536
553
        self.checker_initiator_tag = None
564
581
        if getattr(self, "enabled", False):
565
582
            # Already enabled
566
583
            return
567
 
        self.send_changedstate()
568
584
        self.expires = datetime.datetime.utcnow() + self.timeout
569
585
        self.enabled = True
570
586
        self.last_enabled = datetime.datetime.utcnow()
571
587
        self.init_checker()
 
588
        self.send_changedstate()
572
589
    
573
590
    def disable(self, quiet=True):
574
591
        """Disable this client."""
575
592
        if not getattr(self, "enabled", False):
576
593
            return False
577
594
        if not quiet:
578
 
            self.send_changedstate()
579
 
        if not quiet:
580
595
            logger.info("Disabling client %s", self.name)
581
 
        if getattr(self, "disable_initiator_tag", False):
 
596
        if getattr(self, "disable_initiator_tag", None) is not None:
582
597
            gobject.source_remove(self.disable_initiator_tag)
583
598
            self.disable_initiator_tag = None
584
599
        self.expires = None
585
 
        if getattr(self, "checker_initiator_tag", False):
 
600
        if getattr(self, "checker_initiator_tag", None) is not None:
586
601
            gobject.source_remove(self.checker_initiator_tag)
587
602
            self.checker_initiator_tag = None
588
603
        self.stop_checker()
589
604
        self.enabled = False
 
605
        if not quiet:
 
606
            self.send_changedstate()
590
607
        # Do not run this again if called by a gobject.timeout_add
591
608
        return False
592
609
    
596
613
    def init_checker(self):
597
614
        # Schedule a new checker to be started an 'interval' from now,
598
615
        # and every interval from then on.
 
616
        if self.checker_initiator_tag is not None:
 
617
            gobject.source_remove(self.checker_initiator_tag)
599
618
        self.checker_initiator_tag = (gobject.timeout_add
600
619
                                      (self.interval_milliseconds(),
601
620
                                       self.start_checker))
602
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)
603
624
        self.disable_initiator_tag = (gobject.timeout_add
604
625
                                   (self.timeout_milliseconds(),
605
626
                                    self.disable))
624
645
            logger.warning("Checker for %(name)s crashed?",
625
646
                           vars(self))
626
647
    
627
 
    def checked_ok(self, timeout=None):
628
 
        """Bump up the timeout for this client.
629
 
        
630
 
        This should only be called when the client has been seen,
631
 
        alive and well.
632
 
        """
 
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."""
633
656
        if timeout is None:
634
657
            timeout = self.timeout
635
 
        self.last_checked_ok = datetime.datetime.utcnow()
636
658
        if self.disable_initiator_tag is not None:
637
659
            gobject.source_remove(self.disable_initiator_tag)
 
660
            self.disable_initiator_tag = None
638
661
        if getattr(self, "enabled", False):
639
662
            self.disable_initiator_tag = (gobject.timeout_add
640
663
                                          (timedelta_to_milliseconds
650
673
        If a checker already exists, leave it running and do
651
674
        nothing."""
652
675
        # The reason for not killing a running checker is that if we
653
 
        # did that, then if a checker (for some reason) started
654
 
        # running slowly and taking more than 'interval' time, the
655
 
        # client would inevitably timeout, since no checker would get
656
 
        # 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
657
680
        # checkers alone, the checker would have to take more time
658
681
        # than 'timeout' for the client to be disabled, which is as it
659
682
        # should be.
673
696
                                      self.current_checker_command)
674
697
        # Start a new checker if needed
675
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)
676
704
            try:
677
 
                # In case checker_command has exactly one % operator
678
 
                command = self.checker_command % self.host
679
 
            except TypeError:
680
 
                # Escape attributes for the shell
681
 
                escaped_attrs = dict(
682
 
                    (attr,
683
 
                     re.escape(unicode(str(getattr(self, attr, "")),
684
 
                                       errors=
685
 
                                       'replace')))
686
 
                    for attr in
687
 
                    self.runtime_expansions)
688
 
                
689
 
                try:
690
 
                    command = self.checker_command % escaped_attrs
691
 
                except TypeError as error:
692
 
                    logger.error('Could not format string "%s":'
693
 
                                 ' %s', self.checker_command, error)
694
 
                    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
695
710
            self.current_checker_command = command
696
711
            try:
697
712
                logger.info("Starting checker %r for %s",
700
715
                # in normal mode, that is already done by daemon(),
701
716
                # and in debug mode we don't want to.  (Stdin is
702
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 })
703
726
                self.checker = subprocess.Popen(command,
704
727
                                                close_fds=True,
705
 
                                                shell=True, cwd="/")
706
 
                self.checker_callback_tag = (gobject.child_watch_add
707
 
                                             (self.checker.pid,
708
 
                                              self.checker_callback,
709
 
                                              data=command))
710
 
                # The checker may have completed before the gobject
711
 
                # 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:
712
741
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
713
 
                if pid:
714
 
                    gobject.source_remove(self.checker_callback_tag)
715
 
                    self.checker_callback(pid, status, command)
716
742
            except OSError as error:
717
 
                logger.error("Failed to start subprocess: %s",
718
 
                             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)
719
752
        # Re-run this periodically if run by gobject.timeout_add
720
753
        return True
721
754
    
728
761
            return
729
762
        logger.debug("Stopping checker for %(name)s", vars(self))
730
763
        try:
731
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
764
            self.checker.terminate()
732
765
            #time.sleep(0.5)
733
766
            #if self.checker.poll() is None:
734
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
767
            #    self.checker.kill()
735
768
        except OSError as error:
736
769
            if error.errno != errno.ESRCH: # No such process
737
770
                raise
754
787
    # "Set" method, so we fail early here:
755
788
    if byte_arrays and signature != "ay":
756
789
        raise ValueError("Byte arrays not supported for non-'ay'"
757
 
                         " signature %r" % signature)
 
790
                         " signature {0!r}".format(signature))
758
791
    def decorator(func):
759
792
        func._dbus_is_property = True
760
793
        func._dbus_interface = dbus_interface
768
801
    return decorator
769
802
 
770
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
 
771
841
class DBusPropertyException(dbus.exceptions.DBusException):
772
842
    """A base class for D-Bus property-related exceptions
773
843
    """
796
866
    """
797
867
    
798
868
    @staticmethod
799
 
    def _is_dbus_property(obj):
800
 
        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)
801
877
    
802
 
    def _get_all_dbus_properties(self):
 
878
    def _get_all_dbus_things(self, thing):
803
879
        """Returns a generator of (name, attribute) pairs
804
880
        """
805
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
881
        return ((getattr(athing.__get__(self), "_dbus_name",
 
882
                         name),
 
883
                 athing.__get__(self))
806
884
                for cls in self.__class__.__mro__
807
 
                for name, prop in
808
 
                inspect.getmembers(cls, self._is_dbus_property))
 
885
                for name, athing in
 
886
                inspect.getmembers(cls,
 
887
                                   self._is_dbus_thing(thing)))
809
888
    
810
889
    def _get_dbus_property(self, interface_name, property_name):
811
890
        """Returns a bound method if one exists which is a D-Bus
813
892
        """
814
893
        for cls in  self.__class__.__mro__:
815
894
            for name, value in (inspect.getmembers
816
 
                                (cls, self._is_dbus_property)):
 
895
                                (cls,
 
896
                                 self._is_dbus_thing("property"))):
817
897
                if (value._dbus_name == property_name
818
898
                    and value._dbus_interface == interface_name):
819
899
                    return value.__get__(self)
848
928
            # signatures other than "ay".
849
929
            if prop._dbus_signature != "ay":
850
930
                raise ValueError
851
 
            value = dbus.ByteArray(''.join(unichr(byte)
852
 
                                           for byte in value))
 
931
            value = dbus.ByteArray(b''.join(chr(byte)
 
932
                                            for byte in value))
853
933
        prop(value)
854
934
    
855
935
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
861
941
        Note: Will not include properties with access="write".
862
942
        """
863
943
        properties = {}
864
 
        for name, prop in self._get_all_dbus_properties():
 
944
        for name, prop in self._get_all_dbus_things("property"):
865
945
            if (interface_name
866
946
                and interface_name != prop._dbus_interface):
867
947
                # Interface non-empty but did not match
882
962
                         path_keyword='object_path',
883
963
                         connection_keyword='connection')
884
964
    def Introspect(self, object_path, connection):
885
 
        """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.
886
968
        """
887
969
        xmlstring = dbus.service.Object.Introspect(self, object_path,
888
970
                                                   connection)
895
977
                e.setAttribute("access", prop._dbus_access)
896
978
                return e
897
979
            for if_tag in document.getElementsByTagName("interface"):
 
980
                # Add property tags
898
981
                for tag in (make_tag(document, name, prop)
899
982
                            for name, prop
900
 
                            in self._get_all_dbus_properties()
 
983
                            in self._get_all_dbus_things("property")
901
984
                            if prop._dbus_interface
902
985
                            == if_tag.getAttribute("name")):
903
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)
904
1018
                # Add the names to the return values for the
905
1019
                # "org.freedesktop.DBus.Properties" methods
906
1020
                if (if_tag.getAttribute("name")
921
1035
        except (AttributeError, xml.dom.DOMException,
922
1036
                xml.parsers.expat.ExpatError) as error:
923
1037
            logger.error("Failed to override Introspection method",
924
 
                         error)
 
1038
                         exc_info=error)
925
1039
        return xmlstring
926
1040
 
927
1041
 
928
 
def datetime_to_dbus (dt, variant_level=0):
 
1042
def datetime_to_dbus(dt, variant_level=0):
929
1043
    """Convert a UTC datetime.datetime() to a D-Bus type."""
930
1044
    if dt is None:
931
1045
        return dbus.String("", variant_level = variant_level)
933
1047
                       variant_level=variant_level)
934
1048
 
935
1049
 
936
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
937
 
                                  .__metaclass__):
938
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
939
 
    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).
940
1072
    """
941
 
    def __new__(mcs, name, bases, attr):
942
 
        # Go through all the base classes which could have D-Bus
943
 
        # methods, signals, or properties in them
944
 
        for base in (b for b in bases
945
 
                     if issubclass(b, dbus.service.Object)):
946
 
            # Go though all attributes of the base class
947
 
            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):
948
1080
                # Ignore non-D-Bus attributes, and D-Bus attributes
949
1081
                # with the wrong interface name
950
1082
                if (not hasattr(attribute, "_dbus_interface")
951
1083
                    or not attribute._dbus_interface
952
 
                    .startswith("se.recompile.Mandos")):
 
1084
                    .startswith(orig_interface_name)):
953
1085
                    continue
954
1086
                # Create an alternate D-Bus interface name based on
955
1087
                # the current name
956
1088
                alt_interface = (attribute._dbus_interface
957
 
                                 .replace("se.recompile.Mandos",
958
 
                                          "se.bsnet.fukt.Mandos"))
 
1089
                                 .replace(orig_interface_name,
 
1090
                                          alt_interface_name))
 
1091
                interface_names.add(alt_interface)
959
1092
                # Is this a D-Bus signal?
960
1093
                if getattr(attribute, "_dbus_is_signal", False):
961
 
                    # Extract the original non-method function by
962
 
                    # black magic
 
1094
                    # Extract the original non-method undecorated
 
1095
                    # function by black magic
963
1096
                    nonmethod_func = (dict(
964
1097
                            zip(attribute.func_code.co_freevars,
965
1098
                                attribute.__closure__))["func"]
976
1109
                                nonmethod_func.func_name,
977
1110
                                nonmethod_func.func_defaults,
978
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
979
1118
                    # Define a creator of a function to call both the
980
 
                    # old and new functions, so both the old and new
981
 
                    # 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
982
1122
                    def fixscope(func1, func2):
983
1123
                        """This function is a scope container to pass
984
1124
                        func1 and func2 to the "call_both" function
991
1131
                        return call_both
992
1132
                    # Create the "call_both" function and add it to
993
1133
                    # the class
994
 
                    attr[attrname] = fixscope(attribute,
995
 
                                              new_function)
 
1134
                    attr[attrname] = fixscope(attribute, new_function)
996
1135
                # Is this a D-Bus method?
997
1136
                elif getattr(attribute, "_dbus_is_method", False):
998
1137
                    # Create a new, but exactly alike, function
1009
1148
                                        attribute.func_name,
1010
1149
                                        attribute.func_defaults,
1011
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
1012
1157
                # Is this a D-Bus property?
1013
1158
                elif getattr(attribute, "_dbus_is_property", False):
1014
1159
                    # Create a new, but exactly alike, function
1028
1173
                                        attribute.func_name,
1029
1174
                                        attribute.func_defaults,
1030
1175
                                        attribute.func_closure)))
1031
 
        return type.__new__(mcs, name, bases, attr)
1032
 
 
1033
 
 
 
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"})
1034
1221
class ClientDBus(Client, DBusObjectWithProperties):
1035
1222
    """A Client class using D-Bus
1036
1223
    
1047
1234
    def __init__(self, bus = None, *args, **kwargs):
1048
1235
        self.bus = bus
1049
1236
        Client.__init__(self, *args, **kwargs)
1050
 
        self._approvals_pending = 0
1051
 
        
1052
 
        self._approvals_pending = 0
1053
1237
        # Only now, when this client is initialized, can it show up on
1054
1238
        # the D-Bus
1055
1239
        client_object_name = unicode(self.name).translate(
1059
1243
                                 ("/clients/" + client_object_name))
1060
1244
        DBusObjectWithProperties.__init__(self, self.bus,
1061
1245
                                          self.dbus_object_path)
1062
 
        
 
1246
    
1063
1247
    def notifychangeproperty(transform_func,
1064
1248
                             dbus_name, type_func=lambda x: x,
1065
1249
                             variant_level=1):
1088
1272
        
1089
1273
        return property(lambda self: getattr(self, attrname), setter)
1090
1274
    
1091
 
    
1092
1275
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
1276
    approvals_pending = notifychangeproperty(dbus.Boolean,
1094
1277
                                             "ApprovalPending",
1101
1284
                                       checker is not None)
1102
1285
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1103
1286
                                           "LastCheckedOK")
 
1287
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1288
                                               "LastCheckerStatus")
1104
1289
    last_approval_request = notifychangeproperty(
1105
1290
        datetime_to_dbus, "LastApprovalRequest")
1106
1291
    approved_by_default = notifychangeproperty(dbus.Boolean,
1174
1359
        return False
1175
1360
    
1176
1361
    def approve(self, value=True):
1177
 
        self.send_changedstate()
1178
1362
        self.approved = value
1179
1363
        gobject.timeout_add(timedelta_to_milliseconds
1180
1364
                            (self.approval_duration),
1181
1365
                            self._reset_approved)
1182
 
    
 
1366
        self.send_changedstate()
1183
1367
    
1184
1368
    ## D-Bus methods, signals & properties
1185
1369
    _interface = "se.recompile.Mandos.Client"
1186
1370
    
 
1371
    ## Interfaces
 
1372
    
 
1373
    @dbus_interface_annotations(_interface)
 
1374
    def _foo(self):
 
1375
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1376
                     "false"}
 
1377
    
1187
1378
    ## Signals
1188
1379
    
1189
1380
    # CheckerCompleted - signal
1225
1416
        "D-Bus signal"
1226
1417
        return self.need_approval()
1227
1418
    
1228
 
    # NeRwequest - signal
1229
 
    @dbus.service.signal(_interface, signature="s")
1230
 
    def NewRequest(self, ip):
1231
 
        """D-Bus signal
1232
 
        Is sent after a client request a password.
1233
 
        """
1234
 
        pass
1235
 
    
1236
1419
    ## Methods
1237
1420
    
1238
1421
    # Approve - method
1348
1531
            return
1349
1532
        return datetime_to_dbus(self.last_checked_ok)
1350
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
    
1351
1540
    # Expires - property
1352
1541
    @dbus_service_property(_interface, signature="s", access="read")
1353
1542
    def Expires_dbus_property(self):
1364
1553
    def Timeout_dbus_property(self, value=None):
1365
1554
        if value is None:       # get
1366
1555
            return dbus.UInt64(self.timeout_milliseconds())
 
1556
        old_timeout = self.timeout
1367
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
1368
 
        if getattr(self, "disable_initiator_tag", None) is None:
1369
 
            return
1370
 
        # Reschedule timeout
1371
 
        gobject.source_remove(self.disable_initiator_tag)
1372
 
        self.disable_initiator_tag = None
1373
 
        self.expires = None
1374
 
        time_to_die = timedelta_to_milliseconds((self
1375
 
                                                 .last_checked_ok
1376
 
                                                 + self.timeout)
1377
 
                                                - datetime.datetime
1378
 
                                                .utcnow())
1379
 
        if time_to_die <= 0:
1380
 
            # The timeout has passed
1381
 
            self.disable()
1382
 
        else:
1383
 
            self.expires = (datetime.datetime.utcnow()
1384
 
                            + datetime.timedelta(milliseconds =
1385
 
                                                 time_to_die))
1386
 
            self.disable_initiator_tag = (gobject.timeout_add
1387
 
                                          (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))
1388
1574
    
1389
1575
    # ExtendedTimeout - property
1390
1576
    @dbus_service_property(_interface, signature="t",
1469
1655
        self._pipe.send(('setattr', name, value))
1470
1656
 
1471
1657
 
1472
 
class ClientDBusTransitional(ClientDBus):
1473
 
    __metaclass__ = AlternateDBusNamesMetaclass
1474
 
 
1475
 
 
1476
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
1477
1659
    """A class to handle client connections.
1478
1660
    
1546
1728
                except KeyError:
1547
1729
                    return
1548
1730
                
1549
 
                if self.server.use_dbus:
1550
 
                    # Emit D-Bus signal
1551
 
                    client.NewRequest(str(self.client_address))
1552
 
                
1553
1731
                if client.approval_delay:
1554
1732
                    delay = client.approval_delay
1555
1733
                    client.approvals_pending += 1
1586
1764
                    #wait until timeout or approved
1587
1765
                    time = datetime.datetime.now()
1588
1766
                    client.changedstate.acquire()
1589
 
                    (client.changedstate.wait
1590
 
                     (float(client.timedelta_to_milliseconds(delay)
1591
 
                            / 1000)))
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1592
1770
                    client.changedstate.release()
1593
1771
                    time2 = datetime.datetime.now()
1594
1772
                    if (time2 - time) >= delay:
1610
1788
                    try:
1611
1789
                        sent = session.send(client.secret[sent_size:])
1612
1790
                    except gnutls.errors.GNUTLSError as error:
1613
 
                        logger.warning("gnutls send failed")
 
1791
                        logger.warning("gnutls send failed",
 
1792
                                       exc_info=error)
1614
1793
                        return
1615
1794
                    logger.debug("Sent: %d, remaining: %d",
1616
1795
                                 sent, len(client.secret)
1619
1798
                
1620
1799
                logger.info("Sending secret to %s", client.name)
1621
1800
                # bump the timeout using extended_timeout
1622
 
                client.checked_ok(client.extended_timeout)
 
1801
                client.bump_timeout(client.extended_timeout)
1623
1802
                if self.server.use_dbus:
1624
1803
                    # Emit D-Bus signal
1625
1804
                    client.GotSecret()
1630
1809
                try:
1631
1810
                    session.bye()
1632
1811
                except gnutls.errors.GNUTLSError as error:
1633
 
                    logger.warning("GnuTLS bye failed")
 
1812
                    logger.warning("GnuTLS bye failed",
 
1813
                                   exc_info=error)
1634
1814
    
1635
1815
    @staticmethod
1636
1816
    def peer_certificate(session):
1708
1888
    def process_request(self, request, address):
1709
1889
        """Start a new process to process the request."""
1710
1890
        proc = multiprocessing.Process(target = self.sub_process_main,
1711
 
                                       args = (request,
1712
 
                                               address))
 
1891
                                       args = (request, address))
1713
1892
        proc.start()
1714
1893
        return proc
1715
1894
 
1743
1922
        use_ipv6:       Boolean; to use IPv6 or not
1744
1923
    """
1745
1924
    def __init__(self, server_address, RequestHandlerClass,
1746
 
                 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
        """
1747
1929
        self.interface = interface
1748
1930
        if use_ipv6:
1749
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.
1750
1958
        socketserver.TCPServer.__init__(self, server_address,
1751
1959
                                        RequestHandlerClass)
 
1960
    
1752
1961
    def server_bind(self):
1753
1962
        """This overrides the normal server_bind() function
1754
1963
        to bind to an interface if one was specified, and also NOT to
1762
1971
                try:
1763
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
1764
1973
                                           SO_BINDTODEVICE,
1765
 
                                           str(self.interface
1766
 
                                               + '\0'))
 
1974
                                           str(self.interface + '\0'))
1767
1975
                except socket.error as error:
1768
 
                    if error[0] == errno.EPERM:
1769
 
                        logger.error("No permission to"
1770
 
                                     " bind to interface %s",
1771
 
                                     self.interface)
1772
 
                    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:
1773
1980
                        logger.error("SO_BINDTODEVICE not available;"
1774
1981
                                     " cannot bind to interface %s",
1775
1982
                                     self.interface)
 
1983
                    elif error.errno == errno.ENODEV:
 
1984
                        logger.error("Interface %s does not exist,"
 
1985
                                     " cannot bind", self.interface)
1776
1986
                    else:
1777
1987
                        raise
1778
1988
        # Only bind(2) the socket if we really need to.
1781
1991
                if self.address_family == socket.AF_INET6:
1782
1992
                    any_address = "::" # in6addr_any
1783
1993
                else:
1784
 
                    any_address = socket.INADDR_ANY
 
1994
                    any_address = "0.0.0.0" # INADDR_ANY
1785
1995
                self.server_address = (any_address,
1786
1996
                                       self.server_address[1])
1787
1997
            elif not self.server_address[1]:
1808
2018
    """
1809
2019
    def __init__(self, server_address, RequestHandlerClass,
1810
2020
                 interface=None, use_ipv6=True, clients=None,
1811
 
                 gnutls_priority=None, use_dbus=True):
 
2021
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1812
2022
        self.enabled = False
1813
2023
        self.clients = clients
1814
2024
        if self.clients is None:
1818
2028
        IPv6_TCPServer.__init__(self, server_address,
1819
2029
                                RequestHandlerClass,
1820
2030
                                interface = interface,
1821
 
                                use_ipv6 = use_ipv6)
 
2031
                                use_ipv6 = use_ipv6,
 
2032
                                socketfd = socketfd)
1822
2033
    def server_activate(self):
1823
2034
        if self.enabled:
1824
2035
            return socketserver.TCPServer.server_activate(self)
1837
2048
    
1838
2049
    def handle_ipc(self, source, condition, parent_pipe=None,
1839
2050
                   proc = None, client_object=None):
1840
 
        condition_names = {
1841
 
            gobject.IO_IN: "IN",   # There is data to read.
1842
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1843
 
                                    # blocking).
1844
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1845
 
            gobject.IO_ERR: "ERR", # Error condition.
1846
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1847
 
                                    # broken, usually for pipes and
1848
 
                                    # sockets).
1849
 
            }
1850
 
        conditions_string = ' | '.join(name
1851
 
                                       for cond, name in
1852
 
                                       condition_names.iteritems()
1853
 
                                       if cond & condition)
1854
2051
        # error, or the other end of multiprocessing.Pipe has closed
1855
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2052
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1856
2053
            # Wait for other process to exit
1857
2054
            proc.join()
1858
2055
            return False
1916
2113
        return True
1917
2114
 
1918
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
 
1919
2215
def string_to_delta(interval):
1920
2216
    """Parse a string and return a datetime.timedelta
1921
2217
    
1932
2228
    >>> string_to_delta('5m 30s')
1933
2229
    datetime.timedelta(0, 330)
1934
2230
    """
 
2231
    
 
2232
    try:
 
2233
        return rfc3339_duration_to_delta(interval)
 
2234
    except ValueError:
 
2235
        pass
 
2236
    
1935
2237
    timevalue = datetime.timedelta(0)
1936
2238
    for s in interval.split():
1937
2239
        try:
1948
2250
            elif suffix == "w":
1949
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1950
2252
            else:
1951
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2253
                raise ValueError("Unknown suffix {0!r}"
 
2254
                                 .format(suffix))
1952
2255
        except (ValueError, IndexError) as e:
1953
2256
            raise ValueError(*(e.args))
1954
2257
        timevalue += delta
1968
2271
        sys.exit()
1969
2272
    if not noclose:
1970
2273
        # Close all standard open file descriptors
1971
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1972
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1973
2276
            raise OSError(errno.ENODEV,
1974
 
                          "%s not a character device"
1975
 
                          % os.path.devnull)
 
2277
                          "{0} not a character device"
 
2278
                          .format(os.devnull))
1976
2279
        os.dup2(null, sys.stdin.fileno())
1977
2280
        os.dup2(null, sys.stdout.fileno())
1978
2281
        os.dup2(null, sys.stderr.fileno())
1987
2290
    
1988
2291
    parser = argparse.ArgumentParser()
1989
2292
    parser.add_argument("-v", "--version", action="version",
1990
 
                        version = "%%(prog)s %s" % version,
 
2293
                        version = "%(prog)s {0}".format(version),
1991
2294
                        help="show version number and exit")
1992
2295
    parser.add_argument("-i", "--interface", metavar="IF",
1993
2296
                        help="Bind to interface IF")
1999
2302
                        help="Run self-test")
2000
2303
    parser.add_argument("--debug", action="store_true",
2001
2304
                        help="Debug mode; run in foreground and log"
2002
 
                        " to terminal")
 
2305
                        " to terminal", default=None)
2003
2306
    parser.add_argument("--debuglevel", metavar="LEVEL",
2004
2307
                        help="Debug level for stdout output")
2005
2308
    parser.add_argument("--priority", help="GnuTLS"
2012
2315
                        " files")
2013
2316
    parser.add_argument("--no-dbus", action="store_false",
2014
2317
                        dest="use_dbus", help="Do not provide D-Bus"
2015
 
                        " system bus interface")
 
2318
                        " system bus interface", default=None)
2016
2319
    parser.add_argument("--no-ipv6", action="store_false",
2017
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2320
                        dest="use_ipv6", help="Do not use IPv6",
 
2321
                        default=None)
2018
2322
    parser.add_argument("--no-restore", action="store_false",
2019
2323
                        dest="restore", help="Do not restore stored"
2020
 
                        " 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")
2021
2328
    parser.add_argument("--statedir", metavar="DIR",
2022
2329
                        help="Directory to save/restore state in")
 
2330
    parser.add_argument("--foreground", action="store_true",
 
2331
                        help="Run in foreground", default=None)
2023
2332
    
2024
2333
    options = parser.parse_args()
2025
2334
    
2034
2343
                        "port": "",
2035
2344
                        "debug": "False",
2036
2345
                        "priority":
2037
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2038
2347
                        "servicename": "Mandos",
2039
2348
                        "use_dbus": "True",
2040
2349
                        "use_ipv6": "True",
2041
2350
                        "debuglevel": "",
2042
2351
                        "restore": "True",
2043
 
                        "statedir": "/var/lib/mandos"
 
2352
                        "socket": "",
 
2353
                        "statedir": "/var/lib/mandos",
 
2354
                        "foreground": "False",
2044
2355
                        }
2045
2356
    
2046
2357
    # Parse config file for server-global settings
2051
2362
    # Convert the SafeConfigParser object to a dict
2052
2363
    server_settings = server_config.defaults()
2053
2364
    # Use the appropriate methods on the non-string config options
2054
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2365
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2055
2366
        server_settings[option] = server_config.getboolean("DEFAULT",
2056
2367
                                                           option)
2057
2368
    if server_settings["port"]:
2058
2369
        server_settings["port"] = server_config.getint("DEFAULT",
2059
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"])
2060
2380
    del server_config
2061
2381
    
2062
2382
    # Override the settings from the config file with command line
2064
2384
    for option in ("interface", "address", "port", "debug",
2065
2385
                   "priority", "servicename", "configdir",
2066
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2067
 
                   "statedir"):
 
2387
                   "statedir", "socket", "foreground"):
2068
2388
        value = getattr(options, option)
2069
2389
        if value is not None:
2070
2390
            server_settings[option] = value
2073
2393
    for option in server_settings.keys():
2074
2394
        if type(server_settings[option]) is str:
2075
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
2076
2403
    # Now we have our good server settings in "server_settings"
2077
2404
    
2078
2405
    ##################################################################
2084
2411
    use_ipv6 = server_settings["use_ipv6"]
2085
2412
    stored_state_path = os.path.join(server_settings["statedir"],
2086
2413
                                     stored_state_file)
 
2414
    foreground = server_settings["foreground"]
2087
2415
    
2088
2416
    if debug:
2089
2417
        initlogger(debug, logging.DEBUG)
2096
2424
    
2097
2425
    if server_settings["servicename"] != "Mandos":
2098
2426
        syslogger.setFormatter(logging.Formatter
2099
 
                               ('Mandos (%s) [%%(process)d]:'
2100
 
                                ' %%(levelname)s: %%(message)s'
2101
 
                                % server_settings["servicename"]))
 
2427
                               ('Mandos ({0}) [%(process)d]:'
 
2428
                                ' %(levelname)s: %(message)s'
 
2429
                                .format(server_settings
 
2430
                                        ["servicename"])))
2102
2431
    
2103
2432
    # Parse config file with clients
2104
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
2433
    client_config = configparser.SafeConfigParser(Client
 
2434
                                                  .client_defaults)
2105
2435
    client_config.read(os.path.join(server_settings["configdir"],
2106
2436
                                    "clients.conf"))
2107
2437
    
2116
2446
                              use_ipv6=use_ipv6,
2117
2447
                              gnutls_priority=
2118
2448
                              server_settings["priority"],
2119
 
                              use_dbus=use_dbus)
2120
 
    if not debug:
2121
 
        pidfilename = "/var/run/mandos.pid"
 
2449
                              use_dbus=use_dbus,
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
 
2452
    if not foreground:
 
2453
        pidfilename = "/run/mandos.pid"
 
2454
        pidfile = None
2122
2455
        try:
2123
2456
            pidfile = open(pidfilename, "w")
2124
 
        except IOError:
2125
 
            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)
2126
2460
    
2127
 
    try:
2128
 
        uid = pwd.getpwnam("_mandos").pw_uid
2129
 
        gid = pwd.getpwnam("_mandos").pw_gid
2130
 
    except KeyError:
 
2461
    for name in ("_mandos", "mandos", "nobody"):
2131
2462
        try:
2132
 
            uid = pwd.getpwnam("mandos").pw_uid
2133
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2463
            uid = pwd.getpwnam(name).pw_uid
 
2464
            gid = pwd.getpwnam(name).pw_gid
 
2465
            break
2134
2466
        except KeyError:
2135
 
            try:
2136
 
                uid = pwd.getpwnam("nobody").pw_uid
2137
 
                gid = pwd.getpwnam("nobody").pw_gid
2138
 
            except KeyError:
2139
 
                uid = 65534
2140
 
                gid = 65534
 
2467
            continue
 
2468
    else:
 
2469
        uid = 65534
 
2470
        gid = 65534
2141
2471
    try:
2142
2472
        os.setgid(gid)
2143
2473
        os.setuid(uid)
2144
2474
    except OSError as error:
2145
 
        if error[0] != errno.EPERM:
 
2475
        if error.errno != errno.EPERM:
2146
2476
            raise error
2147
2477
    
2148
2478
    if debug:
2160
2490
         .gnutls_global_set_log_function(debug_gnutls))
2161
2491
        
2162
2492
        # Redirect stdin so all checkers get /dev/null
2163
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2493
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2164
2494
        os.dup2(null, sys.stdin.fileno())
2165
2495
        if null > 2:
2166
2496
            os.close(null)
2167
2497
    
2168
2498
    # Need to fork before connecting to D-Bus
2169
 
    if not debug:
 
2499
    if not foreground:
2170
2500
        # Close all input and output, do double fork, etc.
2171
2501
        daemon()
2172
2502
    
 
2503
    # multiprocessing will use threads, so before we use gobject we
 
2504
    # need to inform gobject that threads will be used.
2173
2505
    gobject.threads_init()
2174
2506
    
2175
2507
    global main_loop
2176
2508
    # From the Avahi example code
2177
 
    DBusGMainLoop(set_as_default=True )
 
2509
    DBusGMainLoop(set_as_default=True)
2178
2510
    main_loop = gobject.MainLoop()
2179
2511
    bus = dbus.SystemBus()
2180
2512
    # End of Avahi example code
2186
2518
                            ("se.bsnet.fukt.Mandos", bus,
2187
2519
                             do_not_queue=True))
2188
2520
        except dbus.exceptions.NameExistsException as e:
2189
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2521
            logger.error("Disabling D-Bus:", exc_info=e)
2190
2522
            use_dbus = False
2191
2523
            server_settings["use_dbus"] = False
2192
2524
            tcp_server.use_dbus = False
2204
2536
    
2205
2537
    client_class = Client
2206
2538
    if use_dbus:
2207
 
        client_class = functools.partial(ClientDBusTransitional,
2208
 
                                         bus = bus)
 
2539
        client_class = functools.partial(ClientDBus, bus = bus)
2209
2540
    
2210
2541
    client_settings = Client.config_parser(client_config)
2211
2542
    old_client_settings = {}
2212
2543
    clients_data = {}
2213
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
    
2214
2553
    # Get client data and settings from last running state.
2215
2554
    if server_settings["restore"]:
2216
2555
        try:
2219
2558
                                                     (stored_state))
2220
2559
            os.remove(stored_state_path)
2221
2560
        except IOError as e:
2222
 
            logger.warning("Could not load persistent state: {0}"
2223
 
                           .format(e))
2224
 
            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)
2225
2567
                raise
2226
2568
        except EOFError as e:
2227
2569
            logger.warning("Could not load persistent state: "
2228
 
                           "EOFError: {0}".format(e))
 
2570
                           "EOFError:", exc_info=e)
2229
2571
    
2230
2572
    with PGPEngine() as pgp:
2231
2573
        for client_name, client in clients_data.iteritems():
 
2574
            # Skip removed clients
 
2575
            if client_name not in client_settings:
 
2576
                continue
 
2577
            
2232
2578
            # Decide which value to use after restoring saved state.
2233
2579
            # We have three different values: Old config file,
2234
2580
            # new config file, and saved state.
2248
2594
            
2249
2595
            # Clients who has passed its expire date can still be
2250
2596
            # enabled if its last checker was successful.  Clients
2251
 
            # whose checker failed before we stored its state is
2252
 
            # 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.
2253
2600
            if client["enabled"]:
2254
2601
                if datetime.datetime.utcnow() >= client["expires"]:
2255
2602
                    if not client["last_checked_ok"]:
2256
2603
                        logger.warning(
2257
2604
                            "disabling client {0} - Client never "
2258
 
                            "performed a successfull checker"
2259
 
                            .format(client["name"]))
 
2605
                            "performed a successful checker"
 
2606
                            .format(client_name))
2260
2607
                        client["enabled"] = False
2261
2608
                    elif client["last_checker_status"] != 0:
2262
2609
                        logger.warning(
2263
2610
                            "disabling client {0} - Client "
2264
2611
                            "last checker failed with error code {1}"
2265
 
                            .format(client["name"],
 
2612
                            .format(client_name,
2266
2613
                                    client["last_checker_status"]))
2267
2614
                        client["enabled"] = False
2268
2615
                    else:
2271
2618
                                             + client["timeout"])
2272
2619
                        logger.debug("Last checker succeeded,"
2273
2620
                                     " keeping {0} enabled"
2274
 
                                     .format(client["name"]))
 
2621
                                     .format(client_name))
2275
2622
            try:
2276
2623
                client["secret"] = (
2277
2624
                    pgp.decrypt(client["encrypted_secret"],
2283
2630
                             .format(client_name))
2284
2631
                client["secret"] = (
2285
2632
                    client_settings[client_name]["secret"])
2286
 
 
2287
2633
    
2288
2634
    # Add/remove clients based on new changes made to config
2289
 
    for client_name in set(old_client_settings) - set(client_settings):
 
2635
    for client_name in (set(old_client_settings)
 
2636
                        - set(client_settings)):
2290
2637
        del clients_data[client_name]
2291
 
    for client_name in set(client_settings) - set(old_client_settings):
 
2638
    for client_name in (set(client_settings)
 
2639
                        - set(old_client_settings)):
2292
2640
        clients_data[client_name] = client_settings[client_name]
2293
 
 
2294
 
    # Create clients all clients
 
2641
    
 
2642
    # Create all client objects
2295
2643
    for client_name, client in clients_data.iteritems():
2296
2644
        tcp_server.clients[client_name] = client_class(
2297
 
            name = client_name, settings = client)
 
2645
            name = client_name, settings = client,
 
2646
            server_settings = server_settings)
2298
2647
    
2299
2648
    if not tcp_server.clients:
2300
2649
        logger.warning("No clients defined")
2301
 
        
2302
 
    if not debug:
2303
 
        try:
2304
 
            with pidfile:
2305
 
                pid = os.getpid()
2306
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2307
 
            del pidfile
2308
 
        except IOError:
2309
 
            logger.error("Could not write to file %r with PID %d",
2310
 
                         pidfilename, pid)
2311
 
        except NameError:
2312
 
            # "pidfile" was never created
2313
 
            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
2314
2661
        del pidfilename
2315
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2316
2662
    
2317
2663
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2318
2664
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2319
2665
    
2320
2666
    if use_dbus:
2321
 
        class MandosDBusService(dbus.service.Object):
 
2667
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2668
                                        "se.bsnet.fukt.Mandos"})
 
2669
        class MandosDBusService(DBusObjectWithProperties):
2322
2670
            """A D-Bus proxy object"""
2323
2671
            def __init__(self):
2324
2672
                dbus.service.Object.__init__(self, bus, "/")
2325
2673
            _interface = "se.recompile.Mandos"
2326
2674
            
 
2675
            @dbus_interface_annotations(_interface)
 
2676
            def _foo(self):
 
2677
                return { "org.freedesktop.DBus.Property"
 
2678
                         ".EmitsChangedSignal":
 
2679
                             "false"}
 
2680
            
2327
2681
            @dbus.service.signal(_interface, signature="o")
2328
2682
            def ClientAdded(self, objpath):
2329
2683
                "D-Bus signal"
2371
2725
            
2372
2726
            del _interface
2373
2727
        
2374
 
        class MandosDBusServiceTransitional(MandosDBusService):
2375
 
            __metaclass__ = AlternateDBusNamesMetaclass
2376
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2728
        mandos_dbus_service = MandosDBusService()
2377
2729
    
2378
2730
    def cleanup():
2379
2731
        "Cleanup function; run on exit"
2380
2732
        service.cleanup()
2381
2733
        
2382
2734
        multiprocessing.active_children()
 
2735
        wnull.close()
2383
2736
        if not (tcp_server.clients or client_settings):
2384
2737
            return
2385
2738
        
2397
2750
                # A list of attributes that can not be pickled
2398
2751
                # + secret.
2399
2752
                exclude = set(("bus", "changedstate", "secret",
2400
 
                               "checker"))
 
2753
                               "checker", "server_settings"))
2401
2754
                for name, typ in (inspect.getmembers
2402
2755
                                  (dbus.service.Object)):
2403
2756
                    exclude.add(name)
2412
2765
                del client_settings[client.name]["secret"]
2413
2766
        
2414
2767
        try:
2415
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2416
 
                                                prefix="clients-",
2417
 
                                                dir=os.path.dirname
2418
 
                                                (stored_state_path))
2419
 
            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:
2420
2772
                pickle.dump((clients, client_settings), stored_state)
 
2773
                tempname=stored_state.name
2421
2774
            os.rename(tempname, stored_state_path)
2422
2775
        except (IOError, OSError) as e:
2423
 
            logger.warning("Could not save persistent state: {0}"
2424
 
                           .format(e))
2425
2776
            if not debug:
2426
2777
                try:
2427
2778
                    os.remove(tempname)
2428
2779
                except NameError:
2429
2780
                    pass
2430
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2431
 
                                   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)
2432
2787
                raise e
2433
2788
        
2434
2789
        # Delete all clients, and settings from config
2462
2817
    service.port = tcp_server.socket.getsockname()[1]
2463
2818
    if use_ipv6:
2464
2819
        logger.info("Now listening on address %r, port %d,"
2465
 
                    " flowinfo %d, scope_id %d"
2466
 
                    % tcp_server.socket.getsockname())
 
2820
                    " flowinfo %d, scope_id %d",
 
2821
                    *tcp_server.socket.getsockname())
2467
2822
    else:                       # IPv4
2468
 
        logger.info("Now listening on address %r, port %d"
2469
 
                    % tcp_server.socket.getsockname())
 
2823
        logger.info("Now listening on address %r, port %d",
 
2824
                    *tcp_server.socket.getsockname())
2470
2825
    
2471
2826
    #service.interface = tcp_server.socket.getsockname()[3]
2472
2827
    
2475
2830
        try:
2476
2831
            service.activate()
2477
2832
        except dbus.exceptions.DBusException as error:
2478
 
            logger.critical("DBusException: %s", error)
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
2479
2834
            cleanup()
2480
2835
            sys.exit(1)
2481
2836
        # End of Avahi example code
2488
2843
        logger.debug("Starting main loop")
2489
2844
        main_loop.run()
2490
2845
    except AvahiError as error:
2491
 
        logger.critical("AvahiError: %s", error)
 
2846
        logger.critical("Avahi Error", exc_info=error)
2492
2847
        cleanup()
2493
2848
        sys.exit(1)
2494
2849
    except KeyboardInterrupt: