/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

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-2013 Teddy Hogeborn
15
 
# Copyright © 2008-2013 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
79
75
import ctypes.util
80
76
import xml.dom.minidom
81
77
import inspect
 
78
import GnuPGInterface
82
79
 
83
80
try:
84
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.6.2"
 
88
version = "1.5.0"
92
89
stored_state_file = "clients.pickle"
93
90
 
94
91
logger = logging.getLogger()
139
136
class PGPEngine(object):
140
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
142
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--force-mdc',
146
 
                          '--quiet',
147
 
                          '--no-use-agent']
 
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'])
148
147
    
149
148
    def __enter__(self):
150
149
        return self
151
150
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
153
152
        self._cleanup()
154
153
        return False
155
154
    
172
171
    def password_encode(self, password):
173
172
        # Passphrase can not be empty and can not contain newlines or
174
173
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        encoded = b"mandos" + binascii.hexlify(password)
176
 
        if len(encoded) > 2048:
177
 
            # GnuPG can't handle long passwords, so encode differently
178
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
179
 
                       .replace(b"\n", b"\\n")
180
 
                       .replace(b"\0", b"\\x00"))
181
 
        return encoded
 
174
        return b"mandos" + binascii.hexlify(password)
182
175
    
183
176
    def encrypt(self, data, password):
184
 
        passphrase = self.password_encode(password)
185
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
186
 
                                         ) as passfile:
187
 
            passfile.write(passphrase)
188
 
            passfile.flush()
189
 
            proc = subprocess.Popen(['gpg', '--symmetric',
190
 
                                     '--passphrase-file',
191
 
                                     passfile.name]
192
 
                                    + self.gnupgargs,
193
 
                                    stdin = subprocess.PIPE,
194
 
                                    stdout = subprocess.PIPE,
195
 
                                    stderr = subprocess.PIPE)
196
 
            ciphertext, err = proc.communicate(input = data)
197
 
        if proc.returncode != 0:
198
 
            raise PGPError(err)
 
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
199
191
        return ciphertext
200
192
    
201
193
    def decrypt(self, data, password):
202
 
        passphrase = self.password_encode(password)
203
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
204
 
                                         ) as passfile:
205
 
            passfile.write(passphrase)
206
 
            passfile.flush()
207
 
            proc = subprocess.Popen(['gpg', '--decrypt',
208
 
                                     '--passphrase-file',
209
 
                                     passfile.name]
210
 
                                    + self.gnupgargs,
211
 
                                    stdin = subprocess.PIPE,
212
 
                                    stdout = subprocess.PIPE,
213
 
                                    stderr = subprocess.PIPE)
214
 
            decrypted_plaintext, err = proc.communicate(input
215
 
                                                        = data)
216
 
        if proc.returncode != 0:
217
 
            raise PGPError(err)
 
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
218
208
        return decrypted_plaintext
219
209
 
220
210
 
 
211
 
221
212
class AvahiError(Exception):
222
213
    def __init__(self, value, *args, **kwargs):
223
214
        self.value = value
240
231
               Used to optionally bind to the specified interface.
241
232
    name: string; Example: 'Mandos'
242
233
    type: string; Example: '_mandos._tcp'.
243
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
244
235
    port: integer; what port to announce
245
236
    TXT: list of strings; TXT record for the service
246
237
    domain: string; Domain to publish on, default to .local if empty.
252
243
    server: D-Bus Server
253
244
    bus: dbus.SystemBus()
254
245
    """
255
 
    
256
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
247
                 servicetype = None, port = None, TXT = None,
258
248
                 domain = "", host = "", max_renames = 32768,
271
261
        self.server = None
272
262
        self.bus = bus
273
263
        self.entry_group_state_changed_match = None
274
 
    
275
264
    def rename(self):
276
265
        """Derived from the Avahi example code"""
277
266
        if self.rename_count >= self.max_renames:
287
276
        try:
288
277
            self.add()
289
278
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
 
279
            logger.critical("DBusException: %s", error)
291
280
            self.cleanup()
292
281
            os._exit(1)
293
282
        self.rename_count += 1
294
 
    
295
283
    def remove(self):
296
284
        """Derived from the Avahi example code"""
297
285
        if self.entry_group_state_changed_match is not None:
299
287
            self.entry_group_state_changed_match = None
300
288
        if self.group is not None:
301
289
            self.group.Reset()
302
 
    
303
290
    def add(self):
304
291
        """Derived from the Avahi example code"""
305
292
        self.remove()
322
309
            dbus.UInt16(self.port),
323
310
            avahi.string_array_to_txt_array(self.TXT))
324
311
        self.group.Commit()
325
 
    
326
312
    def entry_group_state_changed(self, state, error):
327
313
        """Derived from the Avahi example code"""
328
314
        logger.debug("Avahi entry group state change: %i", state)
335
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
322
            logger.critical("Avahi: Error in group state changed %s",
337
323
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {0!s}"
339
 
                                  .format(error))
340
 
    
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
341
326
    def cleanup(self):
342
327
        """Derived from the Avahi example code"""
343
328
        if self.group is not None:
348
333
                pass
349
334
            self.group = None
350
335
        self.remove()
351
 
    
352
336
    def server_state_changed(self, state, error=None):
353
337
        """Derived from the Avahi example code"""
354
338
        logger.debug("Avahi server state change: %i", state)
373
357
                logger.debug("Unknown state: %r", state)
374
358
            else:
375
359
                logger.debug("Unknown state: %r: %r", state, error)
376
 
    
377
360
    def activate(self):
378
361
        """Derived from the Avahi example code"""
379
362
        if self.server is None:
386
369
                                 self.server_state_changed)
387
370
        self.server_state_changed(self.server.GetState())
388
371
 
389
 
 
390
372
class AvahiServiceToSyslog(AvahiService):
391
373
    def rename(self):
392
374
        """Add the new name to the syslog messages"""
393
375
        ret = AvahiService.rename(self)
394
376
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({0}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
398
380
        return ret
399
381
 
400
 
 
401
382
def timedelta_to_milliseconds(td):
402
383
    "Convert a datetime.timedelta() to milliseconds"
403
384
    return ((td.days * 24 * 60 * 60 * 1000)
404
385
            + (td.seconds * 1000)
405
386
            + (td.microseconds // 1000))
406
 
 
407
 
 
 
387
        
408
388
class Client(object):
409
389
    """A representation of a client host served by this server.
410
390
    
435
415
    last_checked_ok: datetime.datetime(); (UTC) or None
436
416
    last_checker_status: integer between 0 and 255 reflecting exit
437
417
                         status of last checker. -1 reflects crashed
438
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
439
419
    last_enabled: datetime.datetime(); (UTC) or None
440
420
    name:       string; from the config file, used in log messages and
441
421
                        D-Bus identifiers
442
422
    secret:     bytestring; sent verbatim (over TLS) to client
443
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
444
424
                                      until this client is disabled
445
 
    extended_timeout:   extra long timeout when secret has been sent
 
425
    extended_timeout:   extra long timeout when password has been sent
446
426
    runtime_expansions: Allowed attributes for runtime expansion.
447
427
    expires:    datetime.datetime(); time (UTC) when a client will be
448
428
                disabled, or None
449
 
    server_settings: The server_settings dict from main()
450
429
    """
451
430
    
452
431
    runtime_expansions = ("approval_delay", "approval_duration",
453
 
                          "created", "enabled", "expires",
454
 
                          "fingerprint", "host", "interval",
455
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
456
434
                          "last_enabled", "name", "timeout")
457
 
    client_defaults = { "timeout": "PT5M",
458
 
                        "extended_timeout": "PT15M",
459
 
                        "interval": "PT2M",
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
460
438
                        "checker": "fping -q -- %%(host)s",
461
439
                        "host": "",
462
 
                        "approval_delay": "PT0S",
463
 
                        "approval_duration": "PT1S",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
464
442
                        "approved_by_default": "True",
465
443
                        "enabled": "True",
466
444
                        }
479
457
    
480
458
    def approval_delay_milliseconds(self):
481
459
        return timedelta_to_milliseconds(self.approval_delay)
482
 
    
 
460
 
483
461
    @staticmethod
484
462
    def config_parser(config):
485
463
        """Construct a new dict of client settings of this form:
