/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 bsnet
  • Date: 2011-12-25 00:43:51 UTC
  • Revision ID: teddy@fukt.bsnet.se-20111225004351-3hw3msbs8ooesltd
Removed implemented TODO entry

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