/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: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

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-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 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.4"
 
88
version = "1.5.2"
92
89
stored_state_file = "clients.pickle"
93
90
 
94
91
logger = logging.getLogger()
95
 
syslogger = None
 
92
syslogger = (logging.handlers.SysLogHandler
 
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
94
              address = str("/dev/log")))
96
95
 
97
96
try:
98
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
114
113
def initlogger(debug, level=logging.WARNING):
115
114
    """init logger and add loglevel"""
116
115
    
117
 
    syslogger = (logging.handlers.SysLogHandler
118
 
                 (facility =
119
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
120
 
                  address = str("/dev/log")))
121
116
    syslogger.setFormatter(logging.Formatter
122
117
                           ('Mandos [%(process)d]: %(levelname)s:'
123
118
                            ' %(message)s'))
141
136
class PGPEngine(object):
142
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
143
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
144
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
145
 
        self.gnupgargs = ['--batch',
146
 
                          '--home', self.tempdir,
147
 
                          '--force-mdc',
148
 
                          '--quiet',
149
 
                          '--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'])
150
147
    
151
148
    def __enter__(self):
152
149
        return self
153
150
    
154
 
    def __exit__(self, exc_type, exc_value, traceback):
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
155
152
        self._cleanup()
156
153
        return False
157
154
    
174
171
    def password_encode(self, password):
175
172
        # Passphrase can not be empty and can not contain newlines or
176
173
        # NUL bytes.  So we prefix it and hex encode it.
177
 
        encoded = b"mandos" + binascii.hexlify(password)
178
 
        if len(encoded) > 2048:
179
 
            # GnuPG can't handle long passwords, so encode differently
180
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
181
 
                       .replace(b"\n", b"\\n")
182
 
                       .replace(b"\0", b"\\x00"))
183
 
        return encoded
 
174
        return b"mandos" + binascii.hexlify(password)
184
175
    
185
176
    def encrypt(self, data, password):
186
 
        passphrase = self.password_encode(password)
187
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
188
 
                                         ) as passfile:
189
 
            passfile.write(passphrase)
190
 
            passfile.flush()
191
 
            proc = subprocess.Popen(['gpg', '--symmetric',
192
 
                                     '--passphrase-file',
193
 
                                     passfile.name]
194
 
                                    + self.gnupgargs,
195
 
                                    stdin = subprocess.PIPE,
196
 
                                    stdout = subprocess.PIPE,
197
 
                                    stderr = subprocess.PIPE)
198
 
            ciphertext, err = proc.communicate(input = data)
199
 
        if proc.returncode != 0:
200
 
            raise PGPError(err)
 
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
201
191
        return ciphertext
202
192
    
203
193
    def decrypt(self, data, password):
204
 
        passphrase = self.password_encode(password)
205
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
206
 
                                         ) as passfile:
207
 
            passfile.write(passphrase)
208
 
            passfile.flush()
209
 
            proc = subprocess.Popen(['gpg', '--decrypt',
210
 
                                     '--passphrase-file',
211
 
                                     passfile.name]
212
 
                                    + self.gnupgargs,
213
 
                                    stdin = subprocess.PIPE,
214
 
                                    stdout = subprocess.PIPE,
215
 
                                    stderr = subprocess.PIPE)
216
 
            decrypted_plaintext, err = proc.communicate(input
217
 
                                                        = data)
218
 
        if proc.returncode != 0:
219
 
            raise PGPError(err)
 
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
220
208
        return decrypted_plaintext
221
209
 
222
210
 
 
211
 
223
212
class AvahiError(Exception):
224
213
    def __init__(self, value, *args, **kwargs):
225
214
        self.value = value
242
231
               Used to optionally bind to the specified interface.
243
232
    name: string; Example: 'Mandos'
244
233
    type: string; Example: '_mandos._tcp'.
245
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
246
235
    port: integer; what port to announce
247
236
    TXT: list of strings; TXT record for the service
248
237
    domain: string; Domain to publish on, default to .local if empty.
254
243
    server: D-Bus Server
255
244
    bus: dbus.SystemBus()
256
245
    """
257
 
    
258
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
259
247
                 servicetype = None, port = None, TXT = None,
260
248
                 domain = "", host = "", max_renames = 32768,
273
261
        self.server = None
274
262
        self.bus = bus
275
263
        self.entry_group_state_changed_match = None
276
 
    
277
264
    def rename(self):
278
265
        """Derived from the Avahi example code"""
279
266
        if self.rename_count >= self.max_renames:
289
276
        try:
290
277
            self.add()
291
278
        except dbus.exceptions.DBusException as error:
292
 
            logger.critical("D-Bus Exception", exc_info=error)
 
279
            logger.critical("DBusException: %s", error)
293
280
            self.cleanup()
294
281
            os._exit(1)
295
282
        self.rename_count += 1
296
 
    
297
283
    def remove(self):
298
284
        """Derived from the Avahi example code"""
299
285
        if self.entry_group_state_changed_match is not None:
301
287
            self.entry_group_state_changed_match = None
302
288
        if self.group is not None:
303
289
            self.group.Reset()
304
 
    
305
290
    def add(self):
306
291
        """Derived from the Avahi example code"""
307
292
        self.remove()
324
309
            dbus.UInt16(self.port),
325
310
            avahi.string_array_to_txt_array(self.TXT))
326
311
        self.group.Commit()
327
 
    
328
312
    def entry_group_state_changed(self, state, error):
329
313
        """Derived from the Avahi example code"""
330
314
        logger.debug("Avahi entry group state change: %i", state)
337
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
338
322
            logger.critical("Avahi: Error in group state changed %s",
339
323
                            unicode(error))
340
 
            raise AvahiGroupError("State changed: {0!s}"
341
 
                                  .format(error))
342
 
    
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
343
326
    def cleanup(self):
344
327
        """Derived from the Avahi example code"""
345
328
        if self.group is not None:
350
333
                pass
351
334
            self.group = None
352
335
        self.remove()
353
 
    
354
336
    def server_state_changed(self, state, error=None):
355
337
        """Derived from the Avahi example code"""
356
338
        logger.debug("Avahi server state change: %i", state)
375
357
                logger.debug("Unknown state: %r", state)
376
358
            else:
377
359
                logger.debug("Unknown state: %r: %r", state, error)
378
 
    
379
360
    def activate(self):
380
361
        """Derived from the Avahi example code"""
381
362
        if self.server is None:
388
369
                                 self.server_state_changed)
389
370
        self.server_state_changed(self.server.GetState())
390
371
 
391
 
 
392
372
class AvahiServiceToSyslog(AvahiService):
393
373
    def rename(self):
394
374
        """Add the new name to the syslog messages"""
395
375
        ret = AvahiService.rename(self)
396
376
        syslogger.setFormatter(logging.Formatter
397
 
                               ('Mandos ({0}) [%(process)d]:'
398
 
                                ' %(levelname)s: %(message)s'
399
 
                                .format(self.name)))
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
400
380
        return ret
401
381
 
402
 
 
403
382
def timedelta_to_milliseconds(td):
404
383
    "Convert a datetime.timedelta() to milliseconds"
405
384
    return ((td.days * 24 * 60 * 60 * 1000)
406
385
            + (td.seconds * 1000)
407
386
            + (td.microseconds // 1000))
408
 
 
409
 
 
 
387
        
410
388
class Client(object):
411
389
    """A representation of a client host served by this server.
412
390
    
437
415
    last_checked_ok: datetime.datetime(); (UTC) or None
438
416
    last_checker_status: integer between 0 and 255 reflecting exit
439
417
                         status of last checker. -1 reflects crashed
440
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
441
419
    last_enabled: datetime.datetime(); (UTC) or None
442
420
    name:       string; from the config file, used in log messages and
443
421
                        D-Bus identifiers
448
426
    runtime_expansions: Allowed attributes for runtime expansion.
449
427
    expires:    datetime.datetime(); time (UTC) when a client will be
450
428
                disabled, or None
451
 
    server_settings: The server_settings dict from main()