510
488
                          "rb") as secfile:
511
489
                    client["secret"] = secfile.read()
512
490
            else:
513
 
                raise TypeError("No secret or secfile for section {0}"
514
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
515
493
            client["timeout"] = string_to_delta(section["timeout"])
516
494
            client["extended_timeout"] = string_to_delta(
517
495
                section["extended_timeout"])
523
501
            client["checker_command"] = section["checker"]
524
502
            client["last_approval_request"] = None
525
503
            client["last_checked_ok"] = None
526
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
527
505
        
528
506
        return settings
529
 
    
530
 
    def __init__(self, settings, name = None, server_settings=None):
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
 
510
        """Note: the 'checker' key in 'config' sets the
 
511
        'checker_command' attribute and *not* the 'checker'
 
512
        attribute."""
531
513
        self.name = name
532
 
        if server_settings is None:
533
 
            server_settings = {}
534
 
        self.server_settings = server_settings
535
514
        # adding all client settings
536
515
        for setting, value in settings.iteritems():
537
516
            setattr(self, setting, value)
545
524
        else:
546
525
            self.last_enabled = None
547
526
            self.expires = None
548
 
        
 
527
       
549
528
        logger.debug("Creating client %r", self.name)
550
529
        # Uppercase and remove spaces from fingerprint for later
551
530
        # comparison purposes with return value from the fingerprint()
553
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
554
533
        self.created = settings.get("created",
555
534
                                    datetime.datetime.utcnow())
556
 
        
 
535
 
557
536
        # attributes specific for this server instance
558
537
        self.checker = None
559
538
        self.checker_initiator_tag = None
587
566
        if getattr(self, "enabled", False):
588
567
            # Already enabled
589
568
            return
 
569
        self.send_changedstate()
590
570
        self.expires = datetime.datetime.utcnow() + self.timeout
591
571
        self.enabled = True
592
572
        self.last_enabled = datetime.datetime.utcnow()
593
573
        self.init_checker()
594
 
        self.send_changedstate()
595
574
    
596
575
    def disable(self, quiet=True):
597
576
        """Disable this client."""
598
577
        if not getattr(self, "enabled", False):
599
578
            return False
600
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
601
582
            logger.info("Disabling client %s", self.name)
602
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
603
584
            gobject.source_remove(self.disable_initiator_tag)
604
585
            self.disable_initiator_tag = None
605
586
        self.expires = None
606
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
607
588
            gobject.source_remove(self.checker_initiator_tag)
608
589
            self.checker_initiator_tag = None
609
590
        self.stop_checker()
610
591
        self.enabled = False
611
 
        if not quiet:
612
 
            self.send_changedstate()
613
592
        # Do not run this again if called by a gobject.timeout_add
614
593
        return False
615
594
    
619
598
    def init_checker(self):
620
599
        # Schedule a new checker to be started an 'interval' from now,
621
600
        # and every interval from then on.
622
 
        if self.checker_initiator_tag is not None:
623
 
            gobject.source_remove(self.checker_initiator_tag)
624
601
        self.checker_initiator_tag = (gobject.timeout_add
625
602
                                      (self.interval_milliseconds(),
626
603
                                       self.start_checker))
627
604
        # Schedule a disable() when 'timeout' has passed
628
 
        if self.disable_initiator_tag is not None:
629
 
            gobject.source_remove(self.disable_initiator_tag)
630
605
        self.disable_initiator_tag = (gobject.timeout_add
631
606
                                   (self.timeout_milliseconds(),
632
607
                                    self.disable))
651
626
            logger.warning("Checker for %(name)s crashed?",
652
627
                           vars(self))
653
628
    
654
 
    def checked_ok(self):
655
 
        """Assert that the client has been seen, alive and well."""
656
 
        self.last_checked_ok = datetime.datetime.utcnow()
657
 
        self.last_checker_status = 0
658
 
        self.bump_timeout()
659
 
    
660
 
    def bump_timeout(self, timeout=None):
661
 
        """Bump up the timeout for this client."""
 
629
    def checked_ok(self, timeout=None):
 
630
        """Bump up the timeout for this client.
 
631
        
 
632
        This should only be called when the client has been seen,
 
633
        alive and well.
 
634
        """
662
635
        if timeout is None:
663
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
664
638
        if self.disable_initiator_tag is not None:
665
639
            gobject.source_remove(self.disable_initiator_tag)
666
 
            self.disable_initiator_tag = None
667
640
        if getattr(self, "enabled", False):
668
641
            self.disable_initiator_tag = (gobject.timeout_add
669
642
                                          (timedelta_to_milliseconds
679
652
        If a checker already exists, leave it running and do
680
653
        nothing."""
681
654
        # The reason for not killing a running checker is that if we
682
 
        # did that, and if a checker (for some reason) started running
683
 
        # slowly and taking more than 'interval' time, then the client
684
 
        # would inevitably timeout, since no checker would get a
685
 
        # chance to run to completion.  If we instead leave running
 
655
        # did that, then if a checker (for some reason) started
 
656
        # running slowly and taking more than 'interval' time, the
 
657
        # client would inevitably timeout, since no checker would get
 
658
        # a chance to run to completion.  If we instead leave running
686
659
        # checkers alone, the checker would have to take more time
687
660
        # than 'timeout' for the client to be disabled, which is as it
688
661
        # should be.
702
675
                                      self.current_checker_command)
703
676
        # Start a new checker if needed
704
677
        if self.checker is None:
705
 
            # Escape attributes for the shell
706
 
            escaped_attrs = dict(
707
 
                (attr, re.escape(unicode(getattr(self, attr))))
708
 
                for attr in
709
 
                self.runtime_expansions)
710
678
            try:
711
 
                command = self.checker_command % escaped_attrs
712
 
            except TypeError as error:
713
 
                logger.error('Could not format string "%s"',
714
 
                             self.checker_command, exc_info=error)
715
 
                return True # Try again later
 
679
                # In case checker_command has exactly one % operator
 
680
                command = self.checker_command % self.host
 
681
            except TypeError:
 
682
                # Escape attributes for the shell
 
683
                escaped_attrs = dict(
 
684
                    (attr,
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
 
686
                                       errors=
 
687
                                       'replace')))
 
688
                    for attr in
 
689
                    self.runtime_expansions)
 
690
                
 
691
                try:
 
692
                    command = self.checker_command % escaped_attrs
 
693
                except TypeError as error:
 
694
                    logger.error('Could not format string "%s":'
 
695
                                 ' %s', self.checker_command, error)
 
696
                    return True # Try again later
716
697
            self.current_checker_command = command
717
698
            try:
718
699
                logger.info("Starting checker %r for %s",
721
702
                # in normal mode, that is already done by daemon(),
722
703
                # and in debug mode we don't want to.  (Stdin is
723
704
                # always replaced by /dev/null.)
724
 
                # The exception is when not debugging but nevertheless
725
 
                # running in the foreground; use the previously
726
 
                # created wnull.
727
 
                popen_args = {}
728
 
                if (not self.server_settings["debug"]
729
 
                    and self.server_settings["foreground"]):
730
 
                    popen_args.update({"stdout": wnull,
731
 
                                       "stderr": wnull })
732
705
                self.checker = subprocess.Popen(command,
733
706
                                                close_fds=True,
734
 
                                                shell=True, cwd="/",
735
 
                                                **popen_args)
736
 
            except OSError as error:
737
 
                logger.error("Failed to start subprocess",
738
 
                             exc_info=error)
739
 
                return True
740
 
            self.checker_callback_tag = (gobject.child_watch_add
741
 
                                         (self.checker.pid,
742
 
                                          self.checker_callback,
743
 
                                          data=command))
744
 
            # The checker may have completed before the gobject
745
 
            # watch was added.  Check for this.
746
 
            try:
 
707
                                                shell=True, cwd="/")
 
708
                self.checker_callback_tag = (gobject.child_watch_add
 
709
                                             (self.checker.pid,
 
710
                                              self.checker_callback,
 
711
                                              data=command))
 
712
                # The checker may have completed before the gobject
 
713
                # watch was added.  Check for this.
747
714
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
715
                if pid:
 
716
                    gobject.source_remove(self.checker_callback_tag)
 
717
                    self.checker_callback(pid, status, command)
748
718
            except OSError as error:
749
 
                if error.errno == errno.ECHILD:
750
 
                    # This should never happen
751
 
                    logger.error("Child process vanished",
752
 
                                 exc_info=error)
753
 
                    return True
754
 
                raise
755
 
            if pid:
756
 
                gobject.source_remove(self.checker_callback_tag)
757
 
                self.checker_callback(pid, status, command)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
758
721
        # Re-run this periodically if run by gobject.timeout_add
759
722
        return True
760
723
    
767
730
            return
768
731
        logger.debug("Stopping checker for %(name)s", vars(self))
769
732
        try:
770
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
771
734
            #time.sleep(0.5)
772
735
            #if self.checker.poll() is None:
773
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
774
737
        except OSError as error:
775
738
            if error.errno != errno.ESRCH: # No such process
776
739
                raise
793
756
    # "Set" method, so we fail early here:
794
757
    if byte_arrays and signature != "ay":
795
758
        raise ValueError("Byte arrays not supported for non-'ay'"
796
 
                         " signature {0!r}".format(signature))
 
759
                         " signature %r" % signature)
797
760
    def decorator(func):
798
761
        func._dbus_is_property = True
799
762
        func._dbus_interface = dbus_interface
807
770
    return decorator
808
771
 
809
772
 
810
 
def dbus_interface_annotations(dbus_interface):
811
 
    """Decorator for marking functions returning interface annotations
812
 
    
813
 
    Usage:
814
 
    
815
 
    @dbus_interface_annotations("org.example.Interface")
816
 
    def _foo(self):  # Function name does not matter
817
 
        return {"org.freedesktop.DBus.Deprecated": "true",
818
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
819
 
                    "false"}
820
 
    """
821
 
    def decorator(func):
822
 
        func._dbus_is_interface = True
823
 
        func._dbus_interface = dbus_interface
824
 
        func._dbus_name = dbus_interface
825
 
        return func
826
 
    return decorator
827
 
 
828
 
 
829
 
def dbus_annotations(annotations):
830
 
    """Decorator to annotate D-Bus methods, signals or properties
831
 
    Usage:
832
 
    
833
 
    @dbus_service_property("org.example.Interface", signature="b",
834
 
                           access="r")
835
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
 
                        "org.freedesktop.DBus.Property."
837
 
                        "EmitsChangedSignal": "false"})
838
 
    def Property_dbus_property(self):
839
 
        return dbus.Boolean(False)
840
 
    """
841
 
    def decorator(func):
842
 
        func._dbus_annotations = annotations
843
 
        return func
844
 
    return decorator
845
 
 
846
 
 
847
773
class DBusPropertyException(dbus.exceptions.DBusException):
848
774
    """A base class for D-Bus property-related exceptions
849
775
    """
872
798
    """
873
799
    
874
800
    @staticmethod
875
 
    def _is_dbus_thing(thing):
876
 
        """Returns a function testing if an attribute is a D-Bus thing
877
 
        
878
 
        If called like _is_dbus_thing("method") it returns a function
879
 
        suitable for use as predicate to inspect.getmembers().
880
 
        """
881
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
882
 
                                   False)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
883
803
    
884
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
885
805
        """Returns a generator of (name, attribute) pairs
886
806
        """
887
 
        return ((getattr(athing.__get__(self), "_dbus_name",
888
 
                         name),
889
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
890
808
                for cls in self.__class__.__mro__
891
 
                for name, athing in
892
 
                inspect.getmembers(cls,
893
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
894
811
    
895
812
    def _get_dbus_property(self, interface_name, property_name):
896
813
        """Returns a bound method if one exists which is a D-Bus
898
815
        """
899
816
        for cls in  self.__class__.__mro__:
900
817
            for name, value in (inspect.getmembers
901
 
                                (cls,
902
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
903
819
                if (value._dbus_name == property_name
904
820
                    and value._dbus_interface == interface_name):
905
821
                    return value.__get__(self)
947
863
        Note: Will not include properties with access="write".
948
864
        """
949
865
        properties = {}
950
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
951
867
            if (interface_name
952
868
                and interface_name != prop._dbus_interface):
953
869
                # Interface non-empty but did not match
968
884
                         path_keyword='object_path',
969
885
                         connection_keyword='connection')
970
886
    def Introspect(self, object_path, connection):
971
 
        """Overloading of standard D-Bus method.
972
 
        
973
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
974
888
        """
975
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
976
890
                                                   connection)
983
897
                e.setAttribute("access", prop._dbus_access)
984
898
                return e
985
899
            for if_tag in document.getElementsByTagName("interface"):
986
 
                # Add property tags
987
900
                for tag in (make_tag(document, name, prop)
988
901
                            for name, prop
989
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
990
903
                            if prop._dbus_interface
991
904
                            == if_tag.getAttribute("name")):
992
905
                    if_tag.appendChild(tag)
993
 
                # Add annotation tags
994
 
                for typ in ("method", "signal", "property"):
995
 
                    for tag in if_tag.getElementsByTagName(typ):
996
 
                        annots = dict()
997
 
                        for name, prop in (self.
998
 
                                           _get_all_dbus_things(typ)):
999
 
                            if (name == tag.getAttribute("name")
1000
 
                                and prop._dbus_interface
1001
 
                                == if_tag.getAttribute("name")):
1002
 
                                annots.update(getattr
1003
 
                                              (prop,
1004
 
                                               "_dbus_annotations",
1005
 
                                               {}))
1006
 
                        for name, value in annots.iteritems():
1007
 
                            ann_tag = document.createElement(
1008
 
                                "annotation")
1009
 
                            ann_tag.setAttribute("name", name)
1010
 
                            ann_tag.setAttribute("value", value)
1011
 
                            tag.appendChild(ann_tag)
1012
 
                # Add interface annotation tags
1013
 
                for annotation, value in dict(
1014
 
                    itertools.chain.from_iterable(
1015
 
                        annotations().iteritems()
1016
 
                        for name, annotations in
1017
 
                        self._get_all_dbus_things("interface")
1018
 
                        if name == if_tag.getAttribute("name")
1019
 
                        )).iteritems():
1020
 
                    ann_tag = document.createElement("annotation")
1021
 
                    ann_tag.setAttribute("name", annotation)
1022
 
                    ann_tag.setAttribute("value", value)
1023
 
                    if_tag.appendChild(ann_tag)
1024
906
                # Add the names to the return values for the
1025
907
                # "org.freedesktop.DBus.Properties" methods
1026
908
                if (if_tag.getAttribute("name")
1041
923
        except (AttributeError, xml.dom.DOMException,
1042
924
                xml.parsers.expat.ExpatError) as error:
1043
925
            logger.error("Failed to override Introspection method",
1044
 
                         exc_info=error)
 
926
                         error)
1045
927
        return xmlstring
1046
928
 
1047
929
 
1048
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1049
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1050
932
    if dt is None:
1051
933
        return dbus.String("", variant_level = variant_level)
1053
935
                       variant_level=variant_level)
1054
936
 
1055
937
 
1056
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1057
 
    """A class decorator; applied to a subclass of
1058
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1059
 
    interface names according to the "alt_interface_names" mapping.
1060
 
    Usage:
1061
 
    
1062
 
    @alternate_dbus_interfaces({"org.example.Interface":
1063
 
                                    "net.example.AlternateInterface"})
1064
 
    class SampleDBusObject(dbus.service.Object):
1065
 
        @dbus.service.method("org.example.Interface")
1066
 
        def SampleDBusMethod():
1067
 
            pass
1068
 
    
1069
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1070
 
    reachable via two interfaces: "org.example.Interface" and
1071
 
    "net.example.AlternateInterface", the latter of which will have
1072
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1073
 
    "true", unless "deprecate" is passed with a False value.
1074
 
    
1075
 
    This works for methods and signals, and also for D-Bus properties
1076
 
    (from DBusObjectWithProperties) and interfaces (from the
1077
 
    dbus_interface_annotations decorator).
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
1078
942
    """
1079
 
    def wrapper(cls):
1080
 
        for orig_interface_name, alt_interface_name in (
1081
 
            alt_interface_names.iteritems()):
1082
 
            attr = {}
1083
 
            interface_names = set()
1084
 
            # Go though all attributes of the class
1085
 
            for attrname, attribute in inspect.getmembers(cls):
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
1086
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1087
951
                # with the wrong interface name
1088
952
                if (not hasattr(attribute, "_dbus_interface")
1089
953
                    or not attribute._dbus_interface
1090
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1091
955
                    continue
1092
956
                # Create an alternate D-Bus interface name based on
1093
957
                # the current name
1094
958
                alt_interface = (attribute._dbus_interface
1095
 
                                 .replace(orig_interface_name,
1096
 
                                          alt_interface_name))
1097
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1098
961
                # Is this a D-Bus signal?
1099
962
                if getattr(attribute, "_dbus_is_signal", False):
1100
 
                    # Extract the original non-method undecorated
1101
 
                    # function by black magic
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
1102
965
                    nonmethod_func = (dict(
1103
966
                            zip(attribute.func_code.co_freevars,
1104
967
                                attribute.__closure__))["func"]
1115
978
                                nonmethod_func.func_name,
1116
979
                                nonmethod_func.func_defaults,
1117
980
                                nonmethod_func.func_closure)))
1118
 
                    # Copy annotations, if any
1119
 
                    try:
1120
 
                        new_function._dbus_annotations = (
1121
 
                            dict(attribute._dbus_annotations))
1122
 
                    except AttributeError:
1123
 
                        pass
1124
981
                    # Define a creator of a function to call both the
1125
 
                    # original and alternate functions, so both the
1126
 
                    # original and alternate signals gets sent when
1127
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1128
984
                    def fixscope(func1, func2):
1129
985
                        """This function is a scope container to pass
1130
986
                        func1 and func2 to the "call_both" function
1137
993
                        return call_both
1138
994
                    # Create the "call_both" function and add it to
1139
995
                    # the class
1140
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1141
998
                # Is this a D-Bus method?
1142
999
                elif getattr(attribute, "_dbus_is_method", False):
1143
1000
                    # Create a new, but exactly alike, function
1154
1011
                                        attribute.func_name,
1155
1012
                                        attribute.func_defaults,
1156
1013
                                        attribute.func_closure)))
1157
 
                    # Copy annotations, if any
1158
 
                    try:
1159
 
                        attr[attrname]._dbus_annotations = (
1160
 
                            dict(attribute._dbus_annotations))
1161
 
                    except AttributeError:
1162
 
                        pass
1163
1014
                # Is this a D-Bus property?
1164
1015
                elif getattr(attribute, "_dbus_is_property", False):
1165
1016
                    # Create a new, but exactly alike, function
1179
1030
                                        attribute.func_name,
1180
1031
                                        attribute.func_defaults,
1181
1032
                                        attribute.func_closure)))
1182
 
                    # Copy annotations, if any
1183
 
                    try:
1184
 
                        attr[attrname]._dbus_annotations = (
1185
 
                            dict(attribute._dbus_annotations))
1186
 
                    except AttributeError:
1187
 
                        pass
1188
 
                # Is this a D-Bus interface?
1189
 
                elif getattr(attribute, "_dbus_is_interface", False):
1190
 
                    # Create a new, but exactly alike, function
1191
 
                    # object.  Decorate it to be a new D-Bus interface
1192
 
                    # with the alternate D-Bus interface name.  Add it
1193
 
                    # to the class.
1194
 
                    attr[attrname] = (dbus_interface_annotations
1195
 
                                      (alt_interface)
1196
 
                                      (types.FunctionType
1197
 
                                       (attribute.func_code,
1198
 
                                        attribute.func_globals,
1199
 
                                        attribute.func_name,
1200
 
                                        attribute.func_defaults,
1201
 
                                        attribute.func_closure)))
1202
 
            if deprecate:
1203
 
                # Deprecate all alternate interfaces
1204
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1205
 
                for interface_name in interface_names:
1206
 
                    @dbus_interface_annotations(interface_name)
1207
 
                    def func(self):
1208
 
                        return { "org.freedesktop.DBus.Deprecated":
1209
 
                                     "true" }
1210
 
                    # Find an unused name
1211
 
                    for aname in (iname.format(i)
1212
 
                                  for i in itertools.count()):
1213
 
                        if aname not in attr:
1214
 
                            attr[aname] = func
1215
 
                            break
1216
 
            if interface_names:
1217
 
                # Replace the class with a new subclass of it with
1218
 
                # methods, signals, etc. as created above.
1219
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1220
 
                           (cls,), attr)
1221
 
        return cls
1222
 
    return wrapper
1223
 
 
1224
 
 
1225
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
 
                                "se.bsnet.fukt.Mandos"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1227
1036
class ClientDBus(Client, DBusObjectWithProperties):
1228
1037
    """A Client class using D-Bus
1229
1038
    
1240
1049
    def __init__(self, bus = None, *args, **kwargs):
1241
1050
        self.bus = bus
1242
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
1243
1055
        # Only now, when this client is initialized, can it show up on
1244
1056
        # the D-Bus
1245
1057
        client_object_name = unicode(self.name).translate(
1249
1061
                                 ("/clients/" + client_object_name))
1250
1062
        DBusObjectWithProperties.__init__(self, self.bus,
1251
1063
                                          self.dbus_object_path)
1252
 
    
 
1064
        
1253
1065
    def notifychangeproperty(transform_func,
1254
1066
                             dbus_name, type_func=lambda x: x,
1255
1067
                             variant_level=1):
1278
1090
        
1279
1091
        return property(lambda self: getattr(self, attrname), setter)
1280
1092
    
 
1093
    
1281
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1282
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
1283
1096
                                             "ApprovalPending",
1290
1103
                                       checker is not None)
1291
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1292
1105
                                           "LastCheckedOK")
1293
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1294
 
                                               "LastCheckerStatus")
1295
1106
    last_approval_request = notifychangeproperty(
1296
1107
        datetime_to_dbus, "LastApprovalRequest")
1297
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
1365
1176
        return False
1366
1177
    
1367
1178
    def approve(self, value=True):
 
1179
        self.send_changedstate()
1368
1180
        self.approved = value
1369
1181
        gobject.timeout_add(timedelta_to_milliseconds
1370
1182
                            (self.approval_duration),
1371
1183
                            self._reset_approved)
1372
 
        self.send_changedstate()
 
1184
    
1373
1185
    
1374
1186
    ## D-Bus methods, signals & properties
1375
1187
    _interface = "se.recompile.Mandos.Client"
1376
1188
    
1377
 
    ## Interfaces
1378
 
    
1379
 
    @dbus_interface_annotations(_interface)
1380
 
    def _foo(self):
1381
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1382
 
                     "false"}
1383
 
    
1384
1189
    ## Signals
1385
1190
    
1386
1191
    # CheckerCompleted - signal
1422
1227
        "D-Bus signal"
1423
1228
        return self.need_approval()
1424
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
1425
1238
    ## Methods
1426
1239
    
1427
1240
    # Approve - method
1537
1350
            return
1538
1351
        return datetime_to_dbus(self.last_checked_ok)
1539
1352
    
1540
 
    # LastCheckerStatus - property
1541
 
    @dbus_service_property(_interface, signature="n",
1542
 
                           access="read")
1543
 
    def LastCheckerStatus_dbus_property(self):
1544
 
        return dbus.Int16(self.last_checker_status)
1545
 
    
1546
1353
    # Expires - property
1547
1354
    @dbus_service_property(_interface, signature="s", access="read")
1548
1355
    def Expires_dbus_property(self):
1559
1366
    def Timeout_dbus_property(self, value=None):
1560
1367
        if value is None:       # get
1561
1368
            return dbus.UInt64(self.timeout_milliseconds())
1562
 
        old_timeout = self.timeout
1563
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1564
 
        # Reschedule disabling
 
1370
        # Reschedule timeout
1565
1371
        if self.enabled:
1566
1372
            now = datetime.datetime.utcnow()
1567
 
            self.expires += self.timeout - old_timeout
1568
 
            if self.expires <= now:
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
1569
1376
                # The timeout has passed
1570
1377
                self.disable()
1571
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
1572
1382
                if (getattr(self, "disable_initiator_tag", None)
1573
1383
                    is None):
1574
1384
                    return
1575
1385
                gobject.source_remove(self.disable_initiator_tag)
1576
 
                self.disable_initiator_tag = (
1577
 
                    gobject.timeout_add(
1578
 
                        timedelta_to_milliseconds(self.expires - now),
1579
 
                        self.disable))
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
1580
1389
    
1581
1390
    # ExtendedTimeout - property
1582
1391
    @dbus_service_property(_interface, signature="t",
1661
1470
        self._pipe.send(('setattr', name, value))
1662
1471
 
1663
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1664
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1665
1478
    """A class to handle client connections.
1666
1479
    
1734
1547
                except KeyError:
1735
1548
                    return
1736
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1737
1554
                if client.approval_delay:
1738
1555
                    delay = client.approval_delay
1739
1556
                    client.approvals_pending += 1
1770
1587
                    #wait until timeout or approved
1771
1588
                    time = datetime.datetime.now()
1772
1589
                    client.changedstate.acquire()
1773
 
                    client.changedstate.wait(
1774
 
                        float(timedelta_to_milliseconds(delay)
1775
 
                              / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1776
1593
                    client.changedstate.release()
1777
1594
                    time2 = datetime.datetime.now()
1778
1595
                    if (time2 - time) >= delay:
1794
1611
                    try:
1795
1612
                        sent = session.send(client.secret[sent_size:])
1796
1613
                    except gnutls.errors.GNUTLSError as error:
1797
 
                        logger.warning("gnutls send failed",
1798
 
                                       exc_info=error)
 
1614
                        logger.warning("gnutls send failed")
1799
1615
                        return
1800
1616
                    logger.debug("Sent: %d, remaining: %d",
1801
1617
                                 sent, len(client.secret)
1804
1620
                
1805
1621
                logger.info("Sending secret to %s", client.name)
1806
1622
                # bump the timeout using extended_timeout
1807
 
                client.bump_timeout(client.extended_timeout)
 
1623
                client.checked_ok(client.extended_timeout)
1808
1624
                if self.server.use_dbus:
1809
1625
                    # Emit D-Bus signal
1810
1626
                    client.GotSecret()
1815
1631
                try:
1816
1632
                    session.bye()
1817
1633
                except gnutls.errors.GNUTLSError as error:
1818
 
                    logger.warning("GnuTLS bye failed",
1819
 
                                   exc_info=error)
 
1634
                    logger.warning("GnuTLS bye failed")
1820
1635
    
1821
1636
    @staticmethod
1822
1637
    def peer_certificate(session):
1894
1709
    def process_request(self, request, address):
1895
1710
        """Start a new process to process the request."""
1896
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
1897
 
                                       args = (request, address))
 
1712
                                       args = (request,
 
1713
                                               address))
1898
1714
        proc.start()
1899
1715
        return proc
1900
1716
 
1928
1744
        use_ipv6:       Boolean; to use IPv6 or not
1929
1745
    """
1930
1746
    def __init__(self, server_address, RequestHandlerClass,
1931
 
                 interface=None, use_ipv6=True, socketfd=None):
1932
 
        """If socketfd is set, use that file descriptor instead of
1933
 
        creating a new one with socket.socket().
1934
 
        """
 
1747
                 interface=None, use_ipv6=True):
1935
1748
        self.interface = interface
1936
1749
        if use_ipv6:
1937
1750
            self.address_family = socket.AF_INET6
1938
 
        if socketfd is not None:
1939
 
            # Save the file descriptor
1940
 
            self.socketfd = socketfd
1941
 
            # Save the original socket.socket() function
1942
 
            self.socket_socket = socket.socket
1943
 
            # To implement --socket, we monkey patch socket.socket.
1944
 
            # 
1945
 
            # (When socketserver.TCPServer is a new-style class, we
1946
 
            # could make self.socket into a property instead of monkey
1947
 
            # patching socket.socket.)
1948
 
            # 
1949
 
            # Create a one-time-only replacement for socket.socket()
1950
 
            @functools.wraps(socket.socket)
1951
 
            def socket_wrapper(*args, **kwargs):
1952
 
                # Restore original function so subsequent calls are
1953
 
                # not affected.
1954
 
                socket.socket = self.socket_socket
1955
 
                del self.socket_socket
1956
 
                # This time only, return a new socket object from the
1957
 
                # saved file descriptor.
1958
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1959
 
            # Replace socket.socket() function with wrapper
1960
 
            socket.socket = socket_wrapper
1961
 
        # The socketserver.TCPServer.__init__ will call
1962
 
        # socket.socket(), which might be our replacement,
1963
 
        # socket_wrapper(), if socketfd was set.
1964
1751
        socketserver.TCPServer.__init__(self, server_address,
1965
1752
                                        RequestHandlerClass)
1966
 
    
1967
1753
    def server_bind(self):
1968
1754
        """This overrides the normal server_bind() function
1969
1755
        to bind to an interface if one was specified, and also NOT to
1977
1763
                try:
1978
1764
                    self.socket.setsockopt(socket.SOL_SOCKET,
1979
1765
                                           SO_BINDTODEVICE,
1980
 
                                           str(self.interface + '\0'))
 
1766
                                           str(self.interface
 
1767
                                               + '\0'))
1981
1768
                except socket.error as error:
1982
 
                    if error.errno == errno.EPERM:
1983
 
                        logger.error("No permission to bind to"
1984
 
                                     " interface %s", self.interface)
1985
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1769
                    if error[0] == errno.EPERM:
 
1770
                        logger.error("No permission to"
 
1771
                                     " bind to interface %s",
 
1772
                                     self.interface)
 
1773
                    elif error[0] == errno.ENOPROTOOPT:
1986
1774
                        logger.error("SO_BINDTODEVICE not available;"
1987
1775
                                     " cannot bind to interface %s",
1988
1776
                                     self.interface)
1989
 
                    elif error.errno == errno.ENODEV:
1990
 
                        logger.error("Interface %s does not exist,"
1991
 
                                     " cannot bind", self.interface)
1992
1777
                    else:
1993
1778
                        raise
1994
1779
        # Only bind(2) the socket if we really need to.
1997
1782
                if self.address_family == socket.AF_INET6:
1998
1783
                    any_address = "::" # in6addr_any
1999
1784
                else:
2000
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1785
                    any_address = socket.INADDR_ANY
2001
1786
                self.server_address = (any_address,
2002
1787
                                       self.server_address[1])
2003
1788
            elif not self.server_address[1]:
2024
1809
    """
2025
1810
    def __init__(self, server_address, RequestHandlerClass,
2026
1811
                 interface=None, use_ipv6=True, clients=None,
2027
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1812
                 gnutls_priority=None, use_dbus=True):
2028
1813
        self.enabled = False
2029
1814
        self.clients = clients
2030
1815
        if self.clients is None:
2034
1819
        IPv6_TCPServer.__init__(self, server_address,
2035
1820
                                RequestHandlerClass,
2036
1821
                                interface = interface,
2037
 
                                use_ipv6 = use_ipv6,
2038
 
                                socketfd = socketfd)
 
1822
                                use_ipv6 = use_ipv6)
2039
1823
    def server_activate(self):
2040
1824
        if self.enabled:
2041
1825
            return socketserver.TCPServer.server_activate(self)
2054
1838
    
2055
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
2056
1840
                   proc = None, client_object=None):
 
1841
        condition_names = {
 
1842
            gobject.IO_IN: "IN",   # There is data to read.
 
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1844
                                    # blocking).
 
1845
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1846
            gobject.IO_ERR: "ERR", # Error condition.
 
1847
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1848
                                    # broken, usually for pipes and
 
1849
                                    # sockets).
 
1850
            }
 
1851
        conditions_string = ' | '.join(name
 
1852
                                       for cond, name in
 
1853
                                       condition_names.iteritems()
 
1854
                                       if cond & condition)
2057
1855
        # error, or the other end of multiprocessing.Pipe has closed
2058
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2059
1857
            # Wait for other process to exit
2060
1858
            proc.join()
2061
1859
            return False
2119
1917
        return True
2120
1918
 
2121
1919
 
2122
 
def rfc3339_duration_to_delta(duration):
2123
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2124
 
    
2125
 
    >>> rfc3339_duration_to_delta("P7D")
2126
 
    datetime.timedelta(7)
2127
 
    >>> rfc3339_duration_to_delta("PT60S")
2128
 
    datetime.timedelta(0, 60)
2129
 
    >>> rfc3339_duration_to_delta("PT60M")
2130
 
    datetime.timedelta(0, 3600)
2131
 
    >>> rfc3339_duration_to_delta("PT24H")
2132
 
    datetime.timedelta(1)
2133
 
    >>> rfc3339_duration_to_delta("P1W")
2134
 
    datetime.timedelta(7)
2135
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2136
 
    datetime.timedelta(0, 330)
2137
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2138
 
    datetime.timedelta(1, 200)
2139
 
    """
2140
 
    
2141
 
    # Parsing an RFC 3339 duration with regular expressions is not
2142
 
    # possible - there would have to be multiple places for the same
2143
 
    # values, like seconds.  The current code, while more esoteric, is
2144
 
    # cleaner without depending on a parsing library.  If Python had a
2145
 
    # built-in library for parsing we would use it, but we'd like to
2146
 
    # avoid excessive use of external libraries.
2147
 
    
2148
 
    # New type for defining tokens, syntax, and semantics all-in-one
2149
 
    Token = collections.namedtuple("Token",
2150
 
                                   ("regexp", # To match token; if
2151
 
                                              # "value" is not None,
2152
 
                                              # must have a "group"
2153
 
                                              # containing digits
2154
 
                                    "value",  # datetime.timedelta or
2155
 
                                              # None
2156
 
                                    "followers")) # Tokens valid after
2157
 
                                                  # this token
2158
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2160
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2161
 
    token_second = Token(re.compile(r"(\d+)S"),
2162
 
                         datetime.timedelta(seconds=1),
2163
 
                         frozenset((token_end,)))
2164
 
    token_minute = Token(re.compile(r"(\d+)M"),
2165
 
                         datetime.timedelta(minutes=1),
2166
 
                         frozenset((token_second, token_end)))
2167
 
    token_hour = Token(re.compile(r"(\d+)H"),
2168
 
                       datetime.timedelta(hours=1),
2169
 
                       frozenset((token_minute, token_end)))
2170
 
    token_time = Token(re.compile(r"T"),
2171
 
                       None,
2172
 
                       frozenset((token_hour, token_minute,
2173
 
                                  token_second)))
2174
 
    token_day = Token(re.compile(r"(\d+)D"),
2175
 
                      datetime.timedelta(days=1),
2176
 
                      frozenset((token_time, token_end)))
2177
 
    token_month = Token(re.compile(r"(\d+)M"),
2178
 
                        datetime.timedelta(weeks=4),
2179
 
                        frozenset((token_day, token_end)))
2180
 
    token_year = Token(re.compile(r"(\d+)Y"),
2181
 
                       datetime.timedelta(weeks=52),
2182
 
                       frozenset((token_month, token_end)))
2183
 
    token_week = Token(re.compile(r"(\d+)W"),
2184
 
                       datetime.timedelta(weeks=1),
2185
 
                       frozenset((token_end,)))
2186
 
    token_duration = Token(re.compile(r"P"), None,
2187
 
                           frozenset((token_year, token_month,
2188
 
                                      token_day, token_time,
2189
 
                                      token_week))),
2190
 
    # Define starting values
2191
 
    value = datetime.timedelta() # Value so far
2192
 
    found_token = None
2193
 
    followers = frozenset(token_duration,) # Following valid tokens
2194
 
    s = duration                # String left to parse
2195
 
    # Loop until end token is found
2196
 
    while found_token is not token_end:
2197
 
        # Search for any currently valid tokens
2198
 
        for token in followers:
2199
 
            match = token.regexp.match(s)
2200
 
            if match is not None:
2201
 
                # Token found
2202
 
                if token.value is not None:
2203
 
                    # Value found, parse digits
2204
 
                    factor = int(match.group(1), 10)
2205
 
                    # Add to value so far
2206
 
                    value += factor * token.value
2207
 
                # Strip token from string
2208
 
                s = token.regexp.sub("", s, 1)
2209
 
                # Go to found token
2210
 
                found_token = token
2211
 
                # Set valid next tokens
2212
 
                followers = found_token.followers
2213
 
                break
2214
 
        else:
2215
 
            # No currently valid tokens were found
2216
 
            raise ValueError("Invalid RFC 3339 duration")
2217
 
    # End token found
2218
 
    return value
2219
 
 
2220
 
 
2221
1920
def string_to_delta(interval):
2222
1921
    """Parse a string and return a datetime.timedelta
2223
1922
    
2234
1933
    >>> string_to_delta('5m 30s')
2235
1934
    datetime.timedelta(0, 330)
2236
1935
    """
2237
 
    
2238
 
    try:
2239
 
        return rfc3339_duration_to_delta(interval)
2240
 
    except ValueError:
2241
 
        pass
2242
 
    
2243
1936
    timevalue = datetime.timedelta(0)
2244
1937
    for s in interval.split():
2245
1938
        try:
2256
1949
            elif suffix == "w":
2257
1950
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2258
1951
            else:
2259
 
                raise ValueError("Unknown suffix {0!r}"
2260
 
                                 .format(suffix))
 
1952
                raise ValueError("Unknown suffix %r" % suffix)
2261
1953
        except (ValueError, IndexError) as e:
2262
1954
            raise ValueError(*(e.args))
2263
1955
        timevalue += delta
2277
1969
        sys.exit()
2278
1970
    if not noclose:
2279
1971
        # Close all standard open file descriptors
2280
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1972
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2281
1973
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2282
1974
            raise OSError(errno.ENODEV,
2283
 
                          "{0} not a character device"
2284
 
                          .format(os.devnull))
 
1975
                          "%s not a character device"
 
1976
                          % os.path.devnull)
2285
1977
        os.dup2(null, sys.stdin.fileno())
2286
1978
        os.dup2(null, sys.stdout.fileno())
2287
1979
        os.dup2(null, sys.stderr.fileno())
2296
1988
    
2297
1989
    parser = argparse.ArgumentParser()
2298
1990
    parser.add_argument("-v", "--version", action="version",
2299
 
                        version = "%(prog)s {0}".format(version),
 
1991
                        version = "%%(prog)s %s" % version,
2300
1992
                        help="show version number and exit")
2301
1993
    parser.add_argument("-i", "--interface", metavar="IF",
2302
1994
                        help="Bind to interface IF")
2308
2000
                        help="Run self-test")
2309
2001
    parser.add_argument("--debug", action="store_true",
2310
2002
                        help="Debug mode; run in foreground and log"
2311
 
                        " to terminal", default=None)
 
2003
                        " to terminal")
2312
2004
    parser.add_argument("--debuglevel", metavar="LEVEL",
2313
2005
                        help="Debug level for stdout output")
2314
2006
    parser.add_argument("--priority", help="GnuTLS"
2321
2013
                        " files")
2322
2014
    parser.add_argument("--no-dbus", action="store_false",
2323
2015
                        dest="use_dbus", help="Do not provide D-Bus"
2324
 
                        " system bus interface", default=None)
 
2016
                        " system bus interface")
2325
2017
    parser.add_argument("--no-ipv6", action="store_false",
2326
 
                        dest="use_ipv6", help="Do not use IPv6",
2327
 
                        default=None)
 
2018
                        dest="use_ipv6", help="Do not use IPv6")
2328
2019
    parser.add_argument("--no-restore", action="store_false",
2329
2020
                        dest="restore", help="Do not restore stored"
2330
 
                        " state", default=None)
2331
 
    parser.add_argument("--socket", type=int,
2332
 
                        help="Specify a file descriptor to a network"
2333
 
                        " socket to use instead of creating one")
 
2021
                        " state")
2334
2022
    parser.add_argument("--statedir", metavar="DIR",
2335
2023
                        help="Directory to save/restore state in")
2336
 
    parser.add_argument("--foreground", action="store_true",
2337
 
                        help="Run in foreground", default=None)
2338
2024
    
2339
2025
    options = parser.parse_args()
2340
2026
    
2349
2035
                        "port": "",
2350
2036
                        "debug": "False",
2351
2037
                        "priority":
2352
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2038
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2353
2039
                        "servicename": "Mandos",
2354
2040
                        "use_dbus": "True",
2355
2041
                        "use_ipv6": "True",
2356
2042
                        "debuglevel": "",
2357
2043
                        "restore": "True",
2358
 
                        "socket": "",
2359
 
                        "statedir": "/var/lib/mandos",
2360
 
                        "foreground": "False",
 
2044
                        "statedir": "/var/lib/mandos"
2361
2045
                        }
2362
2046
    
2363
2047
    # Parse config file for server-global settings
2368
2052
    # Convert the SafeConfigParser object to a dict
2369
2053
    server_settings = server_config.defaults()
2370
2054
    # Use the appropriate methods on the non-string config options
2371
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2055
    for option in ("debug", "use_dbus", "use_ipv6"):
2372
2056
        server_settings[option] = server_config.getboolean("DEFAULT",
2373
2057
                                                           option)
2374
2058
    if server_settings["port"]:
2375
2059
        server_settings["port"] = server_config.getint("DEFAULT",
2376
2060
                                                       "port")
2377
 
    if server_settings["socket"]:
2378
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2379
 
                                                         "socket")
2380
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2381
 
        # over with an opened os.devnull.  But we don't want this to
2382
 
        # happen with a supplied network socket.
2383
 
        if 0 <= server_settings["socket"] <= 2:
2384
 
            server_settings["socket"] = os.dup(server_settings
2385
 
                                               ["socket"])
2386
2061
    del server_config
2387
2062
    
2388
2063
    # Override the settings from the config file with command line
2390
2065
    for option in ("interface", "address", "port", "debug",
2391
2066
                   "priority", "servicename", "configdir",
2392
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2393
 
                   "statedir", "socket", "foreground"):
 
2068
                   "statedir"):
2394
2069
        value = getattr(options, option)
2395
2070
        if value is not None:
2396
2071
            server_settings[option] = value
2399
2074
    for option in server_settings.keys():
2400
2075
        if type(server_settings[option]) is str:
2401
2076
            server_settings[option] = unicode(server_settings[option])
2402
 
    # Force all boolean options to be boolean
2403
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2404
 
                   "foreground"):
2405
 
        server_settings[option] = bool(server_settings[option])
2406
 
    # Debug implies foreground
2407
 
    if server_settings["debug"]:
2408
 
        server_settings["foreground"] = True
2409
2077
    # Now we have our good server settings in "server_settings"
2410
2078
    
2411
2079
    ##################################################################
2417
2085
    use_ipv6 = server_settings["use_ipv6"]
2418
2086
    stored_state_path = os.path.join(server_settings["statedir"],
2419
2087
                                     stored_state_file)
2420
 
    foreground = server_settings["foreground"]
2421
2088
    
2422
2089
    if debug:
2423
2090
        initlogger(debug, logging.DEBUG)
2430
2097
    
2431
2098
    if server_settings["servicename"] != "Mandos":
2432
2099
        syslogger.setFormatter(logging.Formatter
2433
 
                               ('Mandos ({0}) [%(process)d]:'
2434
 
                                ' %(levelname)s: %(message)s'
2435
 
                                .format(server_settings
2436
 
                                        ["servicename"])))
 
2100
                               ('Mandos (%s) [%%(process)d]:'
 
2101
                                ' %%(levelname)s: %%(message)s'
 
2102
                                % server_settings["servicename"]))
2437
2103
    
2438
2104
    # Parse config file with clients
2439
2105
    client_config = configparser.SafeConfigParser(Client
2452
2118
                              use_ipv6=use_ipv6,
2453
2119
                              gnutls_priority=
2454
2120
                              server_settings["priority"],
2455
 
                              use_dbus=use_dbus,
2456
 
                              socketfd=(server_settings["socket"]
2457
 
                                        or None))
2458
 
    if not foreground:
2459
 
        pidfilename = "/run/mandos.pid"
2460
 
        if not os.path.isdir("/run/."):
2461
 
            pidfilename = "/var/run/mandos.pid"
2462
 
        pidfile = None
 
2121
                              use_dbus=use_dbus)
 
2122
    if not debug:
 
2123
        pidfilename = "/var/run/mandos.pid"
2463
2124
        try:
2464
2125
            pidfile = open(pidfilename, "w")
2465
 
        except IOError as e:
2466
 
            logger.error("Could not open file %r", pidfilename,
2467
 
                         exc_info=e)
 
2126
        except IOError:
 
2127
            logger.error("Could not open file %r", pidfilename)
2468
2128
    
2469
 
    for name in ("_mandos", "mandos", "nobody"):
 
2129
    try:
 
2130
        uid = pwd.getpwnam("_mandos").pw_uid
 
2131
        gid = pwd.getpwnam("_mandos").pw_gid
 
2132
    except KeyError:
2470
2133
        try:
2471
 
            uid = pwd.getpwnam(name).pw_uid
2472
 
            gid = pwd.getpwnam(name).pw_gid
2473
 
            break
 
2134
            uid = pwd.getpwnam("mandos").pw_uid
 
2135
            gid = pwd.getpwnam("mandos").pw_gid
2474
2136
        except KeyError:
2475
 
            continue
2476
 
    else:
2477
 
        uid = 65534
2478
 
        gid = 65534
 
2137
            try:
 
2138
                uid = pwd.getpwnam("nobody").pw_uid
 
2139
                gid = pwd.getpwnam("nobody").pw_gid
 
2140
            except KeyError:
 
2141
                uid = 65534
 
2142
                gid = 65534
2479
2143
    try:
2480
2144
        os.setgid(gid)
2481
2145
        os.setuid(uid)
2482
2146
    except OSError as error:
2483
 
        if error.errno != errno.EPERM:
 
2147
        if error[0] != errno.EPERM:
2484
2148
            raise error
2485
2149
    
2486
2150
    if debug:
2498
2162
         .gnutls_global_set_log_function(debug_gnutls))
2499
2163
        
2500
2164
        # Redirect stdin so all checkers get /dev/null
2501
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2165
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2502
2166
        os.dup2(null, sys.stdin.fileno())
2503
2167
        if null > 2:
2504
2168
            os.close(null)
2505
2169
    
2506
2170
    # Need to fork before connecting to D-Bus
2507
 
    if not foreground:
 
2171
    if not debug:
2508
2172
        # Close all input and output, do double fork, etc.
2509
2173
        daemon()
2510
2174
    
2511
 
    # multiprocessing will use threads, so before we use gobject we
2512
 
    # need to inform gobject that threads will be used.
2513
2175
    gobject.threads_init()
2514
2176
    
2515
2177
    global main_loop
2516
2178
    # From the Avahi example code
2517
 
    DBusGMainLoop(set_as_default=True)
 
2179
    DBusGMainLoop(set_as_default=True )
2518
2180
    main_loop = gobject.MainLoop()
2519
2181
    bus = dbus.SystemBus()
2520
2182
    # End of Avahi example code
2526
2188
                            ("se.bsnet.fukt.Mandos", bus,
2527
2189
                             do_not_queue=True))
2528
2190
        except dbus.exceptions.NameExistsException as e:
2529
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2191
            logger.error(unicode(e) + ", disabling D-Bus")
2530
2192
            use_dbus = False
2531
2193
            server_settings["use_dbus"] = False
2532
2194
            tcp_server.use_dbus = False
2544
2206
    
2545
2207
    client_class = Client
2546
2208
    if use_dbus:
2547
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
2548
2211
    
2549
2212
    client_settings = Client.config_parser(client_config)
2550
2213
    old_client_settings = {}
2551
2214
    clients_data = {}
2552
2215
    
2553
 
    # This is used to redirect stdout and stderr for checker processes
2554
 
    global wnull
2555
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2556
 
    # Only used if server is running in foreground but not in debug
2557
 
    # mode
2558
 
    if debug or not foreground:
2559
 
        wnull.close()
2560
 
    
2561
2216
    # Get client data and settings from last running state.
2562
2217
    if server_settings["restore"]:
2563
2218
        try:
2566
2221
                                                     (stored_state))
2567
2222
            os.remove(stored_state_path)
2568
2223
        except IOError as e:
2569
 
            if e.errno == errno.ENOENT:
2570
 
                logger.warning("Could not load persistent state: {0}"
2571
 
                                .format(os.strerror(e.errno)))
2572
 
            else:
2573
 
                logger.critical("Could not load persistent state:",
2574
 
                                exc_info=e)
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
2575
2227
                raise
2576
2228
        except EOFError as e:
2577
2229
            logger.warning("Could not load persistent state: "
2578
 
                           "EOFError:", exc_info=e)
 
2230
                           "EOFError: {0}".format(e))
2579
2231
    
2580
2232
    with PGPEngine() as pgp:
2581
2233
        for client_name, client in clients_data.iteritems():
2582
 
            # Skip removed clients
2583
 
            if client_name not in client_settings:
2584
 
                continue
2585
 
            
2586
2234
            # Decide which value to use after restoring saved state.
2587
2235
            # We have three different values: Old config file,
2588
2236
            # new config file, and saved state.
2602
2250
            
2603
2251
            # Clients who has passed its expire date can still be
2604
2252
            # enabled if its last checker was successful.  Clients
2605
 
            # whose checker succeeded before we stored its state is
2606
 
            # assumed to have successfully run all checkers during
2607
 
            # downtime.
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
2608
2255
            if client["enabled"]:
2609
2256
                if datetime.datetime.utcnow() >= client["expires"]:
2610
2257
                    if not client["last_checked_ok"]:
2611
2258
                        logger.warning(
2612
2259
                            "disabling client {0} - Client never "
2613
 
                            "performed a successful checker"
2614
 
                            .format(client_name))
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
2615
2262
                        client["enabled"] = False
2616
2263
                    elif client["last_checker_status"] != 0:
2617
2264
                        logger.warning(
2618
2265
                            "disabling client {0} - Client "
2619
2266
                            "last checker failed with error code {1}"
2620
 
                            .format(client_name,
 
2267
                            .format(client["name"],
2621
2268
                                    client["last_checker_status"]))
2622
2269
                        client["enabled"] = False
2623
2270
                    else:
2626
2273
                                             + client["timeout"])
2627
2274
                        logger.debug("Last checker succeeded,"
2628
2275
                                     " keeping {0} enabled"
2629
 
                                     .format(client_name))
 
2276
                                     .format(client["name"]))
2630
2277
            try:
2631
2278
                client["secret"] = (
2632
2279
                    pgp.decrypt(client["encrypted_secret"],
2638
2285
                             .format(client_name))
2639
2286
                client["secret"] = (
2640
2287
                    client_settings[client_name]["secret"])
 
2288
 
2641
2289
    
2642
2290
    # Add/remove clients based on new changes made to config
2643
2291
    for client_name in (set(old_client_settings)
2646
2294
    for client_name in (set(client_settings)
2647
2295
                        - set(old_client_settings)):
2648
2296
        clients_data[client_name] = client_settings[client_name]
2649
 
    
2650
 
    # Create all client objects
 
2297
 
 
2298
    # Create clients all clients
2651
2299
    for client_name, client in clients_data.iteritems():
2652
2300
        tcp_server.clients[client_name] = client_class(
2653
 
            name = client_name, settings = client,
2654
 
            server_settings = server_settings)
 
2301
            name = client_name, settings = client)
2655
2302
    
2656
2303
    if not tcp_server.clients:
2657
2304
        logger.warning("No clients defined")
2658
 
    
2659
 
    if not foreground:
2660
 
        if pidfile is not None:
2661
 
            try:
2662
 
                with pidfile:
2663
 
                    pid = os.getpid()
2664
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2665
 
            except IOError:
2666
 
                logger.error("Could not write to file %r with PID %d",
2667
 
                             pidfilename, pid)
2668
 
        del pidfile
 
2305
        
 
2306
    if not debug:
 
2307
        try:
 
2308
            with pidfile:
 
2309
                pid = os.getpid()
 
2310
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2311
            del pidfile
 
2312
        except IOError:
 
2313
            logger.error("Could not write to file %r with PID %d",
 
2314
                         pidfilename, pid)
 
2315
        except NameError:
 
2316
            # "pidfile" was never created
 
2317
            pass
2669
2318
        del pidfilename
 
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2670
2320
    
2671
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2672
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2673
2323
    
2674
2324
    if use_dbus:
2675
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2676
 
                                        "se.bsnet.fukt.Mandos"})
2677
 
        class MandosDBusService(DBusObjectWithProperties):
 
2325
        class MandosDBusService(dbus.service.Object):
2678
2326
            """A D-Bus proxy object"""
2679
2327
            def __init__(self):
2680
2328
                dbus.service.Object.__init__(self, bus, "/")
2681
2329
            _interface = "se.recompile.Mandos"
2682
2330
            
2683
 
            @dbus_interface_annotations(_interface)
2684
 
            def _foo(self):
2685
 
                return { "org.freedesktop.DBus.Property"
2686
 
                         ".EmitsChangedSignal":
2687
 
                             "false"}
2688
 
            
2689
2331
            @dbus.service.signal(_interface, signature="o")
2690
2332
            def ClientAdded(self, objpath):
2691
2333
                "D-Bus signal"
2733
2375
            
2734
2376
            del _interface
2735
2377
        
2736
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2737
2381
    
2738
2382
    def cleanup():
2739
2383
        "Cleanup function; run on exit"
2740
2384
        service.cleanup()
2741
2385
        
2742
2386
        multiprocessing.active_children()
2743
 
        wnull.close()
2744
2387
        if not (tcp_server.clients or client_settings):
2745
2388
            return
2746
2389
        
2758
2401
                # A list of attributes that can not be pickled
2759
2402
                # + secret.
2760
2403
                exclude = set(("bus", "changedstate", "secret",
2761
 
                               "checker", "server_settings"))
 
2404
                               "checker"))
2762
2405
                for name, typ in (inspect.getmembers
2763
2406
                                  (dbus.service.Object)):
2764
2407
                    exclude.add(name)
2773
2416
                del client_settings[client.name]["secret"]
2774
2417
        
2775
2418
        try:
2776
 
            with (tempfile.NamedTemporaryFile
2777
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2778
 
                   dir=os.path.dirname(stored_state_path),
2779
 
                   delete=False)) as stored_state:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
2780
2424
                pickle.dump((clients, client_settings), stored_state)
2781
 
                tempname=stored_state.name
2782
2425
            os.rename(tempname, stored_state_path)
2783
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
2784
2429
            if not debug:
2785
2430
                try:
2786
2431
                    os.remove(tempname)
2787
2432
                except NameError:
2788
2433
                    pass
2789
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2790
 
                logger.warning("Could not save persistent state: {0}"
2791
 
                               .format(os.strerror(e.errno)))
2792
 
            else:
2793
 
                logger.warning("Could not save persistent state:",
2794
 
                               exc_info=e)
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
2795
2436
                raise e
2796
2437
        
2797
2438
        # Delete all clients, and settings from config
2825
2466
    service.port = tcp_server.socket.getsockname()[1]
2826
2467
    if use_ipv6:
2827
2468
        logger.info("Now listening on address %r, port %d,"
2828
 
                    " flowinfo %d, scope_id %d",
2829
 
                    *tcp_server.socket.getsockname())
 
2469
                    " flowinfo %d, scope_id %d"
 
2470
                    % tcp_server.socket.getsockname())
2830
2471
    else:                       # IPv4
2831
 
        logger.info("Now listening on address %r, port %d",
2832
 
                    *tcp_server.socket.getsockname())
 
2472
        logger.info("Now listening on address %r, port %d"
 
2473
                    % tcp_server.socket.getsockname())
2833
2474
    
2834
2475
    #service.interface = tcp_server.socket.getsockname()[3]
2835
2476
    
2838
2479
        try:
2839
2480
            service.activate()
2840
2481
        except dbus.exceptions.DBusException as error:
2841
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2482
            logger.critical("DBusException: %s", error)
2842
2483
            cleanup()
2843
2484
            sys.exit(1)
2844
2485
        # End of Avahi example code
2851
2492
        logger.debug("Starting main loop")
2852
2493
        main_loop.run()
2853
2494
    except AvahiError as error:
2854
 
        logger.critical("Avahi Error", exc_info=error)
 
2495
        logger.critical("AvahiError: %s", error)
2855
2496
        cleanup()
2856
2497
        sys.exit(1)
2857
2498
    except KeyboardInterrupt: