/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 03:03:33 UTC
  • Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.

The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string.  This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:

SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256

* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
  (/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
                                      instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 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
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
import SocketServer as socketserver
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
69
78
import tempfile
70
79
import itertools
71
80
import collections
 
81
import codecs
72
82
 
73
83
import dbus
74
84
import dbus.service
75
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
76
89
import avahi
77
90
from dbus.mainloop.glib import DBusGMainLoop
78
91
import ctypes
91
104
if sys.version_info.major == 2:
92
105
    str = unicode
93
106
 
94
 
version = "1.6.8"
 
107
version = "1.6.9"
95
108
stored_state_file = "clients.pickle"
96
109
 
97
110
logger = logging.getLogger()
98
111
syslogger = None
99
112
 
100
113
try:
101
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
102
 
                      (ctypes.util.find_library("c"))
103
 
                      .if_nametoindex)
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
104
116
except (OSError, AttributeError):
 
117
    
105
118
    def if_nametoindex(interface):
106
119
        "Get an interface index the hard way, i.e. using fcntl()"
107
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
116
129
    """init logger and add loglevel"""
117
130
    
118
131
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
123
135
    syslogger.setFormatter(logging.Formatter
124
136
                           ('Mandos [%(process)d]: %(levelname)s:'
125
137
                            ' %(message)s'))
142
154
 
143
155
class PGPEngine(object):
144
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
145
158
    def __init__(self):
146
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
160
        self.gnupgargs = ['--batch',
186
199
    
187
200
    def encrypt(self, data, password):
188
201
        passphrase = self.password_encode(password)
189
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
190
 
                                         ) as passfile:
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
191
204
            passfile.write(passphrase)
192
205
            passfile.flush()
193
206
            proc = subprocess.Popen(['gpg', '--symmetric',
204
217
    
205
218
    def decrypt(self, data, password):
206
219
        passphrase = self.password_encode(password)
207
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
208
 
                                         ) as passfile:
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
209
222
            passfile.write(passphrase)
210
223
            passfile.flush()
211
224
            proc = subprocess.Popen(['gpg', '--decrypt',
215
228
                                    stdin = subprocess.PIPE,
216
229
                                    stdout = subprocess.PIPE,
217
230
                                    stderr = subprocess.PIPE)
218
 
            decrypted_plaintext, err = proc.communicate(input
219
 
                                                        = data)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
220
232
        if proc.returncode != 0:
221
233
            raise PGPError(err)
222
234
        return decrypted_plaintext
228
240
        return super(AvahiError, self).__init__(value, *args,
229
241
                                                **kwargs)
230
242
 
 
243
 
231
244
class AvahiServiceError(AvahiError):
232
245
    pass
233
246
 
 
247
 
234
248
class AvahiGroupError(AvahiError):
235
249
    pass
236
250
 
256
270
    bus: dbus.SystemBus()
257
271
    """
258
272
    
259
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
 
                 servicetype = None, port = None, TXT = None,
261
 
                 domain = "", host = "", max_renames = 32768,
262
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
273
    def __init__(self,
 
274
                 interface = avahi.IF_UNSPEC,
 
275
                 name = None,
 
276
                 servicetype = None,
 
277
                 port = None,
 
278
                 TXT = None,
 
279
                 domain = "",
 
280
                 host = "",
 
281
                 max_renames = 32768,
 
282
                 protocol = avahi.PROTO_UNSPEC,
 
283
                 bus = None):
263
284
        self.interface = interface
264
285
        self.name = name
265
286
        self.type = servicetype
275
296
        self.bus = bus
276
297
        self.entry_group_state_changed_match = None
277
298
    
278
 
    def rename(self):
 
299
    def rename(self, remove=True):
279
300
        """Derived from the Avahi example code"""
280
301
        if self.rename_count >= self.max_renames:
281
302
            logger.critical("No suitable Zeroconf service name found"
282
303
                            " after %i retries, exiting.",
283
304
                            self.rename_count)
284
305
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
 
308
        self.rename_count += 1
287
309
        logger.info("Changing Zeroconf service name to %r ...",
288
310
                    self.name)
289
 
        self.remove()
 
311
        if remove:
 
312
            self.remove()
290
313
        try:
291
314
            self.add()
292
315
        except dbus.exceptions.DBusException as error:
293
 
            logger.critical("D-Bus Exception", exc_info=error)
294
 
            self.cleanup()
295
 
            os._exit(1)
296
 
        self.rename_count += 1
 
316
            if (error.get_dbus_name()
 
317
                == "org.freedesktop.Avahi.CollisionError"):
 
318
                logger.info("Local Zeroconf service name collision.")
 
319
                return self.rename(remove=False)
 
320
            else:
 
321
                logger.critical("D-Bus Exception", exc_info=error)
 
322
                self.cleanup()
 
323
                os._exit(1)
297
324
    
298
325
    def remove(self):
299
326
        """Derived from the Avahi example code"""
338
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
366
            logger.critical("Avahi: Error in group state changed %s",
340
367
                            str(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
342
 
                                  .format(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
343
369
    
344
370
    def cleanup(self):
345
371
        """Derived from the Avahi example code"""
355
381
    def server_state_changed(self, state, error=None):
356
382
        """Derived from the Avahi example code"""
357
383
        logger.debug("Avahi server state change: %i", state)
358
 
        bad_states = { avahi.SERVER_INVALID:
359
 
                           "Zeroconf server invalid",
360
 
                       avahi.SERVER_REGISTERING: None,
361
 
                       avahi.SERVER_COLLISION:
362
 
                           "Zeroconf server name collision",
363
 
                       avahi.SERVER_FAILURE:
364
 
                           "Zeroconf server failure" }
 
384
        bad_states = {
 
385
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
386
            avahi.SERVER_REGISTERING: None,
 
387
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
388
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
389
        }
365
390
        if state in bad_states:
366
391
            if bad_states[state] is not None:
367
392
                if error is None:
370
395
                    logger.error(bad_states[state] + ": %r", error)
371
396
            self.cleanup()
372
397
        elif state == avahi.SERVER_RUNNING:
373
 
            self.add()
 
398
            try:
 
399
                self.add()
 
400
            except dbus.exceptions.DBusException as error:
 
401
                if (error.get_dbus_name()
 
402
                    == "org.freedesktop.Avahi.CollisionError"):
 
403
                    logger.info("Local Zeroconf service name"
 
404
                                " collision.")
 
405
                    return self.rename(remove=False)
 
406
                else:
 
407
                    logger.critical("D-Bus Exception", exc_info=error)
 
408
                    self.cleanup()
 
409
                    os._exit(1)
374
410
        else:
375
411
            if error is None:
376
412
                logger.debug("Unknown state: %r", state)
386
422
                                    follow_name_owner_changes=True),
387
423
                avahi.DBUS_INTERFACE_SERVER)
388
424
        self.server.connect_to_signal("StateChanged",
389
 
                                 self.server_state_changed)
 
425
                                      self.server_state_changed)
390
426
        self.server_state_changed(self.server.GetState())
391
427
 
392
428
 
393
429
class AvahiServiceToSyslog(AvahiService):
394
 
    def rename(self):
 
430
    def rename(self, *args, **kwargs):
395
431
        """Add the new name to the syslog messages"""
396
 
        ret = AvahiService.rename(self)
397
 
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
399
 
                                ' %(levelname)s: %(message)s'
400
 
                                .format(self.name)))
 
432
        ret = AvahiService.rename(self, *args, **kwargs)
 
433
        syslogger.setFormatter(logging.Formatter(
 
434
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
435
            .format(self.name)))
401
436
        return ret
402
437
 
 
438
def call_pipe(connection,       # : multiprocessing.Connection
 
439
              func, *args, **kwargs):
 
440
    """This function is meant to be called by multiprocessing.Process
 
441
    
 
442
    This function runs func(*args, **kwargs), and writes the resulting
 
443
    return value on the provided multiprocessing.Connection.
 
444
    """
 
445
    connection.send(func(*args, **kwargs))
 
446
    connection.close()
403
447
 
404
448
class Client(object):
405
449
    """A representation of a client host served by this server.
432
476
    last_checker_status: integer between 0 and 255 reflecting exit
433
477
                         status of last checker. -1 reflects crashed
434
478
                         checker, -2 means no checker completed yet.
 
479
    last_checker_signal: The signal which killed the last checker, if
 
480
                         last_checker_status is -1
435
481
    last_enabled: datetime.datetime(); (UTC) or None
436
482
    name:       string; from the config file, used in log messages and
437
483
                        D-Bus identifiers
450
496
                          "fingerprint", "host", "interval",
451
497
                          "last_approval_request", "last_checked_ok",
452
498
                          "last_enabled", "name", "timeout")
453
 
    client_defaults = { "timeout": "PT5M",
454
 
                        "extended_timeout": "PT15M",
455
 
                        "interval": "PT2M",
456
 
                        "checker": "fping -q -- %%(host)s",
457
 
                        "host": "",
458
 
                        "approval_delay": "PT0S",
459
 
                        "approval_duration": "PT1S",
460
 
                        "approved_by_default": "True",
461
 
                        "enabled": "True",
462
 
                        }
 
499
    client_defaults = {
 
500
        "timeout": "PT5M",
 
501
        "extended_timeout": "PT15M",
 
502
        "interval": "PT2M",
 
503
        "checker": "fping -q -- %%(host)s",
 
504
        "host": "",
 
505
        "approval_delay": "PT0S",
 
506
        "approval_duration": "PT1S",
 
507
        "approved_by_default": "True",
 
508
        "enabled": "True",
 
509
    }
463
510
    
464
511
    @staticmethod
465
512
    def config_parser(config):
481
528
            client["enabled"] = config.getboolean(client_name,
482
529
                                                  "enabled")
483
530
            
 
531
            # Uppercase and remove spaces from fingerprint for later
 
532
            # comparison purposes with return value from the
 
533
            # fingerprint() function
484
534
            client["fingerprint"] = (section["fingerprint"].upper()
485
535
                                     .replace(" ", ""))
486
536
            if "secret" in section:
528
578
            self.expires = None
529
579
        
530
580
        logger.debug("Creating client %r", self.name)
531
 
        # Uppercase and remove spaces from fingerprint for later
532
 
        # comparison purposes with return value from the fingerprint()
533
 
        # function
534
581
        logger.debug("  Fingerprint: %s", self.fingerprint)
535
582
        self.created = settings.get("created",
536
583
                                    datetime.datetime.utcnow())
543
590
        self.current_checker_command = None
544
591
        self.approved = None
545
592
        self.approvals_pending = 0
546
 
        self.changedstate = (multiprocessing_manager
547
 
                             .Condition(multiprocessing_manager
548
 
                                        .Lock()))
549
 
        self.client_structure = [attr for attr in
550
 
                                 self.__dict__.iterkeys()
 
593
        self.changedstate = multiprocessing_manager.Condition(
 
594
            multiprocessing_manager.Lock())
 
595
        self.client_structure = [attr
 
596
                                 for attr in self.__dict__.iterkeys()
551
597
                                 if not attr.startswith("_")]
552
598
        self.client_structure.append("client_structure")
553
599
        
554
 
        for name, t in inspect.getmembers(type(self),
555
 
                                          lambda obj:
556
 
                                              isinstance(obj,
557
 
                                                         property)):
 
600
        for name, t in inspect.getmembers(
 
601
                type(self), lambda obj: isinstance(obj, property)):
558
602
            if not name.startswith("_"):
559
603
                self.client_structure.append(name)
560
604
    
602
646
        # and every interval from then on.
603
647
        if self.checker_initiator_tag is not None:
604
648
            gobject.source_remove(self.checker_initiator_tag)
605
 
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
608
 
                                       self.start_checker))
 
649
        self.checker_initiator_tag = gobject.timeout_add(
 
650
            int(self.interval.total_seconds() * 1000),
 
651
            self.start_checker)
609
652
        # Schedule a disable() when 'timeout' has passed
610
653
        if self.disable_initiator_tag is not None:
611
654
            gobject.source_remove(self.disable_initiator_tag)
612
 
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
655
        self.disable_initiator_tag = gobject.timeout_add(
 
656
            int(self.timeout.total_seconds() * 1000), self.disable)
616
657
        # Also start a new checker *right now*.
617
658
        self.start_checker()
618
659
    
619
 
    def checker_callback(self, pid, condition, command):
 
660
    def checker_callback(self, source, condition, connection,
 
661
                         command):
620
662
        """The checker has completed, so take appropriate actions."""
621
663
        self.checker_callback_tag = None
622
664
        self.checker = None
623
 
        if os.WIFEXITED(condition):
624
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
665
        # Read return code from connection (see call_pipe)
 
666
        returncode = connection.recv()
 
667
        connection.close()
 
668
        
 
669
        if returncode >= 0:
 
670
            self.last_checker_status = returncode
 
671
            self.last_checker_signal = None
625
672
            if self.last_checker_status == 0:
626
673
                logger.info("Checker for %(name)s succeeded",
627
674
                            vars(self))
628
675
                self.checked_ok()
629
676
            else:
630
 
                logger.info("Checker for %(name)s failed",
631
 
                            vars(self))
 
677
                logger.info("Checker for %(name)s failed", vars(self))
632
678
        else:
633
679
            self.last_checker_status = -1
 
680
            self.last_checker_signal = -returncode
634
681
            logger.warning("Checker for %(name)s crashed?",
635
682
                           vars(self))
 
683
        return False
636
684
    
637
685
    def checked_ok(self):
638
686
        """Assert that the client has been seen, alive and well."""
639
687
        self.last_checked_ok = datetime.datetime.utcnow()
640
688
        self.last_checker_status = 0
 
689
        self.last_checker_signal = None
641
690
        self.bump_timeout()
642
691
    
643
692
    def bump_timeout(self, timeout=None):
648
697
            gobject.source_remove(self.disable_initiator_tag)
649
698
            self.disable_initiator_tag = None
650
699
        if getattr(self, "enabled", False):
651
 
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
700
            self.disable_initiator_tag = gobject.timeout_add(
 
701
                int(timeout.total_seconds() * 1000), self.disable)
654
702
            self.expires = datetime.datetime.utcnow() + timeout
655
703
    
656
704
    def need_approval(self):
670
718
        # than 'timeout' for the client to be disabled, which is as it
671
719
        # should be.
672
720
        
673
 
        # If a checker exists, make sure it is not a zombie
674
 
        try:
675
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
 
        except AttributeError:
677
 
            pass
678
 
        except OSError as error:
679
 
            if error.errno != errno.ECHILD:
680
 
                raise
681
 
        else:
682
 
            if pid:
683
 
                logger.warning("Checker was a zombie")
684
 
                gobject.source_remove(self.checker_callback_tag)
685
 
                self.checker_callback(pid, status,
686
 
                                      self.current_checker_command)
 
721
        if self.checker is not None and not self.checker.is_alive():
 
722
            logger.warning("Checker was not alive; joining")
 
723
            self.checker.join()
 
724
            self.checker = None
687
725
        # Start a new checker if needed
688
726
        if self.checker is None:
689
727
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(str(getattr(self, attr)))
692
 
                              for attr in self.runtime_expansions }
 
728
            escaped_attrs = {
 
729
                attr: re.escape(str(getattr(self, attr)))
 
730
                for attr in self.runtime_expansions }
693
731
            try:
694
732
                command = self.checker_command % escaped_attrs
695
733
            except TypeError as error:
696
734
                logger.error('Could not format string "%s"',
697
 
                             self.checker_command, exc_info=error)
698
 
                return True # Try again later
 
735
                             self.checker_command,
 
736
                             exc_info=error)
 
737
                return True     # Try again later
699
738
            self.current_checker_command = command
700
 
            try:
701
 
                logger.info("Starting checker %r for %s",
702
 
                            command, self.name)
703
 
                # We don't need to redirect stdout and stderr, since
704
 
                # in normal mode, that is already done by daemon(),
705
 
                # and in debug mode we don't want to.  (Stdin is
706
 
                # always replaced by /dev/null.)
707
 
                # The exception is when not debugging but nevertheless
708
 
                # running in the foreground; use the previously
709
 
                # created wnull.
710
 
                popen_args = {}
711
 
                if (not self.server_settings["debug"]
712
 
                    and self.server_settings["foreground"]):
713
 
                    popen_args.update({"stdout": wnull,
714
 
                                       "stderr": wnull })
715
 
                self.checker = subprocess.Popen(command,
716
 
                                                close_fds=True,
717
 
                                                shell=True, cwd="/",
718
 
                                                **popen_args)
719
 
            except OSError as error:
720
 
                logger.error("Failed to start subprocess",
721
 
                             exc_info=error)
722
 
                return True
723
 
            self.checker_callback_tag = (gobject.child_watch_add
724
 
                                         (self.checker.pid,
725
 
                                          self.checker_callback,
726
 
                                          data=command))
727
 
            # The checker may have completed before the gobject
728
 
            # watch was added.  Check for this.
729
 
            try:
730
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
731
 
            except OSError as error:
732
 
                if error.errno == errno.ECHILD:
733
 
                    # This should never happen
734
 
                    logger.error("Child process vanished",
735
 
                                 exc_info=error)
736
 
                    return True
737
 
                raise
738
 
            if pid:
739
 
                gobject.source_remove(self.checker_callback_tag)
740
 
                self.checker_callback(pid, status, command)
 
739
            logger.info("Starting checker %r for %s", command,
 
740
                        self.name)
 
741
            # We don't need to redirect stdout and stderr, since
 
742
            # in normal mode, that is already done by daemon(),
 
743
            # and in debug mode we don't want to.  (Stdin is
 
744
            # always replaced by /dev/null.)
 
745
            # The exception is when not debugging but nevertheless
 
746
            # running in the foreground; use the previously
 
747
            # created wnull.
 
748
            popen_args = { "close_fds": True,
 
749
                           "shell": True,
 
750
                           "cwd": "/" }
 
751
            if (not self.server_settings["debug"]
 
752
                and self.server_settings["foreground"]):
 
753
                popen_args.update({"stdout": wnull,
 
754
                                   "stderr": wnull })
 
755
            pipe = multiprocessing.Pipe(duplex = False)
 
756
            self.checker = multiprocessing.Process(
 
757
                target = call_pipe,
 
758
                args = (pipe[1], subprocess.call, command),
 
759
                kwargs = popen_args)
 
760
            self.checker.start()
 
761
            self.checker_callback_tag = gobject.io_add_watch(
 
762
                pipe[0].fileno(), gobject.IO_IN,
 
763
                self.checker_callback, pipe[0], command)
741
764
        # Re-run this periodically if run by gobject.timeout_add
742
765
        return True
743
766
    
749
772
        if getattr(self, "checker", None) is None:
750
773
            return
751
774
        logger.debug("Stopping checker for %(name)s", vars(self))
752
 
        try:
753
 
            self.checker.terminate()
754
 
            #time.sleep(0.5)
755
 
            #if self.checker.poll() is None:
756
 
            #    self.checker.kill()
757
 
        except OSError as error:
758
 
            if error.errno != errno.ESRCH: # No such process
759
 
                raise
 
775
        self.checker.terminate()
760
776
        self.checker = None
761
777
 
762
778
 
763
 
def dbus_service_property(dbus_interface, signature="v",
764
 
                          access="readwrite", byte_arrays=False):
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
765
783
    """Decorators for marking methods of a DBusObjectWithProperties to
766
784
    become properties on the D-Bus.
767
785
    
777
795
    if byte_arrays and signature != "ay":
778
796
        raise ValueError("Byte arrays not supported for non-'ay'"
779
797
                         " signature {!r}".format(signature))
 
798
    
780
799
    def decorator(func):
781
800
        func._dbus_is_property = True
782
801
        func._dbus_interface = dbus_interface
787
806
            func._dbus_name = func._dbus_name[:-14]
788
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
789
808
        return func
 
809
    
790
810
    return decorator
791
811
 
792
812
 
801
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
802
822
                    "false"}
803
823
    """
 
824
    
804
825
    def decorator(func):
805
826
        func._dbus_is_interface = True
806
827
        func._dbus_interface = dbus_interface
807
828
        func._dbus_name = dbus_interface
808
829
        return func
 
830
    
809
831
    return decorator
810
832
 
811
833
 
813
835
    """Decorator to annotate D-Bus methods, signals or properties
814
836
    Usage:
815
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
816
841
    @dbus_service_property("org.example.Interface", signature="b",
817
842
                           access="r")
818
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
819
 
                        "org.freedesktop.DBus.Property."
820
 
                        "EmitsChangedSignal": "false"})
821
843
    def Property_dbus_property(self):
822
844
        return dbus.Boolean(False)
823
845
    """
 
846
    
824
847
    def decorator(func):
825
848
        func._dbus_annotations = annotations
826
849
        return func
 
850
    
827
851
    return decorator
828
852
 
829
853
 
832
856
    """
833
857
    pass
834
858
 
 
859
 
835
860
class DBusPropertyAccessException(DBusPropertyException):
836
861
    """A property's access permissions disallows an operation.
837
862
    """
865
890
    def _get_all_dbus_things(self, thing):
866
891
        """Returns a generator of (name, attribute) pairs
867
892
        """
868
 
        return ((getattr(athing.__get__(self), "_dbus_name",
869
 
                         name),
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
870
894
                 athing.__get__(self))
871
895
                for cls in self.__class__.__mro__
872
896
                for name, athing in
873
 
                inspect.getmembers(cls,
874
 
                                   self._is_dbus_thing(thing)))
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
875
898
    
876
899
    def _get_dbus_property(self, interface_name, property_name):
877
900
        """Returns a bound method if one exists which is a D-Bus
878
901
        property with the specified name and interface.
879
902
        """
880
 
        for cls in  self.__class__.__mro__:
881
 
            for name, value in (inspect.getmembers
882
 
                                (cls,
883
 
                                 self._is_dbus_thing("property"))):
 
903
        for cls in self.__class__.__mro__:
 
904
            for name, value in inspect.getmembers(
 
905
                    cls, self._is_dbus_thing("property")):
884
906
                if (value._dbus_name == property_name
885
907
                    and value._dbus_interface == interface_name):
886
908
                    return value.__get__(self)
887
909
        
888
910
        # No such property
889
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
 
                                   + interface_name + "."
891
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
892
913
    
893
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
894
916
                         out_signature="v")
895
917
    def Get(self, interface_name, property_name):
896
918
        """Standard D-Bus property Get() method, see D-Bus standard.
921
943
                                            for byte in value))
922
944
        prop(value)
923
945
    
924
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
925
948
                         out_signature="a{sv}")
926
949
    def GetAll(self, interface_name):
927
950
        """Standard D-Bus property GetAll() method, see D-Bus
942
965
            if not hasattr(value, "variant_level"):
943
966
                properties[name] = value
944
967
                continue
945
 
            properties[name] = type(value)(value, variant_level=
946
 
                                           value.variant_level+1)
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
947
970
        return dbus.Dictionary(properties, signature="sv")
948
971
    
 
972
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
973
    def PropertiesChanged(self, interface_name, changed_properties,
 
974
                          invalidated_properties):
 
975
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
976
        standard.
 
977
        """
 
978
        pass
 
979
    
949
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
950
981
                         out_signature="s",
951
982
                         path_keyword='object_path',
959
990
                                                   connection)
960
991
        try:
961
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
962
994
            def make_tag(document, name, prop):
963
995
                e = document.createElement("property")
964
996
                e.setAttribute("name", name)
965
997
                e.setAttribute("type", prop._dbus_signature)
966
998
                e.setAttribute("access", prop._dbus_access)
967
999
                return e
 
1000
            
968
1001
            for if_tag in document.getElementsByTagName("interface"):
969
1002
                # Add property tags
970
1003
                for tag in (make_tag(document, name, prop)
982
1015
                            if (name == tag.getAttribute("name")
983
1016
                                and prop._dbus_interface
984
1017
                                == if_tag.getAttribute("name")):
985
 
                                annots.update(getattr
986
 
                                              (prop,
987
 
                                               "_dbus_annotations",
988
 
                                               {}))
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
989
1020
                        for name, value in annots.items():
990
1021
                            ann_tag = document.createElement(
991
1022
                                "annotation")
996
1027
                for annotation, value in dict(
997
1028
                    itertools.chain.from_iterable(
998
1029
                        annotations().items()
999
 
                        for name, annotations in
1000
 
                        self._get_all_dbus_things("interface")
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
1001
1032
                        if name == if_tag.getAttribute("name")
1002
1033
                        )).items():
1003
1034
                    ann_tag = document.createElement("annotation")
1032
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1033
1064
    if dt is None:
1034
1065
        return dbus.String("", variant_level = variant_level)
1035
 
    return dbus.String(dt.isoformat(),
1036
 
                       variant_level=variant_level)
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1037
1067
 
1038
1068
 
1039
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1059
1089
    (from DBusObjectWithProperties) and interfaces (from the
1060
1090
    dbus_interface_annotations decorator).
1061
1091
    """
 
1092
    
1062
1093
    def wrapper(cls):
1063
1094
        for orig_interface_name, alt_interface_name in (
1064
 
            alt_interface_names.items()):
 
1095
                alt_interface_names.items()):
1065
1096
            attr = {}
1066
1097
            interface_names = set()
1067
1098
            # Go though all attributes of the class
1069
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
1070
1101
                # with the wrong interface name
1071
1102
                if (not hasattr(attribute, "_dbus_interface")
1072
 
                    or not attribute._dbus_interface
1073
 
                    .startswith(orig_interface_name)):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
1074
1105
                    continue
1075
1106
                # Create an alternate D-Bus interface name based on
1076
1107
                # the current name
1077
 
                alt_interface = (attribute._dbus_interface
1078
 
                                 .replace(orig_interface_name,
1079
 
                                          alt_interface_name))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
1080
1110
                interface_names.add(alt_interface)
1081
1111
                # Is this a D-Bus signal?
1082
1112
                if getattr(attribute, "_dbus_is_signal", False):
1083
 
                    # Extract the original non-method undecorated
1084
 
                    # function by black magic
1085
 
                    nonmethod_func = (dict(
 
1113
                    if sys.version_info.major == 2:
 
1114
                        # Extract the original non-method undecorated
 
1115
                        # function by black magic
 
1116
                        nonmethod_func = (dict(
1086
1117
                            zip(attribute.func_code.co_freevars,
1087
 
                                attribute.__closure__))["func"]
1088
 
                                      .cell_contents)
 
1118
                                attribute.__closure__))
 
1119
                                          ["func"].cell_contents)
 
1120
                    else:
 
1121
                        nonmethod_func = attribute
1089
1122
                    # Create a new, but exactly alike, function
1090
1123
                    # object, and decorate it to be a new D-Bus signal
1091
1124
                    # with the alternate D-Bus interface name
1092
 
                    new_function = (dbus.service.signal
1093
 
                                    (alt_interface,
1094
 
                                     attribute._dbus_signature)
1095
 
                                    (types.FunctionType(
1096
 
                                nonmethod_func.func_code,
1097
 
                                nonmethod_func.func_globals,
1098
 
                                nonmethod_func.func_name,
1099
 
                                nonmethod_func.func_defaults,
1100
 
                                nonmethod_func.func_closure)))
 
1125
                    if sys.version_info.major == 2:
 
1126
                        new_function = types.FunctionType(
 
1127
                            nonmethod_func.func_code,
 
1128
                            nonmethod_func.func_globals,
 
1129
                            nonmethod_func.func_name,
 
1130
                            nonmethod_func.func_defaults,
 
1131
                            nonmethod_func.func_closure)
 
1132
                    else:
 
1133
                        new_function = types.FunctionType(
 
1134
                            nonmethod_func.__code__,
 
1135
                            nonmethod_func.__globals__,
 
1136
                            nonmethod_func.__name__,
 
1137
                            nonmethod_func.__defaults__,
 
1138
                            nonmethod_func.__closure__)
 
1139
                    new_function = (dbus.service.signal(
 
1140
                        alt_interface,
 
1141
                        attribute._dbus_signature)(new_function))
1101
1142
                    # Copy annotations, if any
1102
1143
                    try:
1103
 
                        new_function._dbus_annotations = (
1104
 
                            dict(attribute._dbus_annotations))
 
1144
                        new_function._dbus_annotations = dict(
 
1145
                            attribute._dbus_annotations)
1105
1146
                    except AttributeError:
1106
1147
                        pass
1107
1148
                    # Define a creator of a function to call both the
1112
1153
                        """This function is a scope container to pass
1113
1154
                        func1 and func2 to the "call_both" function
1114
1155
                        outside of its arguments"""
 
1156
                        
1115
1157
                        def call_both(*args, **kwargs):
1116
1158
                            """This function will emit two D-Bus
1117
1159
                            signals by calling func1 and func2"""
1118
1160
                            func1(*args, **kwargs)
1119
1161
                            func2(*args, **kwargs)
 
1162
                        
1120
1163
                        return call_both
1121
1164
                    # Create the "call_both" function and add it to
1122
1165
                    # the class
1127
1170
                    # object.  Decorate it to be a new D-Bus method
1128
1171
                    # with the alternate D-Bus interface name.  Add it
1129
1172
                    # to the class.
1130
 
                    attr[attrname] = (dbus.service.method
1131
 
                                      (alt_interface,
1132
 
                                       attribute._dbus_in_signature,
1133
 
                                       attribute._dbus_out_signature)
1134
 
                                      (types.FunctionType
1135
 
                                       (attribute.func_code,
1136
 
                                        attribute.func_globals,
1137
 
                                        attribute.func_name,
1138
 
                                        attribute.func_defaults,
1139
 
                                        attribute.func_closure)))
 
1173
                    attr[attrname] = (
 
1174
                        dbus.service.method(
 
1175
                            alt_interface,
 
1176
                            attribute._dbus_in_signature,
 
1177
                            attribute._dbus_out_signature)
 
1178
                        (types.FunctionType(attribute.func_code,
 
1179
                                            attribute.func_globals,
 
1180
                                            attribute.func_name,
 
1181
                                            attribute.func_defaults,
 
1182
                                            attribute.func_closure)))
1140
1183
                    # Copy annotations, if any
1141
1184
                    try:
1142
 
                        attr[attrname]._dbus_annotations = (
1143
 
                            dict(attribute._dbus_annotations))
 
1185
                        attr[attrname]._dbus_annotations = dict(
 
1186
                            attribute._dbus_annotations)
1144
1187
                    except AttributeError:
1145
1188
                        pass
1146
1189
                # Is this a D-Bus property?
1149
1192
                    # object, and decorate it to be a new D-Bus
1150
1193
                    # property with the alternate D-Bus interface
1151
1194
                    # name.  Add it to the class.
1152
 
                    attr[attrname] = (dbus_service_property
1153
 
                                      (alt_interface,
1154
 
                                       attribute._dbus_signature,
1155
 
                                       attribute._dbus_access,
1156
 
                                       attribute
1157
 
                                       ._dbus_get_args_options
1158
 
                                       ["byte_arrays"])
1159
 
                                      (types.FunctionType
1160
 
                                       (attribute.func_code,
1161
 
                                        attribute.func_globals,
1162
 
                                        attribute.func_name,
1163
 
                                        attribute.func_defaults,
1164
 
                                        attribute.func_closure)))
 
1195
                    attr[attrname] = (dbus_service_property(
 
1196
                        alt_interface, attribute._dbus_signature,
 
1197
                        attribute._dbus_access,
 
1198
                        attribute._dbus_get_args_options
 
1199
                        ["byte_arrays"])
 
1200
                                      (types.FunctionType(
 
1201
                                          attribute.func_code,
 
1202
                                          attribute.func_globals,
 
1203
                                          attribute.func_name,
 
1204
                                          attribute.func_defaults,
 
1205
                                          attribute.func_closure)))
1165
1206
                    # Copy annotations, if any
1166
1207
                    try:
1167
 
                        attr[attrname]._dbus_annotations = (
1168
 
                            dict(attribute._dbus_annotations))
 
1208
                        attr[attrname]._dbus_annotations = dict(
 
1209
                            attribute._dbus_annotations)
1169
1210
                    except AttributeError:
1170
1211
                        pass
1171
1212
                # Is this a D-Bus interface?
1174
1215
                    # object.  Decorate it to be a new D-Bus interface
1175
1216
                    # with the alternate D-Bus interface name.  Add it
1176
1217
                    # to the class.
1177
 
                    attr[attrname] = (dbus_interface_annotations
1178
 
                                      (alt_interface)
1179
 
                                      (types.FunctionType
1180
 
                                       (attribute.func_code,
1181
 
                                        attribute.func_globals,
1182
 
                                        attribute.func_name,
1183
 
                                        attribute.func_defaults,
1184
 
                                        attribute.func_closure)))
 
1218
                    attr[attrname] = (
 
1219
                        dbus_interface_annotations(alt_interface)
 
1220
                        (types.FunctionType(attribute.func_code,
 
1221
                                            attribute.func_globals,
 
1222
                                            attribute.func_name,
 
1223
                                            attribute.func_defaults,
 
1224
                                            attribute.func_closure)))
1185
1225
            if deprecate:
1186
1226
                # Deprecate all alternate interfaces
1187
1227
                iname="_AlternateDBusNames_interface_annotation{}"
1188
1228
                for interface_name in interface_names:
 
1229
                    
1189
1230
                    @dbus_interface_annotations(interface_name)
1190
1231
                    def func(self):
1191
1232
                        return { "org.freedesktop.DBus.Deprecated":
1192
 
                                     "true" }
 
1233
                                 "true" }
1193
1234
                    # Find an unused name
1194
1235
                    for aname in (iname.format(i)
1195
1236
                                  for i in itertools.count()):
1200
1241
                # Replace the class with a new subclass of it with
1201
1242
                # methods, signals, etc. as created above.
1202
1243
                cls = type(b"{}Alternate".format(cls.__name__),
1203
 
                           (cls,), attr)
 
1244
                           (cls, ), attr)
1204
1245
        return cls
 
1246
    
1205
1247
    return wrapper
1206
1248
 
1207
1249
 
1208
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1209
 
                                "se.bsnet.fukt.Mandos"})
 
1251
                            "se.bsnet.fukt.Mandos"})
1210
1252
class ClientDBus(Client, DBusObjectWithProperties):
1211
1253
    """A Client class using D-Bus
1212
1254
    
1216
1258
    """
1217
1259
    
1218
1260
    runtime_expansions = (Client.runtime_expansions
1219
 
                          + ("dbus_object_path",))
 
1261
                          + ("dbus_object_path", ))
 
1262
    
 
1263
    _interface = "se.recompile.Mandos.Client"
1220
1264
    
1221
1265
    # dbus.service.Object doesn't use super(), so we can't either.
1222
1266
    
1228
1272
        client_object_name = str(self.name).translate(
1229
1273
            {ord("."): ord("_"),
1230
1274
             ord("-"): ord("_")})
1231
 
        self.dbus_object_path = (dbus.ObjectPath
1232
 
                                 ("/clients/" + client_object_name))
 
1275
        self.dbus_object_path = dbus.ObjectPath(
 
1276
            "/clients/" + client_object_name)
1233
1277
        DBusObjectWithProperties.__init__(self, self.bus,
1234
1278
                                          self.dbus_object_path)
1235
1279
    
1236
 
    def notifychangeproperty(transform_func,
1237
 
                             dbus_name, type_func=lambda x: x,
1238
 
                             variant_level=1):
 
1280
    def notifychangeproperty(transform_func, dbus_name,
 
1281
                             type_func=lambda x: x,
 
1282
                             variant_level=1,
 
1283
                             invalidate_only=False,
 
1284
                             _interface=_interface):
1239
1285
        """ Modify a variable so that it's a property which announces
1240
1286
        its changes to DBus.
1241
1287
        
1247
1293
        variant_level: D-Bus variant level.  Default: 1
1248
1294
        """
1249
1295
        attrname = "_{}".format(dbus_name)
 
1296
        
1250
1297
        def setter(self, value):
1251
1298
            if hasattr(self, "dbus_object_path"):
1252
1299
                if (not hasattr(self, attrname) or
1253
1300
                    type_func(getattr(self, attrname, None))
1254
1301
                    != type_func(value)):
1255
 
                    dbus_value = transform_func(type_func(value),
1256
 
                                                variant_level
1257
 
                                                =variant_level)
1258
 
                    self.PropertyChanged(dbus.String(dbus_name),
1259
 
                                         dbus_value)
 
1302
                    if invalidate_only:
 
1303
                        self.PropertiesChanged(
 
1304
                            _interface, dbus.Dictionary(),
 
1305
                            dbus.Array((dbus_name, )))
 
1306
                    else:
 
1307
                        dbus_value = transform_func(
 
1308
                            type_func(value),
 
1309
                            variant_level = variant_level)
 
1310
                        self.PropertyChanged(dbus.String(dbus_name),
 
1311
                                             dbus_value)
 
1312
                        self.PropertiesChanged(
 
1313
                            _interface,
 
1314
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1315
                                              dbus_value }),
 
1316
                            dbus.Array())
1260
1317
            setattr(self, attrname, value)
1261
1318
        
1262
1319
        return property(lambda self: getattr(self, attrname), setter)
1268
1325
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1269
1326
    last_enabled = notifychangeproperty(datetime_to_dbus,
1270
1327
                                        "LastEnabled")
1271
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1272
 
                                   type_func = lambda checker:
1273
 
                                       checker is not None)
 
1328
    checker = notifychangeproperty(
 
1329
        dbus.Boolean, "CheckerRunning",
 
1330
        type_func = lambda checker: checker is not None)
1274
1331
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1275
1332
                                           "LastCheckedOK")
1276
1333
    last_checker_status = notifychangeproperty(dbus.Int16,
1279
1336
        datetime_to_dbus, "LastApprovalRequest")
1280
1337
    approved_by_default = notifychangeproperty(dbus.Boolean,
1281
1338
                                               "ApprovedByDefault")
1282
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1283
 
                                          "ApprovalDelay",
1284
 
                                          type_func =
1285
 
                                          lambda td: td.total_seconds()
1286
 
                                          * 1000)
 
1339
    approval_delay = notifychangeproperty(
 
1340
        dbus.UInt64, "ApprovalDelay",
 
1341
        type_func = lambda td: td.total_seconds() * 1000)
1287
1342
    approval_duration = notifychangeproperty(
1288
1343
        dbus.UInt64, "ApprovalDuration",
1289
1344
        type_func = lambda td: td.total_seconds() * 1000)
1290
1345
    host = notifychangeproperty(dbus.String, "Host")
1291
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1292
 
                                   type_func = lambda td:
1293
 
                                       td.total_seconds() * 1000)
 
1346
    timeout = notifychangeproperty(
 
1347
        dbus.UInt64, "Timeout",
 
1348
        type_func = lambda td: td.total_seconds() * 1000)
1294
1349
    extended_timeout = notifychangeproperty(
1295
1350
        dbus.UInt64, "ExtendedTimeout",
1296
1351
        type_func = lambda td: td.total_seconds() * 1000)
1297
 
    interval = notifychangeproperty(dbus.UInt64,
1298
 
                                    "Interval",
1299
 
                                    type_func =
1300
 
                                    lambda td: td.total_seconds()
1301
 
                                    * 1000)
 
1352
    interval = notifychangeproperty(
 
1353
        dbus.UInt64, "Interval",
 
1354
        type_func = lambda td: td.total_seconds() * 1000)
1302
1355
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1356
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1357
                                  invalidate_only=True)
1303
1358
    
1304
1359
    del notifychangeproperty
1305
1360
    
1312
1367
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1313
1368
        Client.__del__(self, *args, **kwargs)
1314
1369
    
1315
 
    def checker_callback(self, pid, condition, command,
1316
 
                         *args, **kwargs):
1317
 
        self.checker_callback_tag = None
1318
 
        self.checker = None
1319
 
        if os.WIFEXITED(condition):
1320
 
            exitstatus = os.WEXITSTATUS(condition)
 
1370
    def checker_callback(self, source, condition,
 
1371
                         connection, command, *args, **kwargs):
 
1372
        ret = Client.checker_callback(self, source, condition,
 
1373
                                      connection, command, *args,
 
1374
                                      **kwargs)
 
1375
        exitstatus = self.last_checker_status
 
1376
        if exitstatus >= 0:
1321
1377
            # Emit D-Bus signal
1322
1378
            self.CheckerCompleted(dbus.Int16(exitstatus),
1323
 
                                  dbus.Int64(condition),
 
1379
                                  dbus.Int64(0),
1324
1380
                                  dbus.String(command))
1325
1381
        else:
1326
1382
            # Emit D-Bus signal
1327
1383
            self.CheckerCompleted(dbus.Int16(-1),
1328
 
                                  dbus.Int64(condition),
 
1384
                                  dbus.Int64(
 
1385
                                      self.last_checker_signal),
1329
1386
                                  dbus.String(command))
1330
 
        
1331
 
        return Client.checker_callback(self, pid, condition, command,
1332
 
                                       *args, **kwargs)
 
1387
        return ret
1333
1388
    
1334
1389
    def start_checker(self, *args, **kwargs):
1335
1390
        old_checker_pid = getattr(self.checker, "pid", None)
1352
1407
        self.send_changedstate()
1353
1408
    
1354
1409
    ## D-Bus methods, signals & properties
1355
 
    _interface = "se.recompile.Mandos.Client"
1356
1410
    
1357
1411
    ## Interfaces
1358
1412
    
1359
 
    @dbus_interface_annotations(_interface)
1360
 
    def _foo(self):
1361
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1362
 
                     "false"}
1363
 
    
1364
1413
    ## Signals
1365
1414
    
1366
1415
    # CheckerCompleted - signal
1376
1425
        pass
1377
1426
    
1378
1427
    # PropertyChanged - signal
 
1428
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
1429
    @dbus.service.signal(_interface, signature="sv")
1380
1430
    def PropertyChanged(self, property, value):
1381
1431
        "D-Bus signal"
1445
1495
        return dbus.Boolean(bool(self.approvals_pending))
1446
1496
    
1447
1497
    # ApprovedByDefault - property
1448
 
    @dbus_service_property(_interface, signature="b",
 
1498
    @dbus_service_property(_interface,
 
1499
                           signature="b",
1449
1500
                           access="readwrite")
1450
1501
    def ApprovedByDefault_dbus_property(self, value=None):
1451
1502
        if value is None:       # get
1453
1504
        self.approved_by_default = bool(value)
1454
1505
    
1455
1506
    # ApprovalDelay - property
1456
 
    @dbus_service_property(_interface, signature="t",
 
1507
    @dbus_service_property(_interface,
 
1508
                           signature="t",
1457
1509
                           access="readwrite")
1458
1510
    def ApprovalDelay_dbus_property(self, value=None):
1459
1511
        if value is None:       # get
1462
1514
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1463
1515
    
1464
1516
    # ApprovalDuration - property
1465
 
    @dbus_service_property(_interface, signature="t",
 
1517
    @dbus_service_property(_interface,
 
1518
                           signature="t",
1466
1519
                           access="readwrite")
1467
1520
    def ApprovalDuration_dbus_property(self, value=None):
1468
1521
        if value is None:       # get
1481
1534
        return dbus.String(self.fingerprint)
1482
1535
    
1483
1536
    # Host - property
1484
 
    @dbus_service_property(_interface, signature="s",
 
1537
    @dbus_service_property(_interface,
 
1538
                           signature="s",
1485
1539
                           access="readwrite")
1486
1540
    def Host_dbus_property(self, value=None):
1487
1541
        if value is None:       # get
1499
1553
        return datetime_to_dbus(self.last_enabled)
1500
1554
    
1501
1555
    # Enabled - property
1502
 
    @dbus_service_property(_interface, signature="b",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="b",
1503
1558
                           access="readwrite")
1504
1559
    def Enabled_dbus_property(self, value=None):
1505
1560
        if value is None:       # get
1510
1565
            self.disable()
1511
1566
    
1512
1567
    # LastCheckedOK - property
1513
 
    @dbus_service_property(_interface, signature="s",
 
1568
    @dbus_service_property(_interface,
 
1569
                           signature="s",
1514
1570
                           access="readwrite")
1515
1571
    def LastCheckedOK_dbus_property(self, value=None):
1516
1572
        if value is not None:
1519
1575
        return datetime_to_dbus(self.last_checked_ok)
1520
1576
    
1521
1577
    # LastCheckerStatus - property
1522
 
    @dbus_service_property(_interface, signature="n",
1523
 
                           access="read")
 
1578
    @dbus_service_property(_interface, signature="n", access="read")
1524
1579
    def LastCheckerStatus_dbus_property(self):
1525
1580
        return dbus.Int16(self.last_checker_status)
1526
1581
    
1535
1590
        return datetime_to_dbus(self.last_approval_request)
1536
1591
    
1537
1592
    # Timeout - property
1538
 
    @dbus_service_property(_interface, signature="t",
 
1593
    @dbus_service_property(_interface,
 
1594
                           signature="t",
1539
1595
                           access="readwrite")
1540
1596
    def Timeout_dbus_property(self, value=None):
1541
1597
        if value is None:       # get
1554
1610
                    is None):
1555
1611
                    return
1556
1612
                gobject.source_remove(self.disable_initiator_tag)
1557
 
                self.disable_initiator_tag = (
1558
 
                    gobject.timeout_add(
1559
 
                        int((self.expires - now).total_seconds()
1560
 
                            * 1000), self.disable))
 
1613
                self.disable_initiator_tag = gobject.timeout_add(
 
1614
                    int((self.expires - now).total_seconds() * 1000),
 
1615
                    self.disable)
1561
1616
    
1562
1617
    # ExtendedTimeout - property
1563
 
    @dbus_service_property(_interface, signature="t",
 
1618
    @dbus_service_property(_interface,
 
1619
                           signature="t",
1564
1620
                           access="readwrite")
1565
1621
    def ExtendedTimeout_dbus_property(self, value=None):
1566
1622
        if value is None:       # get
1569
1625
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1570
1626
    
1571
1627
    # Interval - property
1572
 
    @dbus_service_property(_interface, signature="t",
 
1628
    @dbus_service_property(_interface,
 
1629
                           signature="t",
1573
1630
                           access="readwrite")
1574
1631
    def Interval_dbus_property(self, value=None):
1575
1632
        if value is None:       # get
1580
1637
        if self.enabled:
1581
1638
            # Reschedule checker run
1582
1639
            gobject.source_remove(self.checker_initiator_tag)
1583
 
            self.checker_initiator_tag = (gobject.timeout_add
1584
 
                                          (value, self.start_checker))
1585
 
            self.start_checker()    # Start one now, too
 
1640
            self.checker_initiator_tag = gobject.timeout_add(
 
1641
                value, self.start_checker)
 
1642
            self.start_checker() # Start one now, too
1586
1643
    
1587
1644
    # Checker - property
1588
 
    @dbus_service_property(_interface, signature="s",
 
1645
    @dbus_service_property(_interface,
 
1646
                           signature="s",
1589
1647
                           access="readwrite")
1590
1648
    def Checker_dbus_property(self, value=None):
1591
1649
        if value is None:       # get
1593
1651
        self.checker_command = str(value)
1594
1652
    
1595
1653
    # CheckerRunning - property
1596
 
    @dbus_service_property(_interface, signature="b",
 
1654
    @dbus_service_property(_interface,
 
1655
                           signature="b",
1597
1656
                           access="readwrite")
1598
1657
    def CheckerRunning_dbus_property(self, value=None):
1599
1658
        if value is None:       # get
1609
1668
        return self.dbus_object_path # is already a dbus.ObjectPath
1610
1669
    
1611
1670
    # Secret = property
1612
 
    @dbus_service_property(_interface, signature="ay",
1613
 
                           access="write", byte_arrays=True)
 
1671
    @dbus_service_property(_interface,
 
1672
                           signature="ay",
 
1673
                           access="write",
 
1674
                           byte_arrays=True)
1614
1675
    def Secret_dbus_property(self, value):
1615
1676
        self.secret = bytes(value)
1616
1677
    
1622
1683
        self._pipe = child_pipe
1623
1684
        self._pipe.send(('init', fpr, address))
1624
1685
        if not self._pipe.recv():
1625
 
            raise KeyError()
 
1686
            raise KeyError(fpr)
1626
1687
    
1627
1688
    def __getattribute__(self, name):
1628
1689
        if name == '_pipe':
1632
1693
        if data[0] == 'data':
1633
1694
            return data[1]
1634
1695
        if data[0] == 'function':
 
1696
            
1635
1697
            def func(*args, **kwargs):
1636
1698
                self._pipe.send(('funcall', name, args, kwargs))
1637
1699
                return self._pipe.recv()[1]
 
1700
            
1638
1701
            return func
1639
1702
    
1640
1703
    def __setattr__(self, name, value):
1656
1719
            logger.debug("Pipe FD: %d",
1657
1720
                         self.server.child_pipe.fileno())
1658
1721
            
1659
 
            session = (gnutls.connection
1660
 
                       .ClientSession(self.request,
1661
 
                                      gnutls.connection
1662
 
                                      .X509Credentials()))
 
1722
            session = gnutls.connection.ClientSession(
 
1723
                self.request, gnutls.connection .X509Credentials())
1663
1724
            
1664
1725
            # Note: gnutls.connection.X509Credentials is really a
1665
1726
            # generic GnuTLS certificate credentials object so long as
1674
1735
            priority = self.server.gnutls_priority
1675
1736
            if priority is None:
1676
1737
                priority = "NORMAL"
1677
 
            (gnutls.library.functions
1678
 
             .gnutls_priority_set_direct(session._c_object,
1679
 
                                         priority, None))
 
1738
            gnutls.library.functions.gnutls_priority_set_direct(
 
1739
                session._c_object, priority, None)
1680
1740
            
1681
1741
            # Start communication using the Mandos protocol
1682
1742
            # Get protocol number
1702
1762
            approval_required = False
1703
1763
            try:
1704
1764
                try:
1705
 
                    fpr = self.fingerprint(self.peer_certificate
1706
 
                                           (session))
 
1765
                    fpr = self.fingerprint(
 
1766
                        self.peer_certificate(session))
1707
1767
                except (TypeError,
1708
1768
                        gnutls.errors.GNUTLSError) as error:
1709
1769
                    logger.warning("Bad certificate: %s", error)
1724
1784
                while True:
1725
1785
                    if not client.enabled:
1726
1786
                        logger.info("Client %s is disabled",
1727
 
                                       client.name)
 
1787
                                    client.name)
1728
1788
                        if self.server.use_dbus:
1729
1789
                            # Emit D-Bus signal
1730
1790
                            client.Rejected("Disabled")
1777
1837
                        logger.warning("gnutls send failed",
1778
1838
                                       exc_info=error)
1779
1839
                        return
1780
 
                    logger.debug("Sent: %d, remaining: %d",
1781
 
                                 sent, len(client.secret)
1782
 
                                 - (sent_size + sent))
 
1840
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1841
                                 len(client.secret) - (sent_size
 
1842
                                                       + sent))
1783
1843
                    sent_size += sent
1784
1844
                
1785
1845
                logger.info("Sending secret to %s", client.name)
1802
1862
    def peer_certificate(session):
1803
1863
        "Return the peer's OpenPGP certificate as a bytestring"
1804
1864
        # If not an OpenPGP certificate...
1805
 
        if (gnutls.library.functions
1806
 
            .gnutls_certificate_type_get(session._c_object)
 
1865
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1866
                session._c_object)
1807
1867
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1808
1868
            # ...do the normal thing
1809
1869
            return session.peer_certificate
1823
1883
    def fingerprint(openpgp):
1824
1884
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1825
1885
        # New GnuTLS "datum" with the OpenPGP public key
1826
 
        datum = (gnutls.library.types
1827
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1828
 
                                             ctypes.POINTER
1829
 
                                             (ctypes.c_ubyte)),
1830
 
                                 ctypes.c_uint(len(openpgp))))
 
1886
        datum = gnutls.library.types.gnutls_datum_t(
 
1887
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1888
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1889
            ctypes.c_uint(len(openpgp)))
1831
1890
        # New empty GnuTLS certificate
1832
1891
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1833
 
        (gnutls.library.functions
1834
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1892
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1893
            ctypes.byref(crt))
1835
1894
        # Import the OpenPGP public key into the certificate
1836
 
        (gnutls.library.functions
1837
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1838
 
                                    gnutls.library.constants
1839
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1895
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1896
            crt, ctypes.byref(datum),
 
1897
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1840
1898
        # Verify the self signature in the key
1841
1899
        crtverify = ctypes.c_uint()
1842
 
        (gnutls.library.functions
1843
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1844
 
                                         ctypes.byref(crtverify)))
 
1900
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1901
            crt, 0, ctypes.byref(crtverify))
1845
1902
        if crtverify.value != 0:
1846
1903
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1847
 
            raise (gnutls.errors.CertificateSecurityError
1848
 
                   ("Verify failed"))
 
1904
            raise gnutls.errors.CertificateSecurityError(
 
1905
                "Verify failed")
1849
1906
        # New buffer for the fingerprint
1850
1907
        buf = ctypes.create_string_buffer(20)
1851
1908
        buf_len = ctypes.c_size_t()
1852
1909
        # Get the fingerprint from the certificate into the buffer
1853
 
        (gnutls.library.functions
1854
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1855
 
                                             ctypes.byref(buf_len)))
 
1910
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1911
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1856
1912
        # Deinit the certificate
1857
1913
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1858
1914
        # Convert the buffer to a Python bytestring
1864
1920
 
1865
1921
class MultiprocessingMixIn(object):
1866
1922
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1923
    
1867
1924
    def sub_process_main(self, request, address):
1868
1925
        try:
1869
1926
            self.finish_request(request, address)
1881
1938
 
1882
1939
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1883
1940
    """ adds a pipe to the MixIn """
 
1941
    
1884
1942
    def process_request(self, request, client_address):
1885
1943
        """Overrides and wraps the original process_request().
1886
1944
        
1907
1965
        interface:      None or a network interface name (string)
1908
1966
        use_ipv6:       Boolean; to use IPv6 or not
1909
1967
    """
 
1968
    
1910
1969
    def __init__(self, server_address, RequestHandlerClass,
1911
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1970
                 interface=None,
 
1971
                 use_ipv6=True,
 
1972
                 socketfd=None):
1912
1973
        """If socketfd is set, use that file descriptor instead of
1913
1974
        creating a new one with socket.socket().
1914
1975
        """
1955
2016
                             self.interface)
1956
2017
            else:
1957
2018
                try:
1958
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1959
 
                                           SO_BINDTODEVICE,
1960
 
                                           (self.interface + "\0")
1961
 
                                           .encode("utf-8"))
 
2019
                    self.socket.setsockopt(
 
2020
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2021
                        (self.interface + "\0").encode("utf-8"))
1962
2022
                except socket.error as error:
1963
2023
                    if error.errno == errno.EPERM:
1964
2024
                        logger.error("No permission to bind to"
1982
2042
                self.server_address = (any_address,
1983
2043
                                       self.server_address[1])
1984
2044
            elif not self.server_address[1]:
1985
 
                self.server_address = (self.server_address[0],
1986
 
                                       0)
 
2045
                self.server_address = (self.server_address[0], 0)
1987
2046
#                 if self.interface:
1988
2047
#                     self.server_address = (self.server_address[0],
1989
2048
#                                            0, # port
2003
2062
    
2004
2063
    Assumes a gobject.MainLoop event loop.
2005
2064
    """
 
2065
    
2006
2066
    def __init__(self, server_address, RequestHandlerClass,
2007
 
                 interface=None, use_ipv6=True, clients=None,
2008
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2067
                 interface=None,
 
2068
                 use_ipv6=True,
 
2069
                 clients=None,
 
2070
                 gnutls_priority=None,
 
2071
                 use_dbus=True,
 
2072
                 socketfd=None):
2009
2073
        self.enabled = False
2010
2074
        self.clients = clients
2011
2075
        if self.clients is None:
2017
2081
                                interface = interface,
2018
2082
                                use_ipv6 = use_ipv6,
2019
2083
                                socketfd = socketfd)
 
2084
    
2020
2085
    def server_activate(self):
2021
2086
        if self.enabled:
2022
2087
            return socketserver.TCPServer.server_activate(self)
2026
2091
    
2027
2092
    def add_pipe(self, parent_pipe, proc):
2028
2093
        # Call "handle_ipc" for both data and EOF events
2029
 
        gobject.io_add_watch(parent_pipe.fileno(),
2030
 
                             gobject.IO_IN | gobject.IO_HUP,
2031
 
                             functools.partial(self.handle_ipc,
2032
 
                                               parent_pipe =
2033
 
                                               parent_pipe,
2034
 
                                               proc = proc))
 
2094
        gobject.io_add_watch(
 
2095
            parent_pipe.fileno(),
 
2096
            gobject.IO_IN | gobject.IO_HUP,
 
2097
            functools.partial(self.handle_ipc,
 
2098
                              parent_pipe = parent_pipe,
 
2099
                              proc = proc))
2035
2100
    
2036
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2037
 
                   proc = None, client_object=None):
 
2101
    def handle_ipc(self, source, condition,
 
2102
                   parent_pipe=None,
 
2103
                   proc = None,
 
2104
                   client_object=None):
2038
2105
        # error, or the other end of multiprocessing.Pipe has closed
2039
2106
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2040
2107
            # Wait for other process to exit
2063
2130
                parent_pipe.send(False)
2064
2131
                return False
2065
2132
            
2066
 
            gobject.io_add_watch(parent_pipe.fileno(),
2067
 
                                 gobject.IO_IN | gobject.IO_HUP,
2068
 
                                 functools.partial(self.handle_ipc,
2069
 
                                                   parent_pipe =
2070
 
                                                   parent_pipe,
2071
 
                                                   proc = proc,
2072
 
                                                   client_object =
2073
 
                                                   client))
 
2133
            gobject.io_add_watch(
 
2134
                parent_pipe.fileno(),
 
2135
                gobject.IO_IN | gobject.IO_HUP,
 
2136
                functools.partial(self.handle_ipc,
 
2137
                                  parent_pipe = parent_pipe,
 
2138
                                  proc = proc,
 
2139
                                  client_object = client))
2074
2140
            parent_pipe.send(True)
2075
2141
            # remove the old hook in favor of the new above hook on
2076
2142
            # same fileno
2082
2148
            
2083
2149
            parent_pipe.send(('data', getattr(client_object,
2084
2150
                                              funcname)(*args,
2085
 
                                                         **kwargs)))
 
2151
                                                        **kwargs)))
2086
2152
        
2087
2153
        if command == 'getattr':
2088
2154
            attrname = request[1]
2089
 
            if callable(client_object.__getattribute__(attrname)):
2090
 
                parent_pipe.send(('function',))
 
2155
            if isinstance(client_object.__getattribute__(attrname),
 
2156
                          collections.Callable):
 
2157
                parent_pipe.send(('function', ))
2091
2158
            else:
2092
 
                parent_pipe.send(('data', client_object
2093
 
                                  .__getattribute__(attrname)))
 
2159
                parent_pipe.send((
 
2160
                    'data', client_object.__getattribute__(attrname)))
2094
2161
        
2095
2162
        if command == 'setattr':
2096
2163
            attrname = request[1]
2127
2194
    # avoid excessive use of external libraries.
2128
2195
    
2129
2196
    # New type for defining tokens, syntax, and semantics all-in-one
2130
 
    Token = collections.namedtuple("Token",
2131
 
                                   ("regexp", # To match token; if
2132
 
                                              # "value" is not None,
2133
 
                                              # must have a "group"
2134
 
                                              # containing digits
2135
 
                                    "value",  # datetime.timedelta or
2136
 
                                              # None
2137
 
                                    "followers")) # Tokens valid after
2138
 
                                                  # this token
 
2197
    Token = collections.namedtuple("Token", (
 
2198
        "regexp",  # To match token; if "value" is not None, must have
 
2199
                   # a "group" containing digits
 
2200
        "value",   # datetime.timedelta or None
 
2201
        "followers"))           # Tokens valid after this token
2139
2202
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2140
2203
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2141
2204
    token_end = Token(re.compile(r"$"), None, frozenset())
2142
2205
    token_second = Token(re.compile(r"(\d+)S"),
2143
2206
                         datetime.timedelta(seconds=1),
2144
 
                         frozenset((token_end,)))
 
2207
                         frozenset((token_end, )))
2145
2208
    token_minute = Token(re.compile(r"(\d+)M"),
2146
2209
                         datetime.timedelta(minutes=1),
2147
2210
                         frozenset((token_second, token_end)))
2163
2226
                       frozenset((token_month, token_end)))
2164
2227
    token_week = Token(re.compile(r"(\d+)W"),
2165
2228
                       datetime.timedelta(weeks=1),
2166
 
                       frozenset((token_end,)))
 
2229
                       frozenset((token_end, )))
2167
2230
    token_duration = Token(re.compile(r"P"), None,
2168
2231
                           frozenset((token_year, token_month,
2169
2232
                                      token_day, token_time,
2171
2234
    # Define starting values
2172
2235
    value = datetime.timedelta() # Value so far
2173
2236
    found_token = None
2174
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2237
    followers = frozenset((token_duration, )) # Following valid tokens
2175
2238
    s = duration                # String left to parse
2176
2239
    # Loop until end token is found
2177
2240
    while found_token is not token_end:
2194
2257
                break
2195
2258
        else:
2196
2259
            # No currently valid tokens were found
2197
 
            raise ValueError("Invalid RFC 3339 duration")
 
2260
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2261
                             .format(duration))
2198
2262
    # End token found
2199
2263
    return value
2200
2264
 
2237
2301
            elif suffix == "w":
2238
2302
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
2303
            else:
2240
 
                raise ValueError("Unknown suffix {!r}"
2241
 
                                 .format(suffix))
 
2304
                raise ValueError("Unknown suffix {!r}".format(suffix))
2242
2305
        except IndexError as e:
2243
2306
            raise ValueError(*(e.args))
2244
2307
        timevalue += delta
2260
2323
        # Close all standard open file descriptors
2261
2324
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2262
2325
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2326
            raise OSError(errno.ENODEV,
 
2327
                          "{} not a character device"
2264
2328
                          .format(os.devnull))
2265
2329
        os.dup2(null, sys.stdin.fileno())
2266
2330
        os.dup2(null, sys.stdout.fileno())
2332
2396
                        "port": "",
2333
2397
                        "debug": "False",
2334
2398
                        "priority":
2335
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2399
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2400
                        ":+SIGN-DSA-SHA256",
2336
2401
                        "servicename": "Mandos",
2337
2402
                        "use_dbus": "True",
2338
2403
                        "use_ipv6": "True",
2342
2407
                        "statedir": "/var/lib/mandos",
2343
2408
                        "foreground": "False",
2344
2409
                        "zeroconf": "True",
2345
 
                        }
 
2410
                    }
2346
2411
    
2347
2412
    # Parse config file for server-global settings
2348
2413
    server_config = configparser.SafeConfigParser(server_defaults)
2349
2414
    del server_defaults
2350
 
    server_config.read(os.path.join(options.configdir,
2351
 
                                    "mandos.conf"))
 
2415
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2352
2416
    # Convert the SafeConfigParser object to a dict
2353
2417
    server_settings = server_config.defaults()
2354
2418
    # Use the appropriate methods on the non-string config options
2372
2436
    # Override the settings from the config file with command line
2373
2437
    # options, if set.
2374
2438
    for option in ("interface", "address", "port", "debug",
2375
 
                   "priority", "servicename", "configdir",
2376
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2377
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2439
                   "priority", "servicename", "configdir", "use_dbus",
 
2440
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2441
                   "socket", "foreground", "zeroconf"):
2378
2442
        value = getattr(options, option)
2379
2443
        if value is not None:
2380
2444
            server_settings[option] = value
2395
2459
    
2396
2460
    ##################################################################
2397
2461
    
2398
 
    if (not server_settings["zeroconf"] and
2399
 
        not (server_settings["port"]
2400
 
             or server_settings["socket"] != "")):
2401
 
            parser.error("Needs port or socket to work without"
2402
 
                         " Zeroconf")
 
2462
    if (not server_settings["zeroconf"]
 
2463
        and not (server_settings["port"]
 
2464
                 or server_settings["socket"] != "")):
 
2465
        parser.error("Needs port or socket to work without Zeroconf")
2403
2466
    
2404
2467
    # For convenience
2405
2468
    debug = server_settings["debug"]
2421
2484
            initlogger(debug, level)
2422
2485
    
2423
2486
    if server_settings["servicename"] != "Mandos":
2424
 
        syslogger.setFormatter(logging.Formatter
2425
 
                               ('Mandos ({}) [%(process)d]:'
2426
 
                                ' %(levelname)s: %(message)s'
2427
 
                                .format(server_settings
2428
 
                                        ["servicename"])))
 
2487
        syslogger.setFormatter(
 
2488
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2489
                              ' %(levelname)s: %(message)s'.format(
 
2490
                                  server_settings["servicename"])))
2429
2491
    
2430
2492
    # Parse config file with clients
2431
2493
    client_config = configparser.SafeConfigParser(Client
2439
2501
    socketfd = None
2440
2502
    if server_settings["socket"] != "":
2441
2503
        socketfd = server_settings["socket"]
2442
 
    tcp_server = MandosServer((server_settings["address"],
2443
 
                               server_settings["port"]),
2444
 
                              ClientHandler,
2445
 
                              interface=(server_settings["interface"]
2446
 
                                         or None),
2447
 
                              use_ipv6=use_ipv6,
2448
 
                              gnutls_priority=
2449
 
                              server_settings["priority"],
2450
 
                              use_dbus=use_dbus,
2451
 
                              socketfd=socketfd)
 
2504
    tcp_server = MandosServer(
 
2505
        (server_settings["address"], server_settings["port"]),
 
2506
        ClientHandler,
 
2507
        interface=(server_settings["interface"] or None),
 
2508
        use_ipv6=use_ipv6,
 
2509
        gnutls_priority=server_settings["priority"],
 
2510
        use_dbus=use_dbus,
 
2511
        socketfd=socketfd)
2452
2512
    if not foreground:
2453
2513
        pidfilename = "/run/mandos.pid"
2454
2514
        if not os.path.isdir("/run/."):
2455
2515
            pidfilename = "/var/run/mandos.pid"
2456
2516
        pidfile = None
2457
2517
        try:
2458
 
            pidfile = open(pidfilename, "w")
 
2518
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2459
2519
        except IOError as e:
2460
2520
            logger.error("Could not open file %r", pidfilename,
2461
2521
                         exc_info=e)
2488
2548
        def debug_gnutls(level, string):
2489
2549
            logger.debug("GnuTLS: %s", string[:-1])
2490
2550
        
2491
 
        (gnutls.library.functions
2492
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2551
        gnutls.library.functions.gnutls_global_set_log_function(
 
2552
            debug_gnutls)
2493
2553
        
2494
2554
        # Redirect stdin so all checkers get /dev/null
2495
2555
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2515
2575
    if use_dbus:
2516
2576
        try:
2517
2577
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2518
 
                                            bus, do_not_queue=True)
2519
 
            old_bus_name = (dbus.service.BusName
2520
 
                            ("se.bsnet.fukt.Mandos", bus,
2521
 
                             do_not_queue=True))
2522
 
        except dbus.exceptions.NameExistsException as e:
 
2578
                                            bus,
 
2579
                                            do_not_queue=True)
 
2580
            old_bus_name = dbus.service.BusName(
 
2581
                "se.bsnet.fukt.Mandos", bus,
 
2582
                do_not_queue=True)
 
2583
        except dbus.exceptions.DBusException as e:
2523
2584
            logger.error("Disabling D-Bus:", exc_info=e)
2524
2585
            use_dbus = False
2525
2586
            server_settings["use_dbus"] = False
2526
2587
            tcp_server.use_dbus = False
2527
2588
    if zeroconf:
2528
2589
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2529
 
        service = AvahiServiceToSyslog(name =
2530
 
                                       server_settings["servicename"],
2531
 
                                       servicetype = "_mandos._tcp",
2532
 
                                       protocol = protocol, bus = bus)
 
2590
        service = AvahiServiceToSyslog(
 
2591
            name = server_settings["servicename"],
 
2592
            servicetype = "_mandos._tcp",
 
2593
            protocol = protocol,
 
2594
            bus = bus)
2533
2595
        if server_settings["interface"]:
2534
 
            service.interface = (if_nametoindex
2535
 
                                 (server_settings["interface"]
2536
 
                                  .encode("utf-8")))
 
2596
            service.interface = if_nametoindex(
 
2597
                server_settings["interface"].encode("utf-8"))
2537
2598
    
2538
2599
    global multiprocessing_manager
2539
2600
    multiprocessing_manager = multiprocessing.Manager()
2558
2619
    if server_settings["restore"]:
2559
2620
        try:
2560
2621
            with open(stored_state_path, "rb") as stored_state:
2561
 
                clients_data, old_client_settings = (pickle.load
2562
 
                                                     (stored_state))
 
2622
                clients_data, old_client_settings = pickle.load(
 
2623
                    stored_state)
2563
2624
            os.remove(stored_state_path)
2564
2625
        except IOError as e:
2565
2626
            if e.errno == errno.ENOENT:
2566
 
                logger.warning("Could not load persistent state: {}"
2567
 
                                .format(os.strerror(e.errno)))
 
2627
                logger.warning("Could not load persistent state:"
 
2628
                               " {}".format(os.strerror(e.errno)))
2568
2629
            else:
2569
2630
                logger.critical("Could not load persistent state:",
2570
2631
                                exc_info=e)
2571
2632
                raise
2572
2633
        except EOFError as e:
2573
2634
            logger.warning("Could not load persistent state: "
2574
 
                           "EOFError:", exc_info=e)
 
2635
                           "EOFError:",
 
2636
                           exc_info=e)
2575
2637
    
2576
2638
    with PGPEngine() as pgp:
2577
2639
        for client_name, client in clients_data.items():
2589
2651
                    # For each value in new config, check if it
2590
2652
                    # differs from the old config value (Except for
2591
2653
                    # the "secret" attribute)
2592
 
                    if (name != "secret" and
2593
 
                        value != old_client_settings[client_name]
2594
 
                        [name]):
 
2654
                    if (name != "secret"
 
2655
                        and (value !=
 
2656
                             old_client_settings[client_name][name])):
2595
2657
                        client[name] = value
2596
2658
                except KeyError:
2597
2659
                    pass
2598
2660
            
2599
2661
            # Clients who has passed its expire date can still be
2600
 
            # enabled if its last checker was successful.  Clients
 
2662
            # enabled if its last checker was successful.  A Client
2601
2663
            # whose checker succeeded before we stored its state is
2602
2664
            # assumed to have successfully run all checkers during
2603
2665
            # downtime.
2606
2668
                    if not client["last_checked_ok"]:
2607
2669
                        logger.warning(
2608
2670
                            "disabling client {} - Client never "
2609
 
                            "performed a successful checker"
2610
 
                            .format(client_name))
 
2671
                            "performed a successful checker".format(
 
2672
                                client_name))
2611
2673
                        client["enabled"] = False
2612
2674
                    elif client["last_checker_status"] != 0:
2613
2675
                        logger.warning(
2614
2676
                            "disabling client {} - Client last"
2615
 
                            " checker failed with error code {}"
2616
 
                            .format(client_name,
2617
 
                                    client["last_checker_status"]))
 
2677
                            " checker failed with error code"
 
2678
                            " {}".format(
 
2679
                                client_name,
 
2680
                                client["last_checker_status"]))
2618
2681
                        client["enabled"] = False
2619
2682
                    else:
2620
 
                        client["expires"] = (datetime.datetime
2621
 
                                             .utcnow()
2622
 
                                             + client["timeout"])
 
2683
                        client["expires"] = (
 
2684
                            datetime.datetime.utcnow()
 
2685
                            + client["timeout"])
2623
2686
                        logger.debug("Last checker succeeded,"
2624
 
                                     " keeping {} enabled"
2625
 
                                     .format(client_name))
 
2687
                                     " keeping {} enabled".format(
 
2688
                                         client_name))
2626
2689
            try:
2627
 
                client["secret"] = (
2628
 
                    pgp.decrypt(client["encrypted_secret"],
2629
 
                                client_settings[client_name]
2630
 
                                ["secret"]))
 
2690
                client["secret"] = pgp.decrypt(
 
2691
                    client["encrypted_secret"],
 
2692
                    client_settings[client_name]["secret"])
2631
2693
            except PGPError:
2632
2694
                # If decryption fails, we use secret from new settings
2633
 
                logger.debug("Failed to decrypt {} old secret"
2634
 
                             .format(client_name))
2635
 
                client["secret"] = (
2636
 
                    client_settings[client_name]["secret"])
 
2695
                logger.debug("Failed to decrypt {} old secret".format(
 
2696
                    client_name))
 
2697
                client["secret"] = (client_settings[client_name]
 
2698
                                    ["secret"])
2637
2699
    
2638
2700
    # Add/remove clients based on new changes made to config
2639
2701
    for client_name in (set(old_client_settings)
2646
2708
    # Create all client objects
2647
2709
    for client_name, client in clients_data.items():
2648
2710
        tcp_server.clients[client_name] = client_class(
2649
 
            name = client_name, settings = client,
 
2711
            name = client_name,
 
2712
            settings = client,
2650
2713
            server_settings = server_settings)
2651
2714
    
2652
2715
    if not tcp_server.clients:
2654
2717
    
2655
2718
    if not foreground:
2656
2719
        if pidfile is not None:
 
2720
            pid = os.getpid()
2657
2721
            try:
2658
2722
                with pidfile:
2659
 
                    pid = os.getpid()
2660
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2723
                    print(pid, file=pidfile)
2661
2724
            except IOError:
2662
2725
                logger.error("Could not write to file %r with PID %d",
2663
2726
                             pidfilename, pid)
2668
2731
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2669
2732
    
2670
2733
    if use_dbus:
2671
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2672
 
                                        "se.bsnet.fukt.Mandos"})
 
2734
        
 
2735
        @alternate_dbus_interfaces(
 
2736
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2673
2737
        class MandosDBusService(DBusObjectWithProperties):
2674
2738
            """A D-Bus proxy object"""
 
2739
            
2675
2740
            def __init__(self):
2676
2741
                dbus.service.Object.__init__(self, bus, "/")
 
2742
            
2677
2743
            _interface = "se.recompile.Mandos"
2678
2744
            
2679
2745
            @dbus_interface_annotations(_interface)
2680
2746
            def _foo(self):
2681
 
                return { "org.freedesktop.DBus.Property"
2682
 
                         ".EmitsChangedSignal":
2683
 
                             "false"}
 
2747
                return {
 
2748
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2749
                    "false" }
2684
2750
            
2685
2751
            @dbus.service.signal(_interface, signature="o")
2686
2752
            def ClientAdded(self, objpath):
2700
2766
            @dbus.service.method(_interface, out_signature="ao")
2701
2767
            def GetAllClients(self):
2702
2768
                "D-Bus method"
2703
 
                return dbus.Array(c.dbus_object_path
2704
 
                                  for c in
 
2769
                return dbus.Array(c.dbus_object_path for c in
2705
2770
                                  tcp_server.clients.itervalues())
2706
2771
            
2707
2772
            @dbus.service.method(_interface,
2709
2774
            def GetAllClientsWithProperties(self):
2710
2775
                "D-Bus method"
2711
2776
                return dbus.Dictionary(
2712
 
                    ((c.dbus_object_path, c.GetAll(""))
2713
 
                     for c in tcp_server.clients.itervalues()),
 
2777
                    { c.dbus_object_path: c.GetAll("")
 
2778
                      for c in tcp_server.clients.itervalues() },
2714
2779
                    signature="oa{sv}")
2715
2780
            
2716
2781
            @dbus.service.method(_interface, in_signature="o")
2756
2821
                # + secret.
2757
2822
                exclude = { "bus", "changedstate", "secret",
2758
2823
                            "checker", "server_settings" }
2759
 
                for name, typ in (inspect.getmembers
2760
 
                                  (dbus.service.Object)):
 
2824
                for name, typ in inspect.getmembers(dbus.service
 
2825
                                                    .Object):
2761
2826
                    exclude.add(name)
2762
2827
                
2763
2828
                client_dict["encrypted_secret"] = (client
2770
2835
                del client_settings[client.name]["secret"]
2771
2836
        
2772
2837
        try:
2773
 
            with (tempfile.NamedTemporaryFile
2774
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2775
 
                   dir=os.path.dirname(stored_state_path),
2776
 
                   delete=False)) as stored_state:
 
2838
            with tempfile.NamedTemporaryFile(
 
2839
                    mode='wb',
 
2840
                    suffix=".pickle",
 
2841
                    prefix='clients-',
 
2842
                    dir=os.path.dirname(stored_state_path),
 
2843
                    delete=False) as stored_state:
2777
2844
                pickle.dump((clients, client_settings), stored_state)
2778
 
                tempname=stored_state.name
 
2845
                tempname = stored_state.name
2779
2846
            os.rename(tempname, stored_state_path)
2780
2847
        except (IOError, OSError) as e:
2781
2848
            if not debug:
2800
2867
            client.disable(quiet=True)
2801
2868
            if use_dbus:
2802
2869
                # Emit D-Bus signal
2803
 
                mandos_dbus_service.ClientRemoved(client
2804
 
                                                  .dbus_object_path,
2805
 
                                                  client.name)
 
2870
                mandos_dbus_service.ClientRemoved(
 
2871
                    client.dbus_object_path, client.name)
2806
2872
        client_settings.clear()
2807
2873
    
2808
2874
    atexit.register(cleanup)
2861
2927
    # Must run before the D-Bus bus name gets deregistered
2862
2928
    cleanup()
2863
2929
 
 
2930
 
2864
2931
if __name__ == '__main__':
2865
2932
    main()