452
429
    """
453
430
    
454
431
    runtime_expansions = ("approval_delay", "approval_duration",
455
 
                          "created", "enabled", "expires",
456
 
                          "fingerprint", "host", "interval",
457
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
458
434
                          "last_enabled", "name", "timeout")
459
 
    client_defaults = { "timeout": "PT5M",
460
 
                        "extended_timeout": "PT15M",
461
 
                        "interval": "PT2M",
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
462
438
                        "checker": "fping -q -- %%(host)s",
463
439
                        "host": "",
464
 
                        "approval_delay": "PT0S",
465
 
                        "approval_duration": "PT1S",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
466
442
                        "approved_by_default": "True",
467
443
                        "enabled": "True",
468
444
                        }
481
457
    
482
458
    def approval_delay_milliseconds(self):
483
459
        return timedelta_to_milliseconds(self.approval_delay)
484
 
    
 
460
 
485
461
    @staticmethod
486
462
    def config_parser(config):
487
463
        """Construct a new dict of client settings of this form:
512
488
                          "rb") as secfile:
513
489
                    client["secret"] = secfile.read()
514
490
            else:
515
 
                raise TypeError("No secret or secfile for section {0}"
516
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
517
493
            client["timeout"] = string_to_delta(section["timeout"])
518
494
            client["extended_timeout"] = string_to_delta(
519
495
                section["extended_timeout"])
525
501
            client["checker_command"] = section["checker"]
526
502
            client["last_approval_request"] = None
527
503
            client["last_checked_ok"] = None
528
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
529
505
        
530
506
        return settings
531
 
    
532
 
    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."""
533
513
        self.name = name
534
 
        if server_settings is None:
535
 
            server_settings = {}
536
 
        self.server_settings = server_settings
537
514
        # adding all client settings
538
515
        for setting, value in settings.iteritems():
539
516
            setattr(self, setting, value)
547
524
        else:
548
525
            self.last_enabled = None
549
526
            self.expires = None
550
 
        
 
527
       
551
528
        logger.debug("Creating client %r", self.name)
552
529
        # Uppercase and remove spaces from fingerprint for later
553
530
        # comparison purposes with return value from the fingerprint()
555
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
556
533
        self.created = settings.get("created",
557
534
                                    datetime.datetime.utcnow())
558
 
        
 
535
 
559
536
        # attributes specific for this server instance
560
537
        self.checker = None
561
538
        self.checker_initiator_tag = None
589
566
        if getattr(self, "enabled", False):
590
567
            # Already enabled
591
568
            return
 
569
        self.send_changedstate()
592
570
        self.expires = datetime.datetime.utcnow() + self.timeout
593
571
        self.enabled = True
594
572
        self.last_enabled = datetime.datetime.utcnow()
595
573
        self.init_checker()
596
 
        self.send_changedstate()
597
574
    
598
575
    def disable(self, quiet=True):
599
576
        """Disable this client."""
600
577
        if not getattr(self, "enabled", False):
601
578
            return False
602
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
603
582
            logger.info("Disabling client %s", self.name)
604
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
605
584
            gobject.source_remove(self.disable_initiator_tag)
606
585
            self.disable_initiator_tag = None
607
586
        self.expires = None
608
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
609
588
            gobject.source_remove(self.checker_initiator_tag)
610
589
            self.checker_initiator_tag = None
611
590
        self.stop_checker()
612
591
        self.enabled = False
613
 
        if not quiet:
614
 
            self.send_changedstate()
615
592
        # Do not run this again if called by a gobject.timeout_add
616
593
        return False
617
594
    
621
598
    def init_checker(self):
622
599
        # Schedule a new checker to be started an 'interval' from now,
623
600
        # and every interval from then on.
624
 
        if self.checker_initiator_tag is not None:
625
 
            gobject.source_remove(self.checker_initiator_tag)
626
601
        self.checker_initiator_tag = (gobject.timeout_add
627
602
                                      (self.interval_milliseconds(),
628
603
                                       self.start_checker))
629
604
        # Schedule a disable() when 'timeout' has passed
630
 
        if self.disable_initiator_tag is not None:
631
 
            gobject.source_remove(self.disable_initiator_tag)
632
605
        self.disable_initiator_tag = (gobject.timeout_add
633
606
                                   (self.timeout_milliseconds(),
634
607
                                    self.disable))
653
626
            logger.warning("Checker for %(name)s crashed?",
654
627
                           vars(self))
655
628
    
656
 
    def checked_ok(self):
657
 
        """Assert that the client has been seen, alive and well."""
658
 
        self.last_checked_ok = datetime.datetime.utcnow()
659
 
        self.last_checker_status = 0
660
 
        self.bump_timeout()
661
 
    
662
 
    def bump_timeout(self, timeout=None):
663
 
        """Bump up the timeout for this client."""
 
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
        """
664
635
        if timeout is None:
665
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
666
638
        if self.disable_initiator_tag is not None:
667
639
            gobject.source_remove(self.disable_initiator_tag)
668
 
            self.disable_initiator_tag = None
669
640
        if getattr(self, "enabled", False):
670
641
            self.disable_initiator_tag = (gobject.timeout_add
671
642
                                          (timedelta_to_milliseconds
681
652
        If a checker already exists, leave it running and do
682
653
        nothing."""
683
654
        # The reason for not killing a running checker is that if we
684
 
        # did that, and if a checker (for some reason) started running
685
 
        # slowly and taking more than 'interval' time, then the client
686
 
        # would inevitably timeout, since no checker would get a
687
 
        # chance to run to completion.  If we instead leave running
 
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
688
659
        # checkers alone, the checker would have to take more time
689
660
        # than 'timeout' for the client to be disabled, which is as it
690
661
        # should be.
692
663
        # If a checker exists, make sure it is not a zombie
693
664
        try:
694
665
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
695
 
        except AttributeError:
696
 
            pass
697
 
        except OSError as error:
698
 
            if error.errno != errno.ECHILD:
699
 
                raise
 
666
        except (AttributeError, OSError) as error:
 
667
            if (isinstance(error, OSError)
 
668
                and error.errno != errno.ECHILD):
 
669
                raise error
700
670
        else:
701
671
            if pid:
702
672
                logger.warning("Checker was a zombie")
705
675
                                      self.current_checker_command)
706
676
        # Start a new checker if needed
707
677
        if self.checker is None:
708
 
            # Escape attributes for the shell
709
 
            escaped_attrs = dict(
710
 
                (attr, re.escape(unicode(getattr(self, attr))))
711
 
                for attr in
712
 
                self.runtime_expansions)
713
678
            try:
714
 
                command = self.checker_command % escaped_attrs
715
 
            except TypeError as error:
716
 
                logger.error('Could not format string "%s"',
717
 
                             self.checker_command, exc_info=error)
718
 
                return True # Try again later
 
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
719
697
            self.current_checker_command = command
720
698
            try:
721
699
                logger.info("Starting checker %r for %s",
724
702
                # in normal mode, that is already done by daemon(),
725
703
                # and in debug mode we don't want to.  (Stdin is
726
704
                # always replaced by /dev/null.)
727
 
                # The exception is when not debugging but nevertheless
728
 
                # running in the foreground; use the previously
729
 
                # created wnull.
730
 
                popen_args = {}
731
 
                if (not self.server_settings["debug"]
732
 
                    and self.server_settings["foreground"]):
733
 
                    popen_args.update({"stdout": wnull,
734
 
                                       "stderr": wnull })
735
705
                self.checker = subprocess.Popen(command,
736
706
                                                close_fds=True,
737
 
                                                shell=True, cwd="/",
738
 
                                                **popen_args)
739
 
            except OSError as error:
740
 
                logger.error("Failed to start subprocess",
741
 
                             exc_info=error)
742
 
                return True
743
 
            self.checker_callback_tag = (gobject.child_watch_add
744
 
                                         (self.checker.pid,
745
 
                                          self.checker_callback,
746
 
                                          data=command))
747
 
            # The checker may have completed before the gobject
748
 
            # watch was added.  Check for this.
749
 
            try:
 
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.
750
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)
751
718
            except OSError as error:
752
 
                if error.errno == errno.ECHILD:
753
 
                    # This should never happen
754
 
                    logger.error("Child process vanished",
755
 
                                 exc_info=error)
756
 
                    return True
757
 
                raise
758
 
            if pid:
759
 
                gobject.source_remove(self.checker_callback_tag)
760
 
                self.checker_callback(pid, status, command)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
761
721
        # Re-run this periodically if run by gobject.timeout_add
762
722
        return True
763
723
    
770
730
            return
771
731
        logger.debug("Stopping checker for %(name)s", vars(self))
772
732
        try:
773
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
774
734
            #time.sleep(0.5)
775
735
            #if self.checker.poll() is None:
776
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
777
737
        except OSError as error:
778
738
            if error.errno != errno.ESRCH: # No such process
779
739
                raise
796
756
    # "Set" method, so we fail early here:
797
757
    if byte_arrays and signature != "ay":
798
758
        raise ValueError("Byte arrays not supported for non-'ay'"
799
 
                         " signature {0!r}".format(signature))
 
759
                         " signature %r" % signature)
800
760
    def decorator(func):
801
761
        func._dbus_is_property = True
802
762
        func._dbus_interface = dbus_interface
810
770
    return decorator
811
771
 
812
772
 
813
 
def dbus_interface_annotations(dbus_interface):
814
 
    """Decorator for marking functions returning interface annotations
815
 
    
816
 
    Usage:
817
 
    
818
 
    @dbus_interface_annotations("org.example.Interface")
819
 
    def _foo(self):  # Function name does not matter
820
 
        return {"org.freedesktop.DBus.Deprecated": "true",
821
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
822
 
                    "false"}
823
 
    """
824
 
    def decorator(func):
825
 
        func._dbus_is_interface = True
826
 
        func._dbus_interface = dbus_interface
827
 
        func._dbus_name = dbus_interface
828
 
        return func
829
 
    return decorator
830
 
 
831
 
 
832
 
def dbus_annotations(annotations):
833
 
    """Decorator to annotate D-Bus methods, signals or properties
834
 
    Usage:
835
 
    
836
 
    @dbus_service_property("org.example.Interface", signature="b",
837
 
                           access="r")
838
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
839
 
                        "org.freedesktop.DBus.Property."
840
 
                        "EmitsChangedSignal": "false"})
841
 
    def Property_dbus_property(self):
842
 
        return dbus.Boolean(False)
843
 
    """
844
 
    def decorator(func):
845
 
        func._dbus_annotations = annotations
846
 
        return func
847
 
    return decorator
848
 
 
849
 
 
850
773
class DBusPropertyException(dbus.exceptions.DBusException):
851
774
    """A base class for D-Bus property-related exceptions
852
775
    """
875
798
    """
876
799
    
877
800
    @staticmethod
878
 
    def _is_dbus_thing(thing):
879
 
        """Returns a function testing if an attribute is a D-Bus thing
880
 
        
881
 
        If called like _is_dbus_thing("method") it returns a function
882
 
        suitable for use as predicate to inspect.getmembers().
883
 
        """
884
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
885
 
                                   False)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
886
803
    
887
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
888
805
        """Returns a generator of (name, attribute) pairs
889
806
        """
890
 
        return ((getattr(athing.__get__(self), "_dbus_name",
891
 
                         name),
892
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
893
808
                for cls in self.__class__.__mro__
894
 
                for name, athing in
895
 
                inspect.getmembers(cls,
896
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
897
811
    
898
812
    def _get_dbus_property(self, interface_name, property_name):
899
813
        """Returns a bound method if one exists which is a D-Bus
901
815
        """
902
816
        for cls in  self.__class__.__mro__:
903
817
            for name, value in (inspect.getmembers
904
 
                                (cls,
905
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
906
819
                if (value._dbus_name == property_name
907
820
                    and value._dbus_interface == interface_name):
908
821
                    return value.__get__(self)
936
849
            # The byte_arrays option is not supported yet on
937
850
            # signatures other than "ay".
938
851
            if prop._dbus_signature != "ay":
939
 
                raise ValueError("Byte arrays not supported for non-"
940
 
                                 "'ay' signature {0!r}"
941
 
                                 .format(prop._dbus_signature))
 
852
                raise ValueError
942
853
            value = dbus.ByteArray(b''.join(chr(byte)
943
854
                                            for byte in value))
944
855
        prop(value)
952
863
        Note: Will not include properties with access="write".
953
864
        """
954
865
        properties = {}
955
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
956
867
            if (interface_name
957
868
                and interface_name != prop._dbus_interface):
958
869
                # Interface non-empty but did not match
973
884
                         path_keyword='object_path',
974
885
                         connection_keyword='connection')
975
886
    def Introspect(self, object_path, connection):
976
 
        """Overloading of standard D-Bus method.
977
 
        
978
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
979
888
        """
980
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
981
890
                                                   connection)
988
897
                e.setAttribute("access", prop._dbus_access)
989
898
                return e
990
899
            for if_tag in document.getElementsByTagName("interface"):
991
 
                # Add property tags
992
900
                for tag in (make_tag(document, name, prop)
993
901
                            for name, prop
994
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
995
903
                            if prop._dbus_interface
996
904
                            == if_tag.getAttribute("name")):
997
905
                    if_tag.appendChild(tag)
998
 
                # Add annotation tags
999
 
                for typ in ("method", "signal", "property"):
1000
 
                    for tag in if_tag.getElementsByTagName(typ):
1001
 
                        annots = dict()
1002
 
                        for name, prop in (self.
1003
 
                                           _get_all_dbus_things(typ)):
1004
 
                            if (name == tag.getAttribute("name")
1005
 
                                and prop._dbus_interface
1006
 
                                == if_tag.getAttribute("name")):
1007
 
                                annots.update(getattr
1008
 
                                              (prop,
1009
 
                                               "_dbus_annotations",
1010
 
                                               {}))
1011
 
                        for name, value in annots.iteritems():
1012
 
                            ann_tag = document.createElement(
1013
 
                                "annotation")
1014
 
                            ann_tag.setAttribute("name", name)
1015
 
                            ann_tag.setAttribute("value", value)
1016
 
                            tag.appendChild(ann_tag)
1017
 
                # Add interface annotation tags
1018
 
                for annotation, value in dict(
1019
 
                    itertools.chain.from_iterable(
1020
 
                        annotations().iteritems()
1021
 
                        for name, annotations in
1022
 
                        self._get_all_dbus_things("interface")
1023
 
                        if name == if_tag.getAttribute("name")
1024
 
                        )).iteritems():
1025
 
                    ann_tag = document.createElement("annotation")
1026
 
                    ann_tag.setAttribute("name", annotation)
1027
 
                    ann_tag.setAttribute("value", value)
1028
 
                    if_tag.appendChild(ann_tag)
1029
906
                # Add the names to the return values for the
1030
907
                # "org.freedesktop.DBus.Properties" methods
1031
908
                if (if_tag.getAttribute("name")
1046
923
        except (AttributeError, xml.dom.DOMException,
1047
924
                xml.parsers.expat.ExpatError) as error:
1048
925
            logger.error("Failed to override Introspection method",
1049
 
                         exc_info=error)
 
926
                         error)
1050
927
        return xmlstring
1051
928
 
1052
929
 
1053
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1054
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1055
932
    if dt is None:
1056
933
        return dbus.String("", variant_level = variant_level)
1058
935
                       variant_level=variant_level)
1059
936
 
1060
937
 
1061
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1062
 
    """A class decorator; applied to a subclass of
1063
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1064
 
    interface names according to the "alt_interface_names" mapping.
1065
 
    Usage:
1066
 
    
1067
 
    @alternate_dbus_interfaces({"org.example.Interface":
1068
 
                                    "net.example.AlternateInterface"})
1069
 
    class SampleDBusObject(dbus.service.Object):
1070
 
        @dbus.service.method("org.example.Interface")
1071
 
        def SampleDBusMethod():
1072
 
            pass
1073
 
    
1074
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1075
 
    reachable via two interfaces: "org.example.Interface" and
1076
 
    "net.example.AlternateInterface", the latter of which will have
1077
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1078
 
    "true", unless "deprecate" is passed with a False value.
1079
 
    
1080
 
    This works for methods and signals, and also for D-Bus properties
1081
 
    (from DBusObjectWithProperties) and interfaces (from the
1082
 
    dbus_interface_annotations decorator).
 
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.
1083
942
    """
1084
 
    def wrapper(cls):
1085
 
        for orig_interface_name, alt_interface_name in (
1086
 
            alt_interface_names.iteritems()):
1087
 
            attr = {}
1088
 
            interface_names = set()
1089
 
            # Go though all attributes of the class
1090
 
            for attrname, attribute in inspect.getmembers(cls):
 
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):
1091
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1092
951
                # with the wrong interface name
1093
952
                if (not hasattr(attribute, "_dbus_interface")
1094
953
                    or not attribute._dbus_interface
1095
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1096
955
                    continue
1097
956
                # Create an alternate D-Bus interface name based on
1098
957
                # the current name
1099
958
                alt_interface = (attribute._dbus_interface
1100
 
                                 .replace(orig_interface_name,
1101
 
                                          alt_interface_name))
1102
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1103
961
                # Is this a D-Bus signal?
1104
962
                if getattr(attribute, "_dbus_is_signal", False):
1105
 
                    # Extract the original non-method undecorated
1106
 
                    # function by black magic
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
1107
965
                    nonmethod_func = (dict(
1108
966
                            zip(attribute.func_code.co_freevars,
1109
967
                                attribute.__closure__))["func"]
1120
978
                                nonmethod_func.func_name,
1121
979
                                nonmethod_func.func_defaults,
1122
980
                                nonmethod_func.func_closure)))
1123
 
                    # Copy annotations, if any
1124
 
                    try:
1125
 
                        new_function._dbus_annotations = (
1126
 
                            dict(attribute._dbus_annotations))
1127
 
                    except AttributeError:
1128
 
                        pass
1129
981
                    # Define a creator of a function to call both the
1130
 
                    # original and alternate functions, so both the
1131
 
                    # original and alternate signals gets sent when
1132
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1133
984
                    def fixscope(func1, func2):
1134
985
                        """This function is a scope container to pass
1135
986
                        func1 and func2 to the "call_both" function
1142
993
                        return call_both
1143
994
                    # Create the "call_both" function and add it to
1144
995
                    # the class
1145
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1146
998
                # Is this a D-Bus method?
1147
999
                elif getattr(attribute, "_dbus_is_method", False):
1148
1000
                    # Create a new, but exactly alike, function
1159
1011
                                        attribute.func_name,
1160
1012
                                        attribute.func_defaults,
1161
1013
                                        attribute.func_closure)))
1162
 
                    # Copy annotations, if any
1163
 
                    try:
1164
 
                        attr[attrname]._dbus_annotations = (
1165
 
                            dict(attribute._dbus_annotations))
1166
 
                    except AttributeError:
1167
 
                        pass
1168
1014
                # Is this a D-Bus property?
1169
1015
                elif getattr(attribute, "_dbus_is_property", False):
1170
1016
                    # Create a new, but exactly alike, function
1184
1030
                                        attribute.func_name,
1185
1031
                                        attribute.func_defaults,
1186
1032
                                        attribute.func_closure)))
1187
 
                    # Copy annotations, if any
1188
 
                    try:
1189
 
                        attr[attrname]._dbus_annotations = (
1190
 
                            dict(attribute._dbus_annotations))
1191
 
                    except AttributeError:
1192
 
                        pass
1193
 
                # Is this a D-Bus interface?
1194
 
                elif getattr(attribute, "_dbus_is_interface", False):
1195
 
                    # Create a new, but exactly alike, function
1196
 
                    # object.  Decorate it to be a new D-Bus interface
1197
 
                    # with the alternate D-Bus interface name.  Add it
1198
 
                    # to the class.
1199
 
                    attr[attrname] = (dbus_interface_annotations
1200
 
                                      (alt_interface)
1201
 
                                      (types.FunctionType
1202
 
                                       (attribute.func_code,
1203
 
                                        attribute.func_globals,
1204
 
                                        attribute.func_name,
1205
 
                                        attribute.func_defaults,
1206
 
                                        attribute.func_closure)))
1207
 
            if deprecate:
1208
 
                # Deprecate all alternate interfaces
1209
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1210
 
                for interface_name in interface_names:
1211
 
                    @dbus_interface_annotations(interface_name)
1212
 
                    def func(self):
1213
 
                        return { "org.freedesktop.DBus.Deprecated":
1214
 
                                     "true" }
1215
 
                    # Find an unused name
1216
 
                    for aname in (iname.format(i)
1217
 
                                  for i in itertools.count()):
1218
 
                        if aname not in attr:
1219
 
                            attr[aname] = func
1220
 
                            break
1221
 
            if interface_names:
1222
 
                # Replace the class with a new subclass of it with
1223
 
                # methods, signals, etc. as created above.
1224
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1225
 
                           (cls,), attr)
1226
 
        return cls
1227
 
    return wrapper
1228
 
 
1229
 
 
1230
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1231
 
                                "se.bsnet.fukt.Mandos"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1232
1036
class ClientDBus(Client, DBusObjectWithProperties):
1233
1037
    """A Client class using D-Bus
1234
1038
    
1254
1058
                                 ("/clients/" + client_object_name))
1255
1059
        DBusObjectWithProperties.__init__(self, self.bus,
1256
1060
                                          self.dbus_object_path)
1257
 
    
 
1061
        
1258
1062
    def notifychangeproperty(transform_func,
1259
1063
                             dbus_name, type_func=lambda x: x,
1260
1064
                             variant_level=1):
1283
1087
        
1284
1088
        return property(lambda self: getattr(self, attrname), setter)
1285
1089
    
 
1090
    
1286
1091
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1287
1092
    approvals_pending = notifychangeproperty(dbus.Boolean,
1288
1093
                                             "ApprovalPending",
1295
1100
                                       checker is not None)
1296
1101
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1297
1102
                                           "LastCheckedOK")
1298
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1299
 
                                               "LastCheckerStatus")
1300
1103
    last_approval_request = notifychangeproperty(
1301
1104
        datetime_to_dbus, "LastApprovalRequest")
1302
1105
    approved_by_default = notifychangeproperty(dbus.Boolean,
1370
1173
        return False
1371
1174
    
1372
1175
    def approve(self, value=True):
 
1176
        self.send_changedstate()
1373
1177
        self.approved = value
1374
1178
        gobject.timeout_add(timedelta_to_milliseconds
1375
1179
                            (self.approval_duration),
1376
1180
                            self._reset_approved)
1377
 
        self.send_changedstate()
 
1181
    
1378
1182
    
1379
1183
    ## D-Bus methods, signals & properties
1380
1184
    _interface = "se.recompile.Mandos.Client"
1381
1185
    
1382
 
    ## Interfaces
1383
 
    
1384
 
    @dbus_interface_annotations(_interface)
1385
 
    def _foo(self):
1386
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1387
 
                     "false"}
1388
 
    
1389
1186
    ## Signals
1390
1187
    
1391
1188
    # CheckerCompleted - signal
1542
1339
            return
1543
1340
        return datetime_to_dbus(self.last_checked_ok)
1544
1341
    
1545
 
    # LastCheckerStatus - property
1546
 
    @dbus_service_property(_interface, signature="n",
1547
 
                           access="read")
1548
 
    def LastCheckerStatus_dbus_property(self):
1549
 
        return dbus.Int16(self.last_checker_status)
1550
 
    
1551
1342
    # Expires - property
1552
1343
    @dbus_service_property(_interface, signature="s", access="read")
1553
1344
    def Expires_dbus_property(self):
1564
1355
    def Timeout_dbus_property(self, value=None):
1565
1356
        if value is None:       # get
1566
1357
            return dbus.UInt64(self.timeout_milliseconds())
1567
 
        old_timeout = self.timeout
1568
1358
        self.timeout = datetime.timedelta(0, 0, 0, value)
1569
 
        # Reschedule disabling
 
1359
        # Reschedule timeout
1570
1360
        if self.enabled:
1571
1361
            now = datetime.datetime.utcnow()
1572
 
            self.expires += self.timeout - old_timeout
1573
 
            if self.expires <= now:
 
1362
            time_to_die = timedelta_to_milliseconds(
 
1363
                (self.last_checked_ok + self.timeout) - now)
 
1364
            if time_to_die <= 0:
1574
1365
                # The timeout has passed
1575
1366
                self.disable()
1576
1367
            else:
 
1368
                self.expires = (now +
 
1369
                                datetime.timedelta(milliseconds =
 
1370
                                                   time_to_die))
1577
1371
                if (getattr(self, "disable_initiator_tag", None)
1578
1372
                    is None):
1579
1373
                    return
1580
1374
                gobject.source_remove(self.disable_initiator_tag)
1581
 
                self.disable_initiator_tag = (
1582
 
                    gobject.timeout_add(
1583
 
                        timedelta_to_milliseconds(self.expires - now),
1584
 
                        self.disable))
 
1375
                self.disable_initiator_tag = (gobject.timeout_add
 
1376
                                              (time_to_die,
 
1377
                                               self.disable))
1585
1378
    
1586
1379
    # ExtendedTimeout - property
1587
1380
    @dbus_service_property(_interface, signature="t",
1666
1459
        self._pipe.send(('setattr', name, value))
1667
1460
 
1668
1461
 
 
1462
class ClientDBusTransitional(ClientDBus):
 
1463
    __metaclass__ = AlternateDBusNamesMetaclass
 
1464
 
 
1465
 
1669
1466
class ClientHandler(socketserver.BaseRequestHandler, object):
1670
1467
    """A class to handle client connections.
1671
1468
    
1707
1504
            logger.debug("Protocol version: %r", line)
1708
1505
            try:
1709
1506
                if int(line.strip().split()[0]) > 1:
1710
 
                    raise RuntimeError(line)
 
1507
                    raise RuntimeError
1711
1508
            except (ValueError, IndexError, RuntimeError) as error:
1712
1509
                logger.error("Unknown protocol version: %s", error)
1713
1510
                return
1775
1572
                    #wait until timeout or approved
1776
1573
                    time = datetime.datetime.now()
1777
1574
                    client.changedstate.acquire()
1778
 
                    client.changedstate.wait(
1779
 
                        float(timedelta_to_milliseconds(delay)
1780
 
                              / 1000))
 
1575
                    (client.changedstate.wait
 
1576
                     (float(client.timedelta_to_milliseconds(delay)
 
1577
                            / 1000)))
1781
1578
                    client.changedstate.release()
1782
1579
                    time2 = datetime.datetime.now()
1783
1580
                    if (time2 - time) >= delay:
1799
1596
                    try:
1800
1597
                        sent = session.send(client.secret[sent_size:])
1801
1598
                    except gnutls.errors.GNUTLSError as error:
1802
 
                        logger.warning("gnutls send failed",
1803
 
                                       exc_info=error)
 
1599
                        logger.warning("gnutls send failed")
1804
1600
                        return
1805
1601
                    logger.debug("Sent: %d, remaining: %d",
1806
1602
                                 sent, len(client.secret)
1809
1605
                
1810
1606
                logger.info("Sending secret to %s", client.name)
1811
1607
                # bump the timeout using extended_timeout
1812
 
                client.bump_timeout(client.extended_timeout)
 
1608
                client.checked_ok(client.extended_timeout)
1813
1609
                if self.server.use_dbus:
1814
1610
                    # Emit D-Bus signal
1815
1611
                    client.GotSecret()
1820
1616
                try:
1821
1617
                    session.bye()
1822
1618
                except gnutls.errors.GNUTLSError as error:
1823
 
                    logger.warning("GnuTLS bye failed",
1824
 
                                   exc_info=error)
 
1619
                    logger.warning("GnuTLS bye failed")
1825
1620
    
1826
1621
    @staticmethod
1827
1622
    def peer_certificate(session):
1899
1694
    def process_request(self, request, address):
1900
1695
        """Start a new process to process the request."""
1901
1696
        proc = multiprocessing.Process(target = self.sub_process_main,
1902
 
                                       args = (request, address))
 
1697
                                       args = (request,
 
1698
                                               address))
1903
1699
        proc.start()
1904
1700
        return proc
1905
1701
 
1920
1716
    
1921
1717
    def add_pipe(self, parent_pipe, proc):
1922
1718
        """Dummy function; override as necessary"""
1923
 
        raise NotImplementedError()
 
1719
        raise NotImplementedError
1924
1720
 
1925
1721
 
1926
1722
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1933
1729
        use_ipv6:       Boolean; to use IPv6 or not
1934
1730
    """
1935
1731
    def __init__(self, server_address, RequestHandlerClass,
1936
 
                 interface=None, use_ipv6=True, socketfd=None):
1937
 
        """If socketfd is set, use that file descriptor instead of
1938
 
        creating a new one with socket.socket().
1939
 
        """
 
1732
                 interface=None, use_ipv6=True):
1940
1733
        self.interface = interface
1941
1734
        if use_ipv6:
1942
1735
            self.address_family = socket.AF_INET6
1943
 
        if socketfd is not None:
1944
 
            # Save the file descriptor
1945
 
            self.socketfd = socketfd
1946
 
            # Save the original socket.socket() function
1947
 
            self.socket_socket = socket.socket
1948
 
            # To implement --socket, we monkey patch socket.socket.
1949
 
            # 
1950
 
            # (When socketserver.TCPServer is a new-style class, we
1951
 
            # could make self.socket into a property instead of monkey
1952
 
            # patching socket.socket.)
1953
 
            # 
1954
 
            # Create a one-time-only replacement for socket.socket()
1955
 
            @functools.wraps(socket.socket)
1956
 
            def socket_wrapper(*args, **kwargs):
1957
 
                # Restore original function so subsequent calls are
1958
 
                # not affected.
1959
 
                socket.socket = self.socket_socket
1960
 
                del self.socket_socket
1961
 
                # This time only, return a new socket object from the
1962
 
                # saved file descriptor.
1963
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1964
 
            # Replace socket.socket() function with wrapper
1965
 
            socket.socket = socket_wrapper
1966
 
        # The socketserver.TCPServer.__init__ will call
1967
 
        # socket.socket(), which might be our replacement,
1968
 
        # socket_wrapper(), if socketfd was set.
1969
1736
        socketserver.TCPServer.__init__(self, server_address,
1970
1737
                                        RequestHandlerClass)
1971
 
    
1972
1738
    def server_bind(self):
1973
1739
        """This overrides the normal server_bind() function
1974
1740
        to bind to an interface if one was specified, and also NOT to
1982
1748
                try:
1983
1749
                    self.socket.setsockopt(socket.SOL_SOCKET,
1984
1750
                                           SO_BINDTODEVICE,
1985
 
                                           str(self.interface + '\0'))
 
1751
                                           str(self.interface
 
1752
                                               + '\0'))
1986
1753
                except socket.error as error:
1987
 
                    if error.errno == errno.EPERM:
1988
 
                        logger.error("No permission to bind to"
1989
 
                                     " interface %s", self.interface)
1990
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1754
                    if error[0] == errno.EPERM:
 
1755
                        logger.error("No permission to"
 
1756
                                     " bind to interface %s",
 
1757
                                     self.interface)
 
1758
                    elif error[0] == errno.ENOPROTOOPT:
1991
1759
                        logger.error("SO_BINDTODEVICE not available;"
1992
1760
                                     " cannot bind to interface %s",
1993
1761
                                     self.interface)
1994
 
                    elif error.errno == errno.ENODEV:
1995
 
                        logger.error("Interface %s does not exist,"
1996
 
                                     " cannot bind", self.interface)
1997
1762
                    else:
1998
1763
                        raise
1999
1764
        # Only bind(2) the socket if we really need to.
2002
1767
                if self.address_family == socket.AF_INET6:
2003
1768
                    any_address = "::" # in6addr_any
2004
1769
                else:
2005
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1770
                    any_address = socket.INADDR_ANY
2006
1771
                self.server_address = (any_address,
2007
1772
                                       self.server_address[1])
2008
1773
            elif not self.server_address[1]:
2029
1794
    """
2030
1795
    def __init__(self, server_address, RequestHandlerClass,
2031
1796
                 interface=None, use_ipv6=True, clients=None,
2032
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1797
                 gnutls_priority=None, use_dbus=True):
2033
1798
        self.enabled = False
2034
1799
        self.clients = clients
2035
1800
        if self.clients is None:
2039
1804
        IPv6_TCPServer.__init__(self, server_address,
2040
1805
                                RequestHandlerClass,
2041
1806
                                interface = interface,
2042
 
                                use_ipv6 = use_ipv6,
2043
 
                                socketfd = socketfd)
 
1807
                                use_ipv6 = use_ipv6)
2044
1808
    def server_activate(self):
2045
1809
        if self.enabled:
2046
1810
            return socketserver.TCPServer.server_activate(self)
2059
1823
    
2060
1824
    def handle_ipc(self, source, condition, parent_pipe=None,
2061
1825
                   proc = None, client_object=None):
 
1826
        condition_names = {
 
1827
            gobject.IO_IN: "IN",   # There is data to read.
 
1828
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1829
                                    # blocking).
 
1830
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1831
            gobject.IO_ERR: "ERR", # Error condition.
 
1832
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1833
                                    # broken, usually for pipes and
 
1834
                                    # sockets).
 
1835
            }
 
1836
        conditions_string = ' | '.join(name
 
1837
                                       for cond, name in
 
1838
                                       condition_names.iteritems()
 
1839
                                       if cond & condition)
2062
1840
        # error, or the other end of multiprocessing.Pipe has closed
2063
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1841
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2064
1842
            # Wait for other process to exit
2065
1843
            proc.join()
2066
1844
            return False
2124
1902
        return True
2125
1903
 
2126
1904
 
2127
 
def rfc3339_duration_to_delta(duration):
2128
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2129
 
    
2130
 
    >>> rfc3339_duration_to_delta("P7D")
2131
 
    datetime.timedelta(7)
2132
 
    >>> rfc3339_duration_to_delta("PT60S")
2133
 
    datetime.timedelta(0, 60)
2134
 
    >>> rfc3339_duration_to_delta("PT60M")
2135
 
    datetime.timedelta(0, 3600)
2136
 
    >>> rfc3339_duration_to_delta("PT24H")
2137
 
    datetime.timedelta(1)
2138
 
    >>> rfc3339_duration_to_delta("P1W")
2139
 
    datetime.timedelta(7)
2140
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2141
 
    datetime.timedelta(0, 330)
2142
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2143
 
    datetime.timedelta(1, 200)
2144
 
    """
2145
 
    
2146
 
    # Parsing an RFC 3339 duration with regular expressions is not
2147
 
    # possible - there would have to be multiple places for the same
2148
 
    # values, like seconds.  The current code, while more esoteric, is
2149
 
    # cleaner without depending on a parsing library.  If Python had a
2150
 
    # built-in library for parsing we would use it, but we'd like to
2151
 
    # avoid excessive use of external libraries.
2152
 
    
2153
 
    # New type for defining tokens, syntax, and semantics all-in-one
2154
 
    Token = collections.namedtuple("Token",
2155
 
                                   ("regexp", # To match token; if
2156
 
                                              # "value" is not None,
2157
 
                                              # must have a "group"
2158
 
                                              # containing digits
2159
 
                                    "value",  # datetime.timedelta or
2160
 
                                              # None
2161
 
                                    "followers")) # Tokens valid after
2162
 
                                                  # this token
2163
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2164
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2165
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2166
 
    token_second = Token(re.compile(r"(\d+)S"),
2167
 
                         datetime.timedelta(seconds=1),
2168
 
                         frozenset((token_end,)))
2169
 
    token_minute = Token(re.compile(r"(\d+)M"),
2170
 
                         datetime.timedelta(minutes=1),
2171
 
                         frozenset((token_second, token_end)))
2172
 
    token_hour = Token(re.compile(r"(\d+)H"),
2173
 
                       datetime.timedelta(hours=1),
2174
 
                       frozenset((token_minute, token_end)))
2175
 
    token_time = Token(re.compile(r"T"),
2176
 
                       None,
2177
 
                       frozenset((token_hour, token_minute,
2178
 
                                  token_second)))
2179
 
    token_day = Token(re.compile(r"(\d+)D"),
2180
 
                      datetime.timedelta(days=1),
2181
 
                      frozenset((token_time, token_end)))
2182
 
    token_month = Token(re.compile(r"(\d+)M"),
2183
 
                        datetime.timedelta(weeks=4),
2184
 
                        frozenset((token_day, token_end)))
2185
 
    token_year = Token(re.compile(r"(\d+)Y"),
2186
 
                       datetime.timedelta(weeks=52),
2187
 
                       frozenset((token_month, token_end)))
2188
 
    token_week = Token(re.compile(r"(\d+)W"),
2189
 
                       datetime.timedelta(weeks=1),
2190
 
                       frozenset((token_end,)))
2191
 
    token_duration = Token(re.compile(r"P"), None,
2192
 
                           frozenset((token_year, token_month,
2193
 
                                      token_day, token_time,
2194
 
                                      token_week))),
2195
 
    # Define starting values
2196
 
    value = datetime.timedelta() # Value so far
2197
 
    found_token = None
2198
 
    followers = frozenset(token_duration,) # Following valid tokens
2199
 
    s = duration                # String left to parse
2200
 
    # Loop until end token is found
2201
 
    while found_token is not token_end:
2202
 
        # Search for any currently valid tokens
2203
 
        for token in followers:
2204
 
            match = token.regexp.match(s)
2205
 
            if match is not None:
2206
 
                # Token found
2207
 
                if token.value is not None:
2208
 
                    # Value found, parse digits
2209
 
                    factor = int(match.group(1), 10)
2210
 
                    # Add to value so far
2211
 
                    value += factor * token.value
2212
 
                # Strip token from string
2213
 
                s = token.regexp.sub("", s, 1)
2214
 
                # Go to found token
2215
 
                found_token = token
2216
 
                # Set valid next tokens
2217
 
                followers = found_token.followers
2218
 
                break
2219
 
        else:
2220
 
            # No currently valid tokens were found
2221
 
            raise ValueError("Invalid RFC 3339 duration")
2222
 
    # End token found
2223
 
    return value
2224
 
 
2225
 
 
2226
1905
def string_to_delta(interval):
2227
1906
    """Parse a string and return a datetime.timedelta
2228
1907
    
2239
1918
    >>> string_to_delta('5m 30s')
2240
1919
    datetime.timedelta(0, 330)
2241
1920
    """
2242
 
    
2243
 
    try:
2244
 
        return rfc3339_duration_to_delta(interval)
2245
 
    except ValueError:
2246
 
        pass
2247
 
    
2248
1921
    timevalue = datetime.timedelta(0)
2249
1922
    for s in interval.split():
2250
1923
        try:
2261
1934
            elif suffix == "w":
2262
1935
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2263
1936
            else:
2264
 
                raise ValueError("Unknown suffix {0!r}"
2265
 
                                 .format(suffix))
2266
 
        except IndexError as e:
 
1937
                raise ValueError("Unknown suffix %r" % suffix)
 
1938
        except (ValueError, IndexError) as e:
2267
1939
            raise ValueError(*(e.args))
2268
1940
        timevalue += delta
2269
1941
    return timevalue
2282
1954
        sys.exit()
2283
1955
    if not noclose:
2284
1956
        # Close all standard open file descriptors
2285
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1957
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2286
1958
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
1959
            raise OSError(errno.ENODEV,
2288
 
                          "{0} not a character device"
2289
 
                          .format(os.devnull))
 
1960
                          "%s not a character device"
 
1961
                          % os.path.devnull)
2290
1962
        os.dup2(null, sys.stdin.fileno())
2291
1963
        os.dup2(null, sys.stdout.fileno())
2292
1964
        os.dup2(null, sys.stderr.fileno())
2301
1973
    
2302
1974
    parser = argparse.ArgumentParser()
2303
1975
    parser.add_argument("-v", "--version", action="version",
2304
 
                        version = "%(prog)s {0}".format(version),
 
1976
                        version = "%%(prog)s %s" % version,
2305
1977
                        help="show version number and exit")
2306
1978
    parser.add_argument("-i", "--interface", metavar="IF",
2307
1979
                        help="Bind to interface IF")
2313
1985
                        help="Run self-test")
2314
1986
    parser.add_argument("--debug", action="store_true",
2315
1987
                        help="Debug mode; run in foreground and log"
2316
 
                        " to terminal", default=None)
 
1988
                        " to terminal")
2317
1989
    parser.add_argument("--debuglevel", metavar="LEVEL",
2318
1990
                        help="Debug level for stdout output")
2319
1991
    parser.add_argument("--priority", help="GnuTLS"
2326
1998
                        " files")
2327
1999
    parser.add_argument("--no-dbus", action="store_false",
2328
2000
                        dest="use_dbus", help="Do not provide D-Bus"
2329
 
                        " system bus interface", default=None)
 
2001
                        " system bus interface")
2330
2002
    parser.add_argument("--no-ipv6", action="store_false",
2331
 
                        dest="use_ipv6", help="Do not use IPv6",
2332
 
                        default=None)
 
2003
                        dest="use_ipv6", help="Do not use IPv6")
2333
2004
    parser.add_argument("--no-restore", action="store_false",
2334
2005
                        dest="restore", help="Do not restore stored"
2335
 
                        " state", default=None)
2336
 
    parser.add_argument("--socket", type=int,
2337
 
                        help="Specify a file descriptor to a network"
2338
 
                        " socket to use instead of creating one")
 
2006
                        " state")
2339
2007
    parser.add_argument("--statedir", metavar="DIR",
2340
2008
                        help="Directory to save/restore state in")
2341
 
    parser.add_argument("--foreground", action="store_true",
2342
 
                        help="Run in foreground", default=None)
2343
2009
    
2344
2010
    options = parser.parse_args()
2345
2011
    
2346
2012
    if options.check:
2347
2013
        import doctest
2348
 
        fail_count, test_count = doctest.testmod()
2349
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2014
        doctest.testmod()
 
2015
        sys.exit()
2350
2016
    
2351
2017
    # Default values for config file for server-global settings
2352
2018
    server_defaults = { "interface": "",
2354
2020
                        "port": "",
2355
2021
                        "debug": "False",
2356
2022
                        "priority":
2357
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2023
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2358
2024
                        "servicename": "Mandos",
2359
2025
                        "use_dbus": "True",
2360
2026
                        "use_ipv6": "True",
2361
2027
                        "debuglevel": "",
2362
2028
                        "restore": "True",
2363
 
                        "socket": "",
2364
 
                        "statedir": "/var/lib/mandos",
2365
 
                        "foreground": "False",
 
2029
                        "statedir": "/var/lib/mandos"
2366
2030
                        }
2367
2031
    
2368
2032
    # Parse config file for server-global settings
2373
2037
    # Convert the SafeConfigParser object to a dict
2374
2038
    server_settings = server_config.defaults()
2375
2039
    # Use the appropriate methods on the non-string config options
2376
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2040
    for option in ("debug", "use_dbus", "use_ipv6"):
2377
2041
        server_settings[option] = server_config.getboolean("DEFAULT",
2378
2042
                                                           option)
2379
2043
    if server_settings["port"]:
2380
2044
        server_settings["port"] = server_config.getint("DEFAULT",
2381
2045
                                                       "port")
2382
 
    if server_settings["socket"]:
2383
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2384
 
                                                         "socket")
2385
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2386
 
        # over with an opened os.devnull.  But we don't want this to
2387
 
        # happen with a supplied network socket.
2388
 
        if 0 <= server_settings["socket"] <= 2:
2389
 
            server_settings["socket"] = os.dup(server_settings
2390
 
                                               ["socket"])
2391
2046
    del server_config
2392
2047
    
2393
2048
    # Override the settings from the config file with command line
2395
2050
    for option in ("interface", "address", "port", "debug",
2396
2051
                   "priority", "servicename", "configdir",
2397
2052
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2398
 
                   "statedir", "socket", "foreground"):
 
2053
                   "statedir"):
2399
2054
        value = getattr(options, option)
2400
2055
        if value is not None:
2401
2056
            server_settings[option] = value
2404
2059
    for option in server_settings.keys():
2405
2060
        if type(server_settings[option]) is str:
2406
2061
            server_settings[option] = unicode(server_settings[option])
2407
 
    # Force all boolean options to be boolean
2408
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2409
 
                   "foreground"):
2410
 
        server_settings[option] = bool(server_settings[option])
2411
 
    # Debug implies foreground
2412
 
    if server_settings["debug"]:
2413
 
        server_settings["foreground"] = True
2414
2062
    # Now we have our good server settings in "server_settings"
2415
2063
    
2416
2064
    ##################################################################
2422
2070
    use_ipv6 = server_settings["use_ipv6"]
2423
2071
    stored_state_path = os.path.join(server_settings["statedir"],
2424
2072
                                     stored_state_file)
2425
 
    foreground = server_settings["foreground"]
2426
2073
    
2427
2074
    if debug:
2428
2075
        initlogger(debug, logging.DEBUG)
2435
2082
    
2436
2083
    if server_settings["servicename"] != "Mandos":
2437
2084
        syslogger.setFormatter(logging.Formatter
2438
 
                               ('Mandos ({0}) [%(process)d]:'
2439
 
                                ' %(levelname)s: %(message)s'
2440
 
                                .format(server_settings
2441
 
                                        ["servicename"])))
 
2085
                               ('Mandos (%s) [%%(process)d]:'
 
2086
                                ' %%(levelname)s: %%(message)s'
 
2087
                                % server_settings["servicename"]))
2442
2088
    
2443
2089
    # Parse config file with clients
2444
2090
    client_config = configparser.SafeConfigParser(Client
2457
2103
                              use_ipv6=use_ipv6,
2458
2104
                              gnutls_priority=
2459
2105
                              server_settings["priority"],
2460
 
                              use_dbus=use_dbus,
2461
 
                              socketfd=(server_settings["socket"]
2462
 
                                        or None))
2463
 
    if not foreground:
2464
 
        pidfilename = "/run/mandos.pid"
2465
 
        if not os.path.isdir("/run/."):
2466
 
            pidfilename = "/var/run/mandos.pid"
2467
 
        pidfile = None
 
2106
                              use_dbus=use_dbus)
 
2107
    if not debug:
 
2108
        pidfilename = "/var/run/mandos.pid"
2468
2109
        try:
2469
2110
            pidfile = open(pidfilename, "w")
2470
 
        except IOError as e:
2471
 
            logger.error("Could not open file %r", pidfilename,
2472
 
                         exc_info=e)
 
2111
        except IOError:
 
2112
            logger.error("Could not open file %r", pidfilename)
2473
2113
    
2474
 
    for name in ("_mandos", "mandos", "nobody"):
 
2114
    try:
 
2115
        uid = pwd.getpwnam("_mandos").pw_uid
 
2116
        gid = pwd.getpwnam("_mandos").pw_gid
 
2117
    except KeyError:
2475
2118
        try:
2476
 
            uid = pwd.getpwnam(name).pw_uid
2477
 
            gid = pwd.getpwnam(name).pw_gid
2478
 
            break
 
2119
            uid = pwd.getpwnam("mandos").pw_uid
 
2120
            gid = pwd.getpwnam("mandos").pw_gid
2479
2121
        except KeyError:
2480
 
            continue
2481
 
    else:
2482
 
        uid = 65534
2483
 
        gid = 65534
 
2122
            try:
 
2123
                uid = pwd.getpwnam("nobody").pw_uid
 
2124
                gid = pwd.getpwnam("nobody").pw_gid
 
2125
            except KeyError:
 
2126
                uid = 65534
 
2127
                gid = 65534
2484
2128
    try:
2485
2129
        os.setgid(gid)
2486
2130
        os.setuid(uid)
2487
2131
    except OSError as error:
2488
 
        if error.errno != errno.EPERM:
2489
 
            raise
 
2132
        if error[0] != errno.EPERM:
 
2133
            raise error
2490
2134
    
2491
2135
    if debug:
2492
2136
        # Enable all possible GnuTLS debugging
2503
2147
         .gnutls_global_set_log_function(debug_gnutls))
2504
2148
        
2505
2149
        # Redirect stdin so all checkers get /dev/null
2506
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2150
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2507
2151
        os.dup2(null, sys.stdin.fileno())
2508
2152
        if null > 2:
2509
2153
            os.close(null)
2510
2154
    
2511
2155
    # Need to fork before connecting to D-Bus
2512
 
    if not foreground:
 
2156
    if not debug:
2513
2157
        # Close all input and output, do double fork, etc.
2514
2158
        daemon()
2515
2159
    
2516
 
    # multiprocessing will use threads, so before we use gobject we
2517
 
    # need to inform gobject that threads will be used.
2518
2160
    gobject.threads_init()
2519
2161
    
2520
2162
    global main_loop
2521
2163
    # From the Avahi example code
2522
 
    DBusGMainLoop(set_as_default=True)
 
2164
    DBusGMainLoop(set_as_default=True )
2523
2165
    main_loop = gobject.MainLoop()
2524
2166
    bus = dbus.SystemBus()
2525
2167
    # End of Avahi example code
2531
2173
                            ("se.bsnet.fukt.Mandos", bus,
2532
2174
                             do_not_queue=True))
2533
2175
        except dbus.exceptions.NameExistsException as e:
2534
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2176
            logger.error(unicode(e) + ", disabling D-Bus")
2535
2177
            use_dbus = False
2536
2178
            server_settings["use_dbus"] = False
2537
2179
            tcp_server.use_dbus = False
2549
2191
    
2550
2192
    client_class = Client
2551
2193
    if use_dbus:
2552
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2194
        client_class = functools.partial(ClientDBusTransitional,
 
2195
                                         bus = bus)
2553
2196
    
2554
2197
    client_settings = Client.config_parser(client_config)
2555
2198
    old_client_settings = {}
2556
2199
    clients_data = {}
2557
2200
    
2558
 
    # This is used to redirect stdout and stderr for checker processes
2559
 
    global wnull
2560
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2561
 
    # Only used if server is running in foreground but not in debug
2562
 
    # mode
2563
 
    if debug or not foreground:
2564
 
        wnull.close()
2565
 
    
2566
2201
    # Get client data and settings from last running state.
2567
2202
    if server_settings["restore"]:
2568
2203
        try:
2571
2206
                                                     (stored_state))
2572
2207
            os.remove(stored_state_path)
2573
2208
        except IOError as e:
2574
 
            if e.errno == errno.ENOENT:
2575
 
                logger.warning("Could not load persistent state: {0}"
2576
 
                                .format(os.strerror(e.errno)))
2577
 
            else:
2578
 
                logger.critical("Could not load persistent state:",
2579
 
                                exc_info=e)
 
2209
            logger.warning("Could not load persistent state: {0}"
 
2210
                           .format(e))
 
2211
            if e.errno != errno.ENOENT:
2580
2212
                raise
2581
2213
        except EOFError as e:
2582
2214
            logger.warning("Could not load persistent state: "
2583
 
                           "EOFError:", exc_info=e)
 
2215
                           "EOFError: {0}".format(e))
2584
2216
    
2585
2217
    with PGPEngine() as pgp:
2586
2218
        for client_name, client in clients_data.iteritems():
2587
 
            # Skip removed clients
2588
 
            if client_name not in client_settings:
2589
 
                continue
2590
 
            
2591
2219
            # Decide which value to use after restoring saved state.
2592
2220
            # We have three different values: Old config file,
2593
2221
            # new config file, and saved state.
2643
2271
                             .format(client_name))
2644
2272
                client["secret"] = (
2645
2273
                    client_settings[client_name]["secret"])
 
2274
 
2646
2275
    
2647
2276
    # Add/remove clients based on new changes made to config
2648
2277
    for client_name in (set(old_client_settings)
2651
2280
    for client_name in (set(client_settings)
2652
2281
                        - set(old_client_settings)):
2653
2282
        clients_data[client_name] = client_settings[client_name]
2654
 
    
 
2283
 
2655
2284
    # Create all client objects
2656
2285
    for client_name, client in clients_data.iteritems():
2657
2286
        tcp_server.clients[client_name] = client_class(
2658
 
            name = client_name, settings = client,
2659
 
            server_settings = server_settings)
 
2287
            name = client_name, settings = client)
2660
2288
    
2661
2289
    if not tcp_server.clients:
2662
2290
        logger.warning("No clients defined")
2663
 
    
2664
 
    if not foreground:
2665
 
        if pidfile is not None:
2666
 
            try:
2667
 
                with pidfile:
2668
 
                    pid = os.getpid()
2669
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2670
 
            except IOError:
2671
 
                logger.error("Could not write to file %r with PID %d",
2672
 
                             pidfilename, pid)
2673
 
        del pidfile
 
2291
        
 
2292
    if not debug:
 
2293
        try:
 
2294
            with pidfile:
 
2295
                pid = os.getpid()
 
2296
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2297
            del pidfile
 
2298
        except IOError:
 
2299
            logger.error("Could not write to file %r with PID %d",
 
2300
                         pidfilename, pid)
 
2301
        except NameError:
 
2302
            # "pidfile" was never created
 
2303
            pass
2674
2304
        del pidfilename
 
2305
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2675
2306
    
2676
2307
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2677
2308
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2678
2309
    
2679
2310
    if use_dbus:
2680
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2681
 
                                        "se.bsnet.fukt.Mandos"})
2682
 
        class MandosDBusService(DBusObjectWithProperties):
 
2311
        class MandosDBusService(dbus.service.Object):
2683
2312
            """A D-Bus proxy object"""
2684
2313
            def __init__(self):
2685
2314
                dbus.service.Object.__init__(self, bus, "/")
2686
2315
            _interface = "se.recompile.Mandos"
2687
2316
            
2688
 
            @dbus_interface_annotations(_interface)
2689
 
            def _foo(self):
2690
 
                return { "org.freedesktop.DBus.Property"
2691
 
                         ".EmitsChangedSignal":
2692
 
                             "false"}
2693
 
            
2694
2317
            @dbus.service.signal(_interface, signature="o")
2695
2318
            def ClientAdded(self, objpath):
2696
2319
                "D-Bus signal"
2738
2361
            
2739
2362
            del _interface
2740
2363
        
2741
 
        mandos_dbus_service = MandosDBusService()
 
2364
        class MandosDBusServiceTransitional(MandosDBusService):
 
2365
            __metaclass__ = AlternateDBusNamesMetaclass
 
2366
        mandos_dbus_service = MandosDBusServiceTransitional()
2742
2367
    
2743
2368
    def cleanup():
2744
2369
        "Cleanup function; run on exit"
2745
2370
        service.cleanup()
2746
2371
        
2747
2372
        multiprocessing.active_children()
2748
 
        wnull.close()
2749
2373
        if not (tcp_server.clients or client_settings):
2750
2374
            return
2751
2375
        
2763
2387
                # A list of attributes that can not be pickled
2764
2388
                # + secret.
2765
2389
                exclude = set(("bus", "changedstate", "secret",
2766
 
                               "checker", "server_settings"))
 
2390
                               "checker"))
2767
2391
                for name, typ in (inspect.getmembers
2768
2392
                                  (dbus.service.Object)):
2769
2393
                    exclude.add(name)
2778
2402
                del client_settings[client.name]["secret"]
2779
2403
        
2780
2404
        try:
2781
 
            with (tempfile.NamedTemporaryFile
2782
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2783
 
                   dir=os.path.dirname(stored_state_path),
2784
 
                   delete=False)) as stored_state:
 
2405
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2406
                                                prefix="clients-",
 
2407
                                                dir=os.path.dirname
 
2408
                                                (stored_state_path))
 
2409
            with os.fdopen(tempfd, "wb") as stored_state:
2785
2410
                pickle.dump((clients, client_settings), stored_state)
2786
 
                tempname=stored_state.name
2787
2411
            os.rename(tempname, stored_state_path)
2788
2412
        except (IOError, OSError) as e:
 
2413
            logger.warning("Could not save persistent state: {0}"
 
2414
                           .format(e))
2789
2415
            if not debug:
2790
2416
                try:
2791
2417
                    os.remove(tempname)
2792
2418
                except NameError:
2793
2419
                    pass
2794
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2795
 
                logger.warning("Could not save persistent state: {0}"
2796
 
                               .format(os.strerror(e.errno)))
2797
 
            else:
2798
 
                logger.warning("Could not save persistent state:",
2799
 
                               exc_info=e)
2800
 
                raise
 
2420
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2421
                                   errno.EEXIST)):
 
2422
                raise e
2801
2423
        
2802
2424
        # Delete all clients, and settings from config
2803
2425
        while tcp_server.clients:
2830
2452
    service.port = tcp_server.socket.getsockname()[1]
2831
2453
    if use_ipv6:
2832
2454
        logger.info("Now listening on address %r, port %d,"
2833
 
                    " flowinfo %d, scope_id %d",
2834
 
                    *tcp_server.socket.getsockname())
 
2455
                    " flowinfo %d, scope_id %d"
 
2456
                    % tcp_server.socket.getsockname())
2835
2457
    else:                       # IPv4
2836
 
        logger.info("Now listening on address %r, port %d",
2837
 
                    *tcp_server.socket.getsockname())
 
2458
        logger.info("Now listening on address %r, port %d"
 
2459
                    % tcp_server.socket.getsockname())
2838
2460
    
2839
2461
    #service.interface = tcp_server.socket.getsockname()[3]
2840
2462
    
2843
2465
        try:
2844
2466
            service.activate()
2845
2467
        except dbus.exceptions.DBusException as error:
2846
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2468
            logger.critical("DBusException: %s", error)
2847
2469
            cleanup()
2848
2470
            sys.exit(1)
2849
2471
        # End of Avahi example code
2856
2478
        logger.debug("Starting main loop")
2857
2479
        main_loop.run()
2858
2480
    except AvahiError as error:
2859
 
        logger.critical("Avahi Error", exc_info=error)
 
2481
        logger.critical("AvahiError: %s", error)
2860
2482
        cleanup()
2861
2483
        sys.exit(1)
2862
2484
    except KeyboardInterrupt: