/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: 2013-10-13 15:43:42 UTC
  • Revision ID: teddy@recompile.se-20131013154342-2ztabynqog6xuk0t
* initramfs-unpack: Bug fix: Made executable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2015 Teddy Hogeborn
15
 
# Copyright © 2008-2015 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
try:
40
 
    import SocketServer as socketserver
41
 
except ImportError:
42
 
    import socketserver
 
39
import SocketServer as socketserver
43
40
import socket
44
41
import argparse
45
42
import datetime
50
47
import gnutls.library.functions
51
48
import gnutls.library.constants
52
49
import gnutls.library.types
53
 
try:
54
 
    import ConfigParser as configparser
55
 
except ImportError:
56
 
    import configparser
 
50
import ConfigParser as configparser
57
51
import sys
58
52
import re
59
53
import os
68
62
import struct
69
63
import fcntl
70
64
import functools
71
 
try:
72
 
    import cPickle as pickle
73
 
except ImportError:
74
 
    import pickle
 
65
import cPickle as pickle
75
66
import multiprocessing
76
67
import types
77
68
import binascii
78
69
import tempfile
79
70
import itertools
80
71
import collections
81
 
import codecs
82
72
 
83
73
import dbus
84
74
import dbus.service
85
 
try:
86
 
    import gobject
87
 
except ImportError:
88
 
    from gi.repository import GObject as gobject
 
75
import gobject
89
76
import avahi
90
77
from dbus.mainloop.glib import DBusGMainLoop
91
78
import ctypes
101
88
    except ImportError:
102
89
        SO_BINDTODEVICE = None
103
90
 
104
 
if sys.version_info.major == 2:
105
 
    str = unicode
106
 
 
107
 
version = "1.6.9"
 
91
version = "1.6.0"
108
92
stored_state_file = "clients.pickle"
109
93
 
110
94
logger = logging.getLogger()
111
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
112
98
 
113
99
try:
114
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
115
 
        ctypes.util.find_library("c")).if_nametoindex
 
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
                      (ctypes.util.find_library("c"))
 
102
                      .if_nametoindex)
116
103
except (OSError, AttributeError):
117
 
    
118
104
    def if_nametoindex(interface):
119
105
        "Get an interface index the hard way, i.e. using fcntl()"
120
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
121
107
        with contextlib.closing(socket.socket()) as s:
122
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
 
                                struct.pack(b"16s16x", interface))
124
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
125
113
        return interface_index
126
114
 
127
115
 
128
116
def initlogger(debug, level=logging.WARNING):
129
117
    """init logger and add loglevel"""
130
118
    
131
 
    global syslogger
132
 
    syslogger = (logging.handlers.SysLogHandler(
133
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
 
        address = "/dev/log"))
135
119
    syslogger.setFormatter(logging.Formatter
136
120
                           ('Mandos [%(process)d]: %(levelname)s:'
137
121
                            ' %(message)s'))
154
138
 
155
139
class PGPEngine(object):
156
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
157
 
    
158
141
    def __init__(self):
159
142
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
143
        self.gnupgargs = ['--batch',
189
172
    def password_encode(self, password):
190
173
        # Passphrase can not be empty and can not contain newlines or
191
174
        # NUL bytes.  So we prefix it and hex encode it.
192
 
        encoded = b"mandos" + binascii.hexlify(password)
193
 
        if len(encoded) > 2048:
194
 
            # GnuPG can't handle long passwords, so encode differently
195
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
 
                       .replace(b"\n", b"\\n")
197
 
                       .replace(b"\0", b"\\x00"))
198
 
        return encoded
 
175
        return b"mandos" + binascii.hexlify(password)
199
176
    
200
177
    def encrypt(self, data, password):
201
178
        passphrase = self.password_encode(password)
202
 
        with tempfile.NamedTemporaryFile(
203
 
                dir=self.tempdir) as passfile:
 
179
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
180
                                         ) as passfile:
204
181
            passfile.write(passphrase)
205
182
            passfile.flush()
206
183
            proc = subprocess.Popen(['gpg', '--symmetric',
217
194
    
218
195
    def decrypt(self, data, password):
219
196
        passphrase = self.password_encode(password)
220
 
        with tempfile.NamedTemporaryFile(
221
 
                dir = self.tempdir) as passfile:
 
197
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
198
                                         ) as passfile:
222
199
            passfile.write(passphrase)
223
200
            passfile.flush()
224
201
            proc = subprocess.Popen(['gpg', '--decrypt',
228
205
                                    stdin = subprocess.PIPE,
229
206
                                    stdout = subprocess.PIPE,
230
207
                                    stderr = subprocess.PIPE)
231
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
208
            decrypted_plaintext, err = proc.communicate(input
 
209
                                                        = data)
232
210
        if proc.returncode != 0:
233
211
            raise PGPError(err)
234
212
        return decrypted_plaintext
237
215
class AvahiError(Exception):
238
216
    def __init__(self, value, *args, **kwargs):
239
217
        self.value = value
240
 
        return super(AvahiError, self).__init__(value, *args,
241
 
                                                **kwargs)
242
 
 
 
218
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
219
    def __unicode__(self):
 
220
        return unicode(repr(self.value))
243
221
 
244
222
class AvahiServiceError(AvahiError):
245
223
    pass
246
224
 
247
 
 
248
225
class AvahiGroupError(AvahiError):
249
226
    pass
250
227
 
270
247
    bus: dbus.SystemBus()
271
248
    """
272
249
    
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):
 
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
251
                 servicetype = None, port = None, TXT = None,
 
252
                 domain = "", host = "", max_renames = 32768,
 
253
                 protocol = avahi.PROTO_UNSPEC, bus = None):
284
254
        self.interface = interface
285
255
        self.name = name
286
256
        self.type = servicetype
296
266
        self.bus = bus
297
267
        self.entry_group_state_changed_match = None
298
268
    
299
 
    def rename(self, remove=True):
 
269
    def rename(self):
300
270
        """Derived from the Avahi example code"""
301
271
        if self.rename_count >= self.max_renames:
302
272
            logger.critical("No suitable Zeroconf service name found"
303
273
                            " after %i retries, exiting.",
304
274
                            self.rename_count)
305
275
            raise AvahiServiceError("Too many renames")
306
 
        self.name = str(
307
 
            self.server.GetAlternativeServiceName(self.name))
308
 
        self.rename_count += 1
 
276
        self.name = unicode(self.server
 
277
                            .GetAlternativeServiceName(self.name))
309
278
        logger.info("Changing Zeroconf service name to %r ...",
310
279
                    self.name)
311
 
        if remove:
312
 
            self.remove()
 
280
        self.remove()
313
281
        try:
314
282
            self.add()
315
283
        except dbus.exceptions.DBusException as error:
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)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
 
285
            self.cleanup()
 
286
            os._exit(1)
 
287
        self.rename_count += 1
324
288
    
325
289
    def remove(self):
326
290
        """Derived from the Avahi example code"""
364
328
            self.rename()
365
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
366
330
            logger.critical("Avahi: Error in group state changed %s",
367
 
                            str(error))
368
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
331
                            unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
369
334
    
370
335
    def cleanup(self):
371
336
        """Derived from the Avahi example code"""
381
346
    def server_state_changed(self, state, error=None):
382
347
        """Derived from the Avahi example code"""
383
348
        logger.debug("Avahi server state change: %i", state)
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
 
        }
 
349
        bad_states = { avahi.SERVER_INVALID:
 
350
                           "Zeroconf server invalid",
 
351
                       avahi.SERVER_REGISTERING: None,
 
352
                       avahi.SERVER_COLLISION:
 
353
                           "Zeroconf server name collision",
 
354
                       avahi.SERVER_FAILURE:
 
355
                           "Zeroconf server failure" }
390
356
        if state in bad_states:
391
357
            if bad_states[state] is not None:
392
358
                if error is None:
411
377
                                    follow_name_owner_changes=True),
412
378
                avahi.DBUS_INTERFACE_SERVER)
413
379
        self.server.connect_to_signal("StateChanged",
414
 
                                      self.server_state_changed)
 
380
                                 self.server_state_changed)
415
381
        self.server_state_changed(self.server.GetState())
416
382
 
417
383
 
418
384
class AvahiServiceToSyslog(AvahiService):
419
 
    def rename(self, *args, **kwargs):
 
385
    def rename(self):
420
386
        """Add the new name to the syslog messages"""
421
 
        ret = AvahiService.rename(self, *args, **kwargs)
422
 
        syslogger.setFormatter(logging.Formatter(
423
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
424
 
            .format(self.name)))
 
387
        ret = AvahiService.rename(self)
 
388
        syslogger.setFormatter(logging.Formatter
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
425
392
        return ret
426
393
 
427
 
def call_pipe(connection,       # : multiprocessing.Connection
428
 
              func, *args, **kwargs):
429
 
    """This function is meant to be called by multiprocessing.Process
430
 
    
431
 
    This function runs func(*args, **kwargs), and writes the resulting
432
 
    return value on the provided multiprocessing.Connection.
433
 
    """
434
 
    connection.send(func(*args, **kwargs))
435
 
    connection.close()
 
394
 
 
395
def timedelta_to_milliseconds(td):
 
396
    "Convert a datetime.timedelta() to milliseconds"
 
397
    return ((td.days * 24 * 60 * 60 * 1000)
 
398
            + (td.seconds * 1000)
 
399
            + (td.microseconds // 1000))
 
400
 
436
401
 
437
402
class Client(object):
438
403
    """A representation of a client host served by this server.
465
430
    last_checker_status: integer between 0 and 255 reflecting exit
466
431
                         status of last checker. -1 reflects crashed
467
432
                         checker, -2 means no checker completed yet.
468
 
    last_checker_signal: The signal which killed the last checker, if
469
 
                         last_checker_status is -1
470
433
    last_enabled: datetime.datetime(); (UTC) or None
471
434
    name:       string; from the config file, used in log messages and
472
435
                        D-Bus identifiers
485
448
                          "fingerprint", "host", "interval",
486
449
                          "last_approval_request", "last_checked_ok",
487
450
                          "last_enabled", "name", "timeout")
488
 
    client_defaults = {
489
 
        "timeout": "PT5M",
490
 
        "extended_timeout": "PT15M",
491
 
        "interval": "PT2M",
492
 
        "checker": "fping -q -- %%(host)s",
493
 
        "host": "",
494
 
        "approval_delay": "PT0S",
495
 
        "approval_duration": "PT1S",
496
 
        "approved_by_default": "True",
497
 
        "enabled": "True",
498
 
    }
 
451
    client_defaults = { "timeout": "PT5M",
 
452
                        "extended_timeout": "PT15M",
 
453
                        "interval": "PT2M",
 
454
                        "checker": "fping -q -- %%(host)s",
 
455
                        "host": "",
 
456
                        "approval_delay": "PT0S",
 
457
                        "approval_duration": "PT1S",
 
458
                        "approved_by_default": "True",
 
459
                        "enabled": "True",
 
460
                        }
 
461
    
 
462
    def timeout_milliseconds(self):
 
463
        "Return the 'timeout' attribute in milliseconds"
 
464
        return timedelta_to_milliseconds(self.timeout)
 
465
    
 
466
    def extended_timeout_milliseconds(self):
 
467
        "Return the 'extended_timeout' attribute in milliseconds"
 
468
        return timedelta_to_milliseconds(self.extended_timeout)
 
469
    
 
470
    def interval_milliseconds(self):
 
471
        "Return the 'interval' attribute in milliseconds"
 
472
        return timedelta_to_milliseconds(self.interval)
 
473
    
 
474
    def approval_delay_milliseconds(self):
 
475
        return timedelta_to_milliseconds(self.approval_delay)
499
476
    
500
477
    @staticmethod
501
478
    def config_parser(config):
517
494
            client["enabled"] = config.getboolean(client_name,
518
495
                                                  "enabled")
519
496
            
520
 
            # Uppercase and remove spaces from fingerprint for later
521
 
            # comparison purposes with return value from the
522
 
            # fingerprint() function
523
497
            client["fingerprint"] = (section["fingerprint"].upper()
524
498
                                     .replace(" ", ""))
525
499
            if "secret" in section:
530
504
                          "rb") as secfile:
531
505
                    client["secret"] = secfile.read()
532
506
            else:
533
 
                raise TypeError("No secret or secfile for section {}"
 
507
                raise TypeError("No secret or secfile for section {0}"
534
508
                                .format(section))
535
509
            client["timeout"] = string_to_delta(section["timeout"])
536
510
            client["extended_timeout"] = string_to_delta(
553
527
            server_settings = {}
554
528
        self.server_settings = server_settings
555
529
        # adding all client settings
556
 
        for setting, value in settings.items():
 
530
        for setting, value in settings.iteritems():
557
531
            setattr(self, setting, value)
558
532
        
559
533
        if self.enabled:
567
541
            self.expires = None
568
542
        
569
543
        logger.debug("Creating client %r", self.name)
 
544
        # Uppercase and remove spaces from fingerprint for later
 
545
        # comparison purposes with return value from the fingerprint()
 
546
        # function
570
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
571
548
        self.created = settings.get("created",
572
549
                                    datetime.datetime.utcnow())
579
556
        self.current_checker_command = None
580
557
        self.approved = None
581
558
        self.approvals_pending = 0
582
 
        self.changedstate = multiprocessing_manager.Condition(
583
 
            multiprocessing_manager.Lock())
584
 
        self.client_structure = [attr
585
 
                                 for attr in self.__dict__.iterkeys()
 
559
        self.changedstate = (multiprocessing_manager
 
560
                             .Condition(multiprocessing_manager
 
561
                                        .Lock()))
 
562
        self.client_structure = [attr for attr in
 
563
                                 self.__dict__.iterkeys()
586
564
                                 if not attr.startswith("_")]
587
565
        self.client_structure.append("client_structure")
588
566
        
589
 
        for name, t in inspect.getmembers(
590
 
                type(self), lambda obj: isinstance(obj, property)):
 
567
        for name, t in inspect.getmembers(type(self),
 
568
                                          lambda obj:
 
569
                                              isinstance(obj,
 
570
                                                         property)):
591
571
            if not name.startswith("_"):
592
572
                self.client_structure.append(name)
593
573
    
635
615
        # and every interval from then on.
636
616
        if self.checker_initiator_tag is not None:
637
617
            gobject.source_remove(self.checker_initiator_tag)
638
 
        self.checker_initiator_tag = gobject.timeout_add(
639
 
            int(self.interval.total_seconds() * 1000),
640
 
            self.start_checker)
 
618
        self.checker_initiator_tag = (gobject.timeout_add
 
619
                                      (self.interval_milliseconds(),
 
620
                                       self.start_checker))
641
621
        # Schedule a disable() when 'timeout' has passed
642
622
        if self.disable_initiator_tag is not None:
643
623
            gobject.source_remove(self.disable_initiator_tag)
644
 
        self.disable_initiator_tag = gobject.timeout_add(
645
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
624
        self.disable_initiator_tag = (gobject.timeout_add
 
625
                                   (self.timeout_milliseconds(),
 
626
                                    self.disable))
646
627
        # Also start a new checker *right now*.
647
628
        self.start_checker()
648
629
    
649
 
    def checker_callback(self, source, condition, connection,
650
 
                         command):
 
630
    def checker_callback(self, pid, condition, command):
651
631
        """The checker has completed, so take appropriate actions."""
652
632
        self.checker_callback_tag = None
653
633
        self.checker = None
654
 
        # Read return code from connection (see call_pipe)
655
 
        returncode = connection.recv()
656
 
        connection.close()
657
 
        
658
 
        if returncode >= 0:
659
 
            self.last_checker_status = returncode
660
 
            self.last_checker_signal = None
 
634
        if os.WIFEXITED(condition):
 
635
            self.last_checker_status = os.WEXITSTATUS(condition)
661
636
            if self.last_checker_status == 0:
662
637
                logger.info("Checker for %(name)s succeeded",
663
638
                            vars(self))
664
639
                self.checked_ok()
665
640
            else:
666
 
                logger.info("Checker for %(name)s failed", vars(self))
 
641
                logger.info("Checker for %(name)s failed",
 
642
                            vars(self))
667
643
        else:
668
644
            self.last_checker_status = -1
669
 
            self.last_checker_signal = -returncode
670
645
            logger.warning("Checker for %(name)s crashed?",
671
646
                           vars(self))
672
 
        return False
673
647
    
674
648
    def checked_ok(self):
675
649
        """Assert that the client has been seen, alive and well."""
676
650
        self.last_checked_ok = datetime.datetime.utcnow()
677
651
        self.last_checker_status = 0
678
 
        self.last_checker_signal = None
679
652
        self.bump_timeout()
680
653
    
681
654
    def bump_timeout(self, timeout=None):
686
659
            gobject.source_remove(self.disable_initiator_tag)
687
660
            self.disable_initiator_tag = None
688
661
        if getattr(self, "enabled", False):
689
 
            self.disable_initiator_tag = gobject.timeout_add(
690
 
                int(timeout.total_seconds() * 1000), self.disable)
 
662
            self.disable_initiator_tag = (gobject.timeout_add
 
663
                                          (timedelta_to_milliseconds
 
664
                                           (timeout), self.disable))
691
665
            self.expires = datetime.datetime.utcnow() + timeout
692
666
    
693
667
    def need_approval(self):
707
681
        # than 'timeout' for the client to be disabled, which is as it
708
682
        # should be.
709
683
        
710
 
        if self.checker is not None and not self.checker.is_alive():
711
 
            logger.warning("Checker was not alive; joining")
712
 
            self.checker.join()
713
 
            self.checker = None
 
684
        # If a checker exists, make sure it is not a zombie
 
685
        try:
 
686
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
687
        except (AttributeError, OSError) as error:
 
688
            if (isinstance(error, OSError)
 
689
                and error.errno != errno.ECHILD):
 
690
                raise error
 
691
        else:
 
692
            if pid:
 
693
                logger.warning("Checker was a zombie")
 
694
                gobject.source_remove(self.checker_callback_tag)
 
695
                self.checker_callback(pid, status,
 
696
                                      self.current_checker_command)
714
697
        # Start a new checker if needed
715
698
        if self.checker is None:
716
699
            # Escape attributes for the shell
717
 
            escaped_attrs = {
718
 
                attr: re.escape(str(getattr(self, attr)))
719
 
                for attr in self.runtime_expansions }
 
700
            escaped_attrs = dict(
 
701
                (attr, re.escape(unicode(getattr(self, attr))))
 
702
                for attr in
 
703
                self.runtime_expansions)
720
704
            try:
721
705
                command = self.checker_command % escaped_attrs
722
706
            except TypeError as error:
723
707
                logger.error('Could not format string "%s"',
724
 
                             self.checker_command,
 
708
                             self.checker_command, exc_info=error)
 
709
                return True # Try again later
 
710
            self.current_checker_command = command
 
711
            try:
 
712
                logger.info("Starting checker %r for %s",
 
713
                            command, self.name)
 
714
                # We don't need to redirect stdout and stderr, since
 
715
                # in normal mode, that is already done by daemon(),
 
716
                # and in debug mode we don't want to.  (Stdin is
 
717
                # always replaced by /dev/null.)
 
718
                # The exception is when not debugging but nevertheless
 
719
                # running in the foreground; use the previously
 
720
                # created wnull.
 
721
                popen_args = {}
 
722
                if (not self.server_settings["debug"]
 
723
                    and self.server_settings["foreground"]):
 
724
                    popen_args.update({"stdout": wnull,
 
725
                                       "stderr": wnull })
 
726
                self.checker = subprocess.Popen(command,
 
727
                                                close_fds=True,
 
728
                                                shell=True, cwd="/",
 
729
                                                **popen_args)
 
730
            except OSError as error:
 
731
                logger.error("Failed to start subprocess",
725
732
                             exc_info=error)
726
 
                return True     # Try again later
727
 
            self.current_checker_command = command
728
 
            logger.info("Starting checker %r for %s", command,
729
 
                        self.name)
730
 
            # We don't need to redirect stdout and stderr, since
731
 
            # in normal mode, that is already done by daemon(),
732
 
            # and in debug mode we don't want to.  (Stdin is
733
 
            # always replaced by /dev/null.)
734
 
            # The exception is when not debugging but nevertheless
735
 
            # running in the foreground; use the previously
736
 
            # created wnull.
737
 
            popen_args = { "close_fds": True,
738
 
                           "shell": True,
739
 
                           "cwd": "/" }
740
 
            if (not self.server_settings["debug"]
741
 
                and self.server_settings["foreground"]):
742
 
                popen_args.update({"stdout": wnull,
743
 
                                   "stderr": wnull })
744
 
            pipe = multiprocessing.Pipe(duplex = False)
745
 
            self.checker = multiprocessing.Process(
746
 
                target = call_pipe,
747
 
                args = (pipe[1], subprocess.call, command),
748
 
                kwargs = popen_args)
749
 
            self.checker.start()
750
 
            self.checker_callback_tag = gobject.io_add_watch(
751
 
                pipe[0].fileno(), gobject.IO_IN,
752
 
                self.checker_callback, pipe[0], command)
 
733
                return True
 
734
            self.checker_callback_tag = (gobject.child_watch_add
 
735
                                         (self.checker.pid,
 
736
                                          self.checker_callback,
 
737
                                          data=command))
 
738
            # The checker may have completed before the gobject
 
739
            # watch was added.  Check for this.
 
740
            try:
 
741
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
742
            except OSError as error:
 
743
                if error.errno == errno.ECHILD:
 
744
                    # This should never happen
 
745
                    logger.error("Child process vanished",
 
746
                                 exc_info=error)
 
747
                    return True
 
748
                raise
 
749
            if pid:
 
750
                gobject.source_remove(self.checker_callback_tag)
 
751
                self.checker_callback(pid, status, command)
753
752
        # Re-run this periodically if run by gobject.timeout_add
754
753
        return True
755
754
    
761
760
        if getattr(self, "checker", None) is None:
762
761
            return
763
762
        logger.debug("Stopping checker for %(name)s", vars(self))
764
 
        self.checker.terminate()
 
763
        try:
 
764
            self.checker.terminate()
 
765
            #time.sleep(0.5)
 
766
            #if self.checker.poll() is None:
 
767
            #    self.checker.kill()
 
768
        except OSError as error:
 
769
            if error.errno != errno.ESRCH: # No such process
 
770
                raise
765
771
        self.checker = None
766
772
 
767
773
 
768
 
def dbus_service_property(dbus_interface,
769
 
                          signature="v",
770
 
                          access="readwrite",
771
 
                          byte_arrays=False):
 
774
def dbus_service_property(dbus_interface, signature="v",
 
775
                          access="readwrite", byte_arrays=False):
772
776
    """Decorators for marking methods of a DBusObjectWithProperties to
773
777
    become properties on the D-Bus.
774
778
    
783
787
    # "Set" method, so we fail early here:
784
788
    if byte_arrays and signature != "ay":
785
789
        raise ValueError("Byte arrays not supported for non-'ay'"
786
 
                         " signature {!r}".format(signature))
787
 
    
 
790
                         " signature {0!r}".format(signature))
788
791
    def decorator(func):
789
792
        func._dbus_is_property = True
790
793
        func._dbus_interface = dbus_interface
795
798
            func._dbus_name = func._dbus_name[:-14]
796
799
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
797
800
        return func
798
 
    
799
801
    return decorator
800
802
 
801
803
 
810
812
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
811
813
                    "false"}
812
814
    """
813
 
    
814
815
    def decorator(func):
815
816
        func._dbus_is_interface = True
816
817
        func._dbus_interface = dbus_interface
817
818
        func._dbus_name = dbus_interface
818
819
        return func
819
 
    
820
820
    return decorator
821
821
 
822
822
 
824
824
    """Decorator to annotate D-Bus methods, signals or properties
825
825
    Usage:
826
826
    
827
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
828
 
                       "org.freedesktop.DBus.Property."
829
 
                       "EmitsChangedSignal": "false"})
830
827
    @dbus_service_property("org.example.Interface", signature="b",
831
828
                           access="r")
 
829
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
830
                        "org.freedesktop.DBus.Property."
 
831
                        "EmitsChangedSignal": "false"})
832
832
    def Property_dbus_property(self):
833
833
        return dbus.Boolean(False)
834
834
    """
835
 
    
836
835
    def decorator(func):
837
836
        func._dbus_annotations = annotations
838
837
        return func
839
 
    
840
838
    return decorator
841
839
 
842
840
 
843
841
class DBusPropertyException(dbus.exceptions.DBusException):
844
842
    """A base class for D-Bus property-related exceptions
845
843
    """
846
 
    pass
 
844
    def __unicode__(self):
 
845
        return unicode(str(self))
847
846
 
848
847
 
849
848
class DBusPropertyAccessException(DBusPropertyException):
873
872
        If called like _is_dbus_thing("method") it returns a function
874
873
        suitable for use as predicate to inspect.getmembers().
875
874
        """
876
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
875
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
877
876
                                   False)
878
877
    
879
878
    def _get_all_dbus_things(self, thing):
880
879
        """Returns a generator of (name, attribute) pairs
881
880
        """
882
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
881
        return ((getattr(athing.__get__(self), "_dbus_name",
 
882
                         name),
883
883
                 athing.__get__(self))
884
884
                for cls in self.__class__.__mro__
885
885
                for name, athing in
886
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
886
                inspect.getmembers(cls,
 
887
                                   self._is_dbus_thing(thing)))
887
888
    
888
889
    def _get_dbus_property(self, interface_name, property_name):
889
890
        """Returns a bound method if one exists which is a D-Bus
890
891
        property with the specified name and interface.
891
892
        """
892
 
        for cls in self.__class__.__mro__:
893
 
            for name, value in inspect.getmembers(
894
 
                    cls, self._is_dbus_thing("property")):
 
893
        for cls in  self.__class__.__mro__:
 
894
            for name, value in (inspect.getmembers
 
895
                                (cls,
 
896
                                 self._is_dbus_thing("property"))):
895
897
                if (value._dbus_name == property_name
896
898
                    and value._dbus_interface == interface_name):
897
899
                    return value.__get__(self)
898
900
        
899
901
        # No such property
900
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
901
 
            self.dbus_object_path, interface_name, property_name))
 
902
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
903
                                   + interface_name + "."
 
904
                                   + property_name)
902
905
    
903
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
904
 
                         in_signature="ss",
 
906
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
905
907
                         out_signature="v")
906
908
    def Get(self, interface_name, property_name):
907
909
        """Standard D-Bus property Get() method, see D-Bus standard.
925
927
            # The byte_arrays option is not supported yet on
926
928
            # signatures other than "ay".
927
929
            if prop._dbus_signature != "ay":
928
 
                raise ValueError("Byte arrays not supported for non-"
929
 
                                 "'ay' signature {!r}"
930
 
                                 .format(prop._dbus_signature))
 
930
                raise ValueError
931
931
            value = dbus.ByteArray(b''.join(chr(byte)
932
932
                                            for byte in value))
933
933
        prop(value)
934
934
    
935
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
936
 
                         in_signature="s",
 
935
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
937
936
                         out_signature="a{sv}")
938
937
    def GetAll(self, interface_name):
939
938
        """Standard D-Bus property GetAll() method, see D-Bus
954
953
            if not hasattr(value, "variant_level"):
955
954
                properties[name] = value
956
955
                continue
957
 
            properties[name] = type(value)(
958
 
                value, variant_level = value.variant_level + 1)
 
956
            properties[name] = type(value)(value, variant_level=
 
957
                                           value.variant_level+1)
959
958
        return dbus.Dictionary(properties, signature="sv")
960
959
    
961
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
 
    def PropertiesChanged(self, interface_name, changed_properties,
963
 
                          invalidated_properties):
964
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
965
 
        standard.
966
 
        """
967
 
        pass
968
 
    
969
960
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
961
                         out_signature="s",
971
962
                         path_keyword='object_path',
979
970
                                                   connection)
980
971
        try:
981
972
            document = xml.dom.minidom.parseString(xmlstring)
982
 
            
983
973
            def make_tag(document, name, prop):
984
974
                e = document.createElement("property")
985
975
                e.setAttribute("name", name)
986
976
                e.setAttribute("type", prop._dbus_signature)
987
977
                e.setAttribute("access", prop._dbus_access)
988
978
                return e
989
 
            
990
979
            for if_tag in document.getElementsByTagName("interface"):
991
980
                # Add property tags
992
981
                for tag in (make_tag(document, name, prop)
1004
993
                            if (name == tag.getAttribute("name")
1005
994
                                and prop._dbus_interface
1006
995
                                == if_tag.getAttribute("name")):
1007
 
                                annots.update(getattr(
1008
 
                                    prop, "_dbus_annotations", {}))
1009
 
                        for name, value in annots.items():
 
996
                                annots.update(getattr
 
997
                                              (prop,
 
998
                                               "_dbus_annotations",
 
999
                                               {}))
 
1000
                        for name, value in annots.iteritems():
1010
1001
                            ann_tag = document.createElement(
1011
1002
                                "annotation")
1012
1003
                            ann_tag.setAttribute("name", name)
1015
1006
                # Add interface annotation tags
1016
1007
                for annotation, value in dict(
1017
1008
                    itertools.chain.from_iterable(
1018
 
                        annotations().items()
1019
 
                        for name, annotations
1020
 
                        in self._get_all_dbus_things("interface")
 
1009
                        annotations().iteritems()
 
1010
                        for name, annotations in
 
1011
                        self._get_all_dbus_things("interface")
1021
1012
                        if name == if_tag.getAttribute("name")
1022
 
                        )).items():
 
1013
                        )).iteritems():
1023
1014
                    ann_tag = document.createElement("annotation")
1024
1015
                    ann_tag.setAttribute("name", annotation)
1025
1016
                    ann_tag.setAttribute("value", value)
1052
1043
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1053
1044
    if dt is None:
1054
1045
        return dbus.String("", variant_level = variant_level)
1055
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1046
    return dbus.String(dt.isoformat(),
 
1047
                       variant_level=variant_level)
1056
1048
 
1057
1049
 
1058
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1078
1070
    (from DBusObjectWithProperties) and interfaces (from the
1079
1071
    dbus_interface_annotations decorator).
1080
1072
    """
1081
 
    
1082
1073
    def wrapper(cls):
1083
1074
        for orig_interface_name, alt_interface_name in (
1084
 
                alt_interface_names.items()):
 
1075
            alt_interface_names.iteritems()):
1085
1076
            attr = {}
1086
1077
            interface_names = set()
1087
1078
            # Go though all attributes of the class
1089
1080
                # Ignore non-D-Bus attributes, and D-Bus attributes
1090
1081
                # with the wrong interface name
1091
1082
                if (not hasattr(attribute, "_dbus_interface")
1092
 
                    or not attribute._dbus_interface.startswith(
1093
 
                        orig_interface_name)):
 
1083
                    or not attribute._dbus_interface
 
1084
                    .startswith(orig_interface_name)):
1094
1085
                    continue
1095
1086
                # Create an alternate D-Bus interface name based on
1096
1087
                # the current name
1097
 
                alt_interface = attribute._dbus_interface.replace(
1098
 
                    orig_interface_name, alt_interface_name)
 
1088
                alt_interface = (attribute._dbus_interface
 
1089
                                 .replace(orig_interface_name,
 
1090
                                          alt_interface_name))
1099
1091
                interface_names.add(alt_interface)
1100
1092
                # Is this a D-Bus signal?
1101
1093
                if getattr(attribute, "_dbus_is_signal", False):
1102
 
                    if sys.version_info.major == 2:
1103
 
                        # Extract the original non-method undecorated
1104
 
                        # function by black magic
1105
 
                        nonmethod_func = (dict(
 
1094
                    # Extract the original non-method undecorated
 
1095
                    # function by black magic
 
1096
                    nonmethod_func = (dict(
1106
1097
                            zip(attribute.func_code.co_freevars,
1107
 
                                attribute.__closure__))
1108
 
                                          ["func"].cell_contents)
1109
 
                    else:
1110
 
                        nonmethod_func = attribute
 
1098
                                attribute.__closure__))["func"]
 
1099
                                      .cell_contents)
1111
1100
                    # Create a new, but exactly alike, function
1112
1101
                    # object, and decorate it to be a new D-Bus signal
1113
1102
                    # with the alternate D-Bus interface name
1114
 
                    if sys.version_info.major == 2:
1115
 
                        new_function = types.FunctionType(
1116
 
                            nonmethod_func.func_code,
1117
 
                            nonmethod_func.func_globals,
1118
 
                            nonmethod_func.func_name,
1119
 
                            nonmethod_func.func_defaults,
1120
 
                            nonmethod_func.func_closure)
1121
 
                    else:
1122
 
                        new_function = types.FunctionType(
1123
 
                            nonmethod_func.__code__,
1124
 
                            nonmethod_func.__globals__,
1125
 
                            nonmethod_func.__name__,
1126
 
                            nonmethod_func.__defaults__,
1127
 
                            nonmethod_func.__closure__)
1128
 
                    new_function = (dbus.service.signal(
1129
 
                        alt_interface,
1130
 
                        attribute._dbus_signature)(new_function))
 
1103
                    new_function = (dbus.service.signal
 
1104
                                    (alt_interface,
 
1105
                                     attribute._dbus_signature)
 
1106
                                    (types.FunctionType(
 
1107
                                nonmethod_func.func_code,
 
1108
                                nonmethod_func.func_globals,
 
1109
                                nonmethod_func.func_name,
 
1110
                                nonmethod_func.func_defaults,
 
1111
                                nonmethod_func.func_closure)))
1131
1112
                    # Copy annotations, if any
1132
1113
                    try:
1133
 
                        new_function._dbus_annotations = dict(
1134
 
                            attribute._dbus_annotations)
 
1114
                        new_function._dbus_annotations = (
 
1115
                            dict(attribute._dbus_annotations))
1135
1116
                    except AttributeError:
1136
1117
                        pass
1137
1118
                    # Define a creator of a function to call both the
1142
1123
                        """This function is a scope container to pass
1143
1124
                        func1 and func2 to the "call_both" function
1144
1125
                        outside of its arguments"""
1145
 
                        
1146
1126
                        def call_both(*args, **kwargs):
1147
1127
                            """This function will emit two D-Bus
1148
1128
                            signals by calling func1 and func2"""
1149
1129
                            func1(*args, **kwargs)
1150
1130
                            func2(*args, **kwargs)
1151
 
                        
1152
1131
                        return call_both
1153
1132
                    # Create the "call_both" function and add it to
1154
1133
                    # the class
1159
1138
                    # object.  Decorate it to be a new D-Bus method
1160
1139
                    # with the alternate D-Bus interface name.  Add it
1161
1140
                    # to the class.
1162
 
                    attr[attrname] = (
1163
 
                        dbus.service.method(
1164
 
                            alt_interface,
1165
 
                            attribute._dbus_in_signature,
1166
 
                            attribute._dbus_out_signature)
1167
 
                        (types.FunctionType(attribute.func_code,
1168
 
                                            attribute.func_globals,
1169
 
                                            attribute.func_name,
1170
 
                                            attribute.func_defaults,
1171
 
                                            attribute.func_closure)))
 
1141
                    attr[attrname] = (dbus.service.method
 
1142
                                      (alt_interface,
 
1143
                                       attribute._dbus_in_signature,
 
1144
                                       attribute._dbus_out_signature)
 
1145
                                      (types.FunctionType
 
1146
                                       (attribute.func_code,
 
1147
                                        attribute.func_globals,
 
1148
                                        attribute.func_name,
 
1149
                                        attribute.func_defaults,
 
1150
                                        attribute.func_closure)))
1172
1151
                    # Copy annotations, if any
1173
1152
                    try:
1174
 
                        attr[attrname]._dbus_annotations = dict(
1175
 
                            attribute._dbus_annotations)
 
1153
                        attr[attrname]._dbus_annotations = (
 
1154
                            dict(attribute._dbus_annotations))
1176
1155
                    except AttributeError:
1177
1156
                        pass
1178
1157
                # Is this a D-Bus property?
1181
1160
                    # object, and decorate it to be a new D-Bus
1182
1161
                    # property with the alternate D-Bus interface
1183
1162
                    # name.  Add it to the class.
1184
 
                    attr[attrname] = (dbus_service_property(
1185
 
                        alt_interface, attribute._dbus_signature,
1186
 
                        attribute._dbus_access,
1187
 
                        attribute._dbus_get_args_options
1188
 
                        ["byte_arrays"])
1189
 
                                      (types.FunctionType(
1190
 
                                          attribute.func_code,
1191
 
                                          attribute.func_globals,
1192
 
                                          attribute.func_name,
1193
 
                                          attribute.func_defaults,
1194
 
                                          attribute.func_closure)))
 
1163
                    attr[attrname] = (dbus_service_property
 
1164
                                      (alt_interface,
 
1165
                                       attribute._dbus_signature,
 
1166
                                       attribute._dbus_access,
 
1167
                                       attribute
 
1168
                                       ._dbus_get_args_options
 
1169
                                       ["byte_arrays"])
 
1170
                                      (types.FunctionType
 
1171
                                       (attribute.func_code,
 
1172
                                        attribute.func_globals,
 
1173
                                        attribute.func_name,
 
1174
                                        attribute.func_defaults,
 
1175
                                        attribute.func_closure)))
1195
1176
                    # Copy annotations, if any
1196
1177
                    try:
1197
 
                        attr[attrname]._dbus_annotations = dict(
1198
 
                            attribute._dbus_annotations)
 
1178
                        attr[attrname]._dbus_annotations = (
 
1179
                            dict(attribute._dbus_annotations))
1199
1180
                    except AttributeError:
1200
1181
                        pass
1201
1182
                # Is this a D-Bus interface?
1204
1185
                    # object.  Decorate it to be a new D-Bus interface
1205
1186
                    # with the alternate D-Bus interface name.  Add it
1206
1187
                    # to the class.
1207
 
                    attr[attrname] = (
1208
 
                        dbus_interface_annotations(alt_interface)
1209
 
                        (types.FunctionType(attribute.func_code,
1210
 
                                            attribute.func_globals,
1211
 
                                            attribute.func_name,
1212
 
                                            attribute.func_defaults,
1213
 
                                            attribute.func_closure)))
 
1188
                    attr[attrname] = (dbus_interface_annotations
 
1189
                                      (alt_interface)
 
1190
                                      (types.FunctionType
 
1191
                                       (attribute.func_code,
 
1192
                                        attribute.func_globals,
 
1193
                                        attribute.func_name,
 
1194
                                        attribute.func_defaults,
 
1195
                                        attribute.func_closure)))
1214
1196
            if deprecate:
1215
1197
                # Deprecate all alternate interfaces
1216
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1198
                iname="_AlternateDBusNames_interface_annotation{0}"
1217
1199
                for interface_name in interface_names:
1218
 
                    
1219
1200
                    @dbus_interface_annotations(interface_name)
1220
1201
                    def func(self):
1221
1202
                        return { "org.freedesktop.DBus.Deprecated":
1222
 
                                 "true" }
 
1203
                                     "true" }
1223
1204
                    # Find an unused name
1224
1205
                    for aname in (iname.format(i)
1225
1206
                                  for i in itertools.count()):
1229
1210
            if interface_names:
1230
1211
                # Replace the class with a new subclass of it with
1231
1212
                # methods, signals, etc. as created above.
1232
 
                cls = type(b"{}Alternate".format(cls.__name__),
1233
 
                           (cls, ), attr)
 
1213
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1214
                           (cls,), attr)
1234
1215
        return cls
1235
 
    
1236
1216
    return wrapper
1237
1217
 
1238
1218
 
1239
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
1240
 
                            "se.bsnet.fukt.Mandos"})
 
1220
                                "se.bsnet.fukt.Mandos"})
1241
1221
class ClientDBus(Client, DBusObjectWithProperties):
1242
1222
    """A Client class using D-Bus
1243
1223
    
1247
1227
    """
1248
1228
    
1249
1229
    runtime_expansions = (Client.runtime_expansions
1250
 
                          + ("dbus_object_path", ))
1251
 
    
1252
 
    _interface = "se.recompile.Mandos.Client"
 
1230
                          + ("dbus_object_path",))
1253
1231
    
1254
1232
    # dbus.service.Object doesn't use super(), so we can't either.
1255
1233
    
1258
1236
        Client.__init__(self, *args, **kwargs)
1259
1237
        # Only now, when this client is initialized, can it show up on
1260
1238
        # the D-Bus
1261
 
        client_object_name = str(self.name).translate(
 
1239
        client_object_name = unicode(self.name).translate(
1262
1240
            {ord("."): ord("_"),
1263
1241
             ord("-"): ord("_")})
1264
 
        self.dbus_object_path = dbus.ObjectPath(
1265
 
            "/clients/" + client_object_name)
 
1242
        self.dbus_object_path = (dbus.ObjectPath
 
1243
                                 ("/clients/" + client_object_name))
1266
1244
        DBusObjectWithProperties.__init__(self, self.bus,
1267
1245
                                          self.dbus_object_path)
1268
1246
    
1269
 
    def notifychangeproperty(transform_func, dbus_name,
1270
 
                             type_func=lambda x: x,
1271
 
                             variant_level=1,
1272
 
                             invalidate_only=False,
1273
 
                             _interface=_interface):
 
1247
    def notifychangeproperty(transform_func,
 
1248
                             dbus_name, type_func=lambda x: x,
 
1249
                             variant_level=1):
1274
1250
        """ Modify a variable so that it's a property which announces
1275
1251
        its changes to DBus.
1276
1252
        
1281
1257
                   to the D-Bus.  Default: no transform
1282
1258
        variant_level: D-Bus variant level.  Default: 1
1283
1259
        """
1284
 
        attrname = "_{}".format(dbus_name)
1285
 
        
 
1260
        attrname = "_{0}".format(dbus_name)
1286
1261
        def setter(self, value):
1287
1262
            if hasattr(self, "dbus_object_path"):
1288
1263
                if (not hasattr(self, attrname) or
1289
1264
                    type_func(getattr(self, attrname, None))
1290
1265
                    != type_func(value)):
1291
 
                    if invalidate_only:
1292
 
                        self.PropertiesChanged(
1293
 
                            _interface, dbus.Dictionary(),
1294
 
                            dbus.Array((dbus_name, )))
1295
 
                    else:
1296
 
                        dbus_value = transform_func(
1297
 
                            type_func(value),
1298
 
                            variant_level = variant_level)
1299
 
                        self.PropertyChanged(dbus.String(dbus_name),
1300
 
                                             dbus_value)
1301
 
                        self.PropertiesChanged(
1302
 
                            _interface,
1303
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1304
 
                                              dbus_value }),
1305
 
                            dbus.Array())
 
1266
                    dbus_value = transform_func(type_func(value),
 
1267
                                                variant_level
 
1268
                                                =variant_level)
 
1269
                    self.PropertyChanged(dbus.String(dbus_name),
 
1270
                                         dbus_value)
1306
1271
            setattr(self, attrname, value)
1307
1272
        
1308
1273
        return property(lambda self: getattr(self, attrname), setter)
1314
1279
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
1280
    last_enabled = notifychangeproperty(datetime_to_dbus,
1316
1281
                                        "LastEnabled")
1317
 
    checker = notifychangeproperty(
1318
 
        dbus.Boolean, "CheckerRunning",
1319
 
        type_func = lambda checker: checker is not None)
 
1282
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1283
                                   type_func = lambda checker:
 
1284
                                       checker is not None)
1320
1285
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1321
1286
                                           "LastCheckedOK")
1322
1287
    last_checker_status = notifychangeproperty(dbus.Int16,
1325
1290
        datetime_to_dbus, "LastApprovalRequest")
1326
1291
    approved_by_default = notifychangeproperty(dbus.Boolean,
1327
1292
                                               "ApprovedByDefault")
1328
 
    approval_delay = notifychangeproperty(
1329
 
        dbus.UInt64, "ApprovalDelay",
1330
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1293
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1294
                                          "ApprovalDelay",
 
1295
                                          type_func =
 
1296
                                          timedelta_to_milliseconds)
1331
1297
    approval_duration = notifychangeproperty(
1332
1298
        dbus.UInt64, "ApprovalDuration",
1333
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1299
        type_func = timedelta_to_milliseconds)
1334
1300
    host = notifychangeproperty(dbus.String, "Host")
1335
 
    timeout = notifychangeproperty(
1336
 
        dbus.UInt64, "Timeout",
1337
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1301
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1302
                                   type_func =
 
1303
                                   timedelta_to_milliseconds)
1338
1304
    extended_timeout = notifychangeproperty(
1339
1305
        dbus.UInt64, "ExtendedTimeout",
1340
 
        type_func = lambda td: td.total_seconds() * 1000)
1341
 
    interval = notifychangeproperty(
1342
 
        dbus.UInt64, "Interval",
1343
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1306
        type_func = timedelta_to_milliseconds)
 
1307
    interval = notifychangeproperty(dbus.UInt64,
 
1308
                                    "Interval",
 
1309
                                    type_func =
 
1310
                                    timedelta_to_milliseconds)
1344
1311
    checker_command = notifychangeproperty(dbus.String, "Checker")
1345
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
 
                                  invalidate_only=True)
1347
1312
    
1348
1313
    del notifychangeproperty
1349
1314
    
1356
1321
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
1322
        Client.__del__(self, *args, **kwargs)
1358
1323
    
1359
 
    def checker_callback(self, source, condition,
1360
 
                         connection, command, *args, **kwargs):
1361
 
        ret = Client.checker_callback(self, source, condition,
1362
 
                                      connection, command, *args,
1363
 
                                      **kwargs)
1364
 
        exitstatus = self.last_checker_status
1365
 
        if exitstatus >= 0:
 
1324
    def checker_callback(self, pid, condition, command,
 
1325
                         *args, **kwargs):
 
1326
        self.checker_callback_tag = None
 
1327
        self.checker = None
 
1328
        if os.WIFEXITED(condition):
 
1329
            exitstatus = os.WEXITSTATUS(condition)
1366
1330
            # Emit D-Bus signal
1367
1331
            self.CheckerCompleted(dbus.Int16(exitstatus),
1368
 
                                  dbus.Int64(0),
 
1332
                                  dbus.Int64(condition),
1369
1333
                                  dbus.String(command))
1370
1334
        else:
1371
1335
            # Emit D-Bus signal
1372
1336
            self.CheckerCompleted(dbus.Int16(-1),
1373
 
                                  dbus.Int64(
1374
 
                                      self.last_checker_signal),
 
1337
                                  dbus.Int64(condition),
1375
1338
                                  dbus.String(command))
1376
 
        return ret
 
1339
        
 
1340
        return Client.checker_callback(self, pid, condition, command,
 
1341
                                       *args, **kwargs)
1377
1342
    
1378
1343
    def start_checker(self, *args, **kwargs):
1379
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1344
        old_checker = self.checker
 
1345
        if self.checker is not None:
 
1346
            old_checker_pid = self.checker.pid
 
1347
        else:
 
1348
            old_checker_pid = None
1380
1349
        r = Client.start_checker(self, *args, **kwargs)
1381
1350
        # Only if new checker process was started
1382
1351
        if (self.checker is not None
1391
1360
    
1392
1361
    def approve(self, value=True):
1393
1362
        self.approved = value
1394
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
 
                                * 1000), self._reset_approved)
 
1363
        gobject.timeout_add(timedelta_to_milliseconds
 
1364
                            (self.approval_duration),
 
1365
                            self._reset_approved)
1396
1366
        self.send_changedstate()
1397
1367
    
1398
1368
    ## D-Bus methods, signals & properties
 
1369
    _interface = "se.recompile.Mandos.Client"
1399
1370
    
1400
1371
    ## Interfaces
1401
1372
    
 
1373
    @dbus_interface_annotations(_interface)
 
1374
    def _foo(self):
 
1375
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1376
                     "false"}
 
1377
    
1402
1378
    ## Signals
1403
1379
    
1404
1380
    # CheckerCompleted - signal
1414
1390
        pass
1415
1391
    
1416
1392
    # PropertyChanged - signal
1417
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1418
1393
    @dbus.service.signal(_interface, signature="sv")
1419
1394
    def PropertyChanged(self, property, value):
1420
1395
        "D-Bus signal"
1484
1459
        return dbus.Boolean(bool(self.approvals_pending))
1485
1460
    
1486
1461
    # ApprovedByDefault - property
1487
 
    @dbus_service_property(_interface,
1488
 
                           signature="b",
 
1462
    @dbus_service_property(_interface, signature="b",
1489
1463
                           access="readwrite")
1490
1464
    def ApprovedByDefault_dbus_property(self, value=None):
1491
1465
        if value is None:       # get
1493
1467
        self.approved_by_default = bool(value)
1494
1468
    
1495
1469
    # ApprovalDelay - property
1496
 
    @dbus_service_property(_interface,
1497
 
                           signature="t",
 
1470
    @dbus_service_property(_interface, signature="t",
1498
1471
                           access="readwrite")
1499
1472
    def ApprovalDelay_dbus_property(self, value=None):
1500
1473
        if value is None:       # get
1501
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1502
 
                               * 1000)
 
1474
            return dbus.UInt64(self.approval_delay_milliseconds())
1503
1475
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1504
1476
    
1505
1477
    # ApprovalDuration - property
1506
 
    @dbus_service_property(_interface,
1507
 
                           signature="t",
 
1478
    @dbus_service_property(_interface, signature="t",
1508
1479
                           access="readwrite")
1509
1480
    def ApprovalDuration_dbus_property(self, value=None):
1510
1481
        if value is None:       # get
1511
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1512
 
                               * 1000)
 
1482
            return dbus.UInt64(timedelta_to_milliseconds(
 
1483
                    self.approval_duration))
1513
1484
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1514
1485
    
1515
1486
    # Name - property
1523
1494
        return dbus.String(self.fingerprint)
1524
1495
    
1525
1496
    # Host - property
1526
 
    @dbus_service_property(_interface,
1527
 
                           signature="s",
 
1497
    @dbus_service_property(_interface, signature="s",
1528
1498
                           access="readwrite")
1529
1499
    def Host_dbus_property(self, value=None):
1530
1500
        if value is None:       # get
1531
1501
            return dbus.String(self.host)
1532
 
        self.host = str(value)
 
1502
        self.host = unicode(value)
1533
1503
    
1534
1504
    # Created - property
1535
1505
    @dbus_service_property(_interface, signature="s", access="read")
1542
1512
        return datetime_to_dbus(self.last_enabled)
1543
1513
    
1544
1514
    # Enabled - property
1545
 
    @dbus_service_property(_interface,
1546
 
                           signature="b",
 
1515
    @dbus_service_property(_interface, signature="b",
1547
1516
                           access="readwrite")
1548
1517
    def Enabled_dbus_property(self, value=None):
1549
1518
        if value is None:       # get
1554
1523
            self.disable()
1555
1524
    
1556
1525
    # LastCheckedOK - property
1557
 
    @dbus_service_property(_interface,
1558
 
                           signature="s",
 
1526
    @dbus_service_property(_interface, signature="s",
1559
1527
                           access="readwrite")
1560
1528
    def LastCheckedOK_dbus_property(self, value=None):
1561
1529
        if value is not None:
1564
1532
        return datetime_to_dbus(self.last_checked_ok)
1565
1533
    
1566
1534
    # LastCheckerStatus - property
1567
 
    @dbus_service_property(_interface, signature="n", access="read")
 
1535
    @dbus_service_property(_interface, signature="n",
 
1536
                           access="read")
1568
1537
    def LastCheckerStatus_dbus_property(self):
1569
1538
        return dbus.Int16(self.last_checker_status)
1570
1539
    
1579
1548
        return datetime_to_dbus(self.last_approval_request)
1580
1549
    
1581
1550
    # Timeout - property
1582
 
    @dbus_service_property(_interface,
1583
 
                           signature="t",
 
1551
    @dbus_service_property(_interface, signature="t",
1584
1552
                           access="readwrite")
1585
1553
    def Timeout_dbus_property(self, value=None):
1586
1554
        if value is None:       # get
1587
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1555
            return dbus.UInt64(self.timeout_milliseconds())
1588
1556
        old_timeout = self.timeout
1589
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
1590
1558
        # Reschedule disabling
1599
1567
                    is None):
1600
1568
                    return
1601
1569
                gobject.source_remove(self.disable_initiator_tag)
1602
 
                self.disable_initiator_tag = gobject.timeout_add(
1603
 
                    int((self.expires - now).total_seconds() * 1000),
1604
 
                    self.disable)
 
1570
                self.disable_initiator_tag = (
 
1571
                    gobject.timeout_add(
 
1572
                        timedelta_to_milliseconds(self.expires - now),
 
1573
                        self.disable))
1605
1574
    
1606
1575
    # ExtendedTimeout - property
1607
 
    @dbus_service_property(_interface,
1608
 
                           signature="t",
 
1576
    @dbus_service_property(_interface, signature="t",
1609
1577
                           access="readwrite")
1610
1578
    def ExtendedTimeout_dbus_property(self, value=None):
1611
1579
        if value is None:       # get
1612
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1613
 
                               * 1000)
 
1580
            return dbus.UInt64(self.extended_timeout_milliseconds())
1614
1581
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1615
1582
    
1616
1583
    # Interval - property
1617
 
    @dbus_service_property(_interface,
1618
 
                           signature="t",
 
1584
    @dbus_service_property(_interface, signature="t",
1619
1585
                           access="readwrite")
1620
1586
    def Interval_dbus_property(self, value=None):
1621
1587
        if value is None:       # get
1622
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1588
            return dbus.UInt64(self.interval_milliseconds())
1623
1589
        self.interval = datetime.timedelta(0, 0, 0, value)
1624
1590
        if getattr(self, "checker_initiator_tag", None) is None:
1625
1591
            return
1626
1592
        if self.enabled:
1627
1593
            # Reschedule checker run
1628
1594
            gobject.source_remove(self.checker_initiator_tag)
1629
 
            self.checker_initiator_tag = gobject.timeout_add(
1630
 
                value, self.start_checker)
1631
 
            self.start_checker() # Start one now, too
 
1595
            self.checker_initiator_tag = (gobject.timeout_add
 
1596
                                          (value, self.start_checker))
 
1597
            self.start_checker()    # Start one now, too
1632
1598
    
1633
1599
    # Checker - property
1634
 
    @dbus_service_property(_interface,
1635
 
                           signature="s",
 
1600
    @dbus_service_property(_interface, signature="s",
1636
1601
                           access="readwrite")
1637
1602
    def Checker_dbus_property(self, value=None):
1638
1603
        if value is None:       # get
1639
1604
            return dbus.String(self.checker_command)
1640
 
        self.checker_command = str(value)
 
1605
        self.checker_command = unicode(value)
1641
1606
    
1642
1607
    # CheckerRunning - property
1643
 
    @dbus_service_property(_interface,
1644
 
                           signature="b",
 
1608
    @dbus_service_property(_interface, signature="b",
1645
1609
                           access="readwrite")
1646
1610
    def CheckerRunning_dbus_property(self, value=None):
1647
1611
        if value is None:       # get
1657
1621
        return self.dbus_object_path # is already a dbus.ObjectPath
1658
1622
    
1659
1623
    # Secret = property
1660
 
    @dbus_service_property(_interface,
1661
 
                           signature="ay",
1662
 
                           access="write",
1663
 
                           byte_arrays=True)
 
1624
    @dbus_service_property(_interface, signature="ay",
 
1625
                           access="write", byte_arrays=True)
1664
1626
    def Secret_dbus_property(self, value):
1665
 
        self.secret = bytes(value)
 
1627
        self.secret = str(value)
1666
1628
    
1667
1629
    del _interface
1668
1630
 
1672
1634
        self._pipe = child_pipe
1673
1635
        self._pipe.send(('init', fpr, address))
1674
1636
        if not self._pipe.recv():
1675
 
            raise KeyError(fpr)
 
1637
            raise KeyError()
1676
1638
    
1677
1639
    def __getattribute__(self, name):
1678
1640
        if name == '_pipe':
1682
1644
        if data[0] == 'data':
1683
1645
            return data[1]
1684
1646
        if data[0] == 'function':
1685
 
            
1686
1647
            def func(*args, **kwargs):
1687
1648
                self._pipe.send(('funcall', name, args, kwargs))
1688
1649
                return self._pipe.recv()[1]
1689
 
            
1690
1650
            return func
1691
1651
    
1692
1652
    def __setattr__(self, name, value):
1704
1664
    def handle(self):
1705
1665
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1706
1666
            logger.info("TCP connection from: %s",
1707
 
                        str(self.client_address))
 
1667
                        unicode(self.client_address))
1708
1668
            logger.debug("Pipe FD: %d",
1709
1669
                         self.server.child_pipe.fileno())
1710
1670
            
1711
 
            session = gnutls.connection.ClientSession(
1712
 
                self.request, gnutls.connection .X509Credentials())
 
1671
            session = (gnutls.connection
 
1672
                       .ClientSession(self.request,
 
1673
                                      gnutls.connection
 
1674
                                      .X509Credentials()))
1713
1675
            
1714
1676
            # Note: gnutls.connection.X509Credentials is really a
1715
1677
            # generic GnuTLS certificate credentials object so long as
1724
1686
            priority = self.server.gnutls_priority
1725
1687
            if priority is None:
1726
1688
                priority = "NORMAL"
1727
 
            gnutls.library.functions.gnutls_priority_set_direct(
1728
 
                session._c_object, priority, None)
 
1689
            (gnutls.library.functions
 
1690
             .gnutls_priority_set_direct(session._c_object,
 
1691
                                         priority, None))
1729
1692
            
1730
1693
            # Start communication using the Mandos protocol
1731
1694
            # Get protocol number
1733
1696
            logger.debug("Protocol version: %r", line)
1734
1697
            try:
1735
1698
                if int(line.strip().split()[0]) > 1:
1736
 
                    raise RuntimeError(line)
 
1699
                    raise RuntimeError
1737
1700
            except (ValueError, IndexError, RuntimeError) as error:
1738
1701
                logger.error("Unknown protocol version: %s", error)
1739
1702
                return
1751
1714
            approval_required = False
1752
1715
            try:
1753
1716
                try:
1754
 
                    fpr = self.fingerprint(
1755
 
                        self.peer_certificate(session))
 
1717
                    fpr = self.fingerprint(self.peer_certificate
 
1718
                                           (session))
1756
1719
                except (TypeError,
1757
1720
                        gnutls.errors.GNUTLSError) as error:
1758
1721
                    logger.warning("Bad certificate: %s", error)
1773
1736
                while True:
1774
1737
                    if not client.enabled:
1775
1738
                        logger.info("Client %s is disabled",
1776
 
                                    client.name)
 
1739
                                       client.name)
1777
1740
                        if self.server.use_dbus:
1778
1741
                            # Emit D-Bus signal
1779
1742
                            client.Rejected("Disabled")
1788
1751
                        if self.server.use_dbus:
1789
1752
                            # Emit D-Bus signal
1790
1753
                            client.NeedApproval(
1791
 
                                client.approval_delay.total_seconds()
1792
 
                                * 1000, client.approved_by_default)
 
1754
                                client.approval_delay_milliseconds(),
 
1755
                                client.approved_by_default)
1793
1756
                    else:
1794
1757
                        logger.warning("Client %s was not approved",
1795
1758
                                       client.name)
1801
1764
                    #wait until timeout or approved
1802
1765
                    time = datetime.datetime.now()
1803
1766
                    client.changedstate.acquire()
1804
 
                    client.changedstate.wait(delay.total_seconds())
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1805
1770
                    client.changedstate.release()
1806
1771
                    time2 = datetime.datetime.now()
1807
1772
                    if (time2 - time) >= delay:
1826
1791
                        logger.warning("gnutls send failed",
1827
1792
                                       exc_info=error)
1828
1793
                        return
1829
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1830
 
                                 len(client.secret) - (sent_size
1831
 
                                                       + sent))
 
1794
                    logger.debug("Sent: %d, remaining: %d",
 
1795
                                 sent, len(client.secret)
 
1796
                                 - (sent_size + sent))
1832
1797
                    sent_size += sent
1833
1798
                
1834
1799
                logger.info("Sending secret to %s", client.name)
1851
1816
    def peer_certificate(session):
1852
1817
        "Return the peer's OpenPGP certificate as a bytestring"
1853
1818
        # If not an OpenPGP certificate...
1854
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1855
 
                session._c_object)
 
1819
        if (gnutls.library.functions
 
1820
            .gnutls_certificate_type_get(session._c_object)
1856
1821
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1857
1822
            # ...do the normal thing
1858
1823
            return session.peer_certificate
1872
1837
    def fingerprint(openpgp):
1873
1838
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1839
        # New GnuTLS "datum" with the OpenPGP public key
1875
 
        datum = gnutls.library.types.gnutls_datum_t(
1876
 
            ctypes.cast(ctypes.c_char_p(openpgp),
1877
 
                        ctypes.POINTER(ctypes.c_ubyte)),
1878
 
            ctypes.c_uint(len(openpgp)))
 
1840
        datum = (gnutls.library.types
 
1841
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1842
                                             ctypes.POINTER
 
1843
                                             (ctypes.c_ubyte)),
 
1844
                                 ctypes.c_uint(len(openpgp))))
1879
1845
        # New empty GnuTLS certificate
1880
1846
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1882
 
            ctypes.byref(crt))
 
1847
        (gnutls.library.functions
 
1848
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1849
        # Import the OpenPGP public key into the certificate
1884
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
1885
 
            crt, ctypes.byref(datum),
1886
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
1850
        (gnutls.library.functions
 
1851
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1852
                                    gnutls.library.constants
 
1853
                                    .GNUTLS_OPENPGP_FMT_RAW))
1887
1854
        # Verify the self signature in the key
1888
1855
        crtverify = ctypes.c_uint()
1889
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
 
            crt, 0, ctypes.byref(crtverify))
 
1856
        (gnutls.library.functions
 
1857
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1858
                                         ctypes.byref(crtverify)))
1891
1859
        if crtverify.value != 0:
1892
1860
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
 
            raise gnutls.errors.CertificateSecurityError(
1894
 
                "Verify failed")
 
1861
            raise (gnutls.errors.CertificateSecurityError
 
1862
                   ("Verify failed"))
1895
1863
        # New buffer for the fingerprint
1896
1864
        buf = ctypes.create_string_buffer(20)
1897
1865
        buf_len = ctypes.c_size_t()
1898
1866
        # Get the fingerprint from the certificate into the buffer
1899
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
1867
        (gnutls.library.functions
 
1868
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1869
                                             ctypes.byref(buf_len)))
1901
1870
        # Deinit the certificate
1902
1871
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1872
        # Convert the buffer to a Python bytestring
1909
1878
 
1910
1879
class MultiprocessingMixIn(object):
1911
1880
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1912
 
    
1913
1881
    def sub_process_main(self, request, address):
1914
1882
        try:
1915
1883
            self.finish_request(request, address)
1927
1895
 
1928
1896
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1929
1897
    """ adds a pipe to the MixIn """
1930
 
    
1931
1898
    def process_request(self, request, client_address):
1932
1899
        """Overrides and wraps the original process_request().
1933
1900
        
1942
1909
    
1943
1910
    def add_pipe(self, parent_pipe, proc):
1944
1911
        """Dummy function; override as necessary"""
1945
 
        raise NotImplementedError()
 
1912
        raise NotImplementedError
1946
1913
 
1947
1914
 
1948
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1954
1921
        interface:      None or a network interface name (string)
1955
1922
        use_ipv6:       Boolean; to use IPv6 or not
1956
1923
    """
1957
 
    
1958
1924
    def __init__(self, server_address, RequestHandlerClass,
1959
 
                 interface=None,
1960
 
                 use_ipv6=True,
1961
 
                 socketfd=None):
 
1925
                 interface=None, use_ipv6=True, socketfd=None):
1962
1926
        """If socketfd is set, use that file descriptor instead of
1963
1927
        creating a new one with socket.socket().
1964
1928
        """
2005
1969
                             self.interface)
2006
1970
            else:
2007
1971
                try:
2008
 
                    self.socket.setsockopt(
2009
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
2010
 
                        (self.interface + "\0").encode("utf-8"))
 
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1973
                                           SO_BINDTODEVICE,
 
1974
                                           str(self.interface + '\0'))
2011
1975
                except socket.error as error:
2012
1976
                    if error.errno == errno.EPERM:
2013
1977
                        logger.error("No permission to bind to"
2031
1995
                self.server_address = (any_address,
2032
1996
                                       self.server_address[1])
2033
1997
            elif not self.server_address[1]:
2034
 
                self.server_address = (self.server_address[0], 0)
 
1998
                self.server_address = (self.server_address[0],
 
1999
                                       0)
2035
2000
#                 if self.interface:
2036
2001
#                     self.server_address = (self.server_address[0],
2037
2002
#                                            0, # port
2051
2016
    
2052
2017
    Assumes a gobject.MainLoop event loop.
2053
2018
    """
2054
 
    
2055
2019
    def __init__(self, server_address, RequestHandlerClass,
2056
 
                 interface=None,
2057
 
                 use_ipv6=True,
2058
 
                 clients=None,
2059
 
                 gnutls_priority=None,
2060
 
                 use_dbus=True,
2061
 
                 socketfd=None):
 
2020
                 interface=None, use_ipv6=True, clients=None,
 
2021
                 gnutls_priority=None, use_dbus=True, socketfd=None):
2062
2022
        self.enabled = False
2063
2023
        self.clients = clients
2064
2024
        if self.clients is None:
2070
2030
                                interface = interface,
2071
2031
                                use_ipv6 = use_ipv6,
2072
2032
                                socketfd = socketfd)
2073
 
    
2074
2033
    def server_activate(self):
2075
2034
        if self.enabled:
2076
2035
            return socketserver.TCPServer.server_activate(self)
2080
2039
    
2081
2040
    def add_pipe(self, parent_pipe, proc):
2082
2041
        # Call "handle_ipc" for both data and EOF events
2083
 
        gobject.io_add_watch(
2084
 
            parent_pipe.fileno(),
2085
 
            gobject.IO_IN | gobject.IO_HUP,
2086
 
            functools.partial(self.handle_ipc,
2087
 
                              parent_pipe = parent_pipe,
2088
 
                              proc = proc))
 
2042
        gobject.io_add_watch(parent_pipe.fileno(),
 
2043
                             gobject.IO_IN | gobject.IO_HUP,
 
2044
                             functools.partial(self.handle_ipc,
 
2045
                                               parent_pipe =
 
2046
                                               parent_pipe,
 
2047
                                               proc = proc))
2089
2048
    
2090
 
    def handle_ipc(self, source, condition,
2091
 
                   parent_pipe=None,
2092
 
                   proc = None,
2093
 
                   client_object=None):
 
2049
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2050
                   proc = None, client_object=None):
2094
2051
        # error, or the other end of multiprocessing.Pipe has closed
2095
2052
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2096
2053
            # Wait for other process to exit
2119
2076
                parent_pipe.send(False)
2120
2077
                return False
2121
2078
            
2122
 
            gobject.io_add_watch(
2123
 
                parent_pipe.fileno(),
2124
 
                gobject.IO_IN | gobject.IO_HUP,
2125
 
                functools.partial(self.handle_ipc,
2126
 
                                  parent_pipe = parent_pipe,
2127
 
                                  proc = proc,
2128
 
                                  client_object = client))
 
2079
            gobject.io_add_watch(parent_pipe.fileno(),
 
2080
                                 gobject.IO_IN | gobject.IO_HUP,
 
2081
                                 functools.partial(self.handle_ipc,
 
2082
                                                   parent_pipe =
 
2083
                                                   parent_pipe,
 
2084
                                                   proc = proc,
 
2085
                                                   client_object =
 
2086
                                                   client))
2129
2087
            parent_pipe.send(True)
2130
2088
            # remove the old hook in favor of the new above hook on
2131
2089
            # same fileno
2137
2095
            
2138
2096
            parent_pipe.send(('data', getattr(client_object,
2139
2097
                                              funcname)(*args,
2140
 
                                                        **kwargs)))
 
2098
                                                         **kwargs)))
2141
2099
        
2142
2100
        if command == 'getattr':
2143
2101
            attrname = request[1]
2144
 
            if isinstance(client_object.__getattribute__(attrname),
2145
 
                          collections.Callable):
2146
 
                parent_pipe.send(('function', ))
 
2102
            if callable(client_object.__getattribute__(attrname)):
 
2103
                parent_pipe.send(('function',))
2147
2104
            else:
2148
 
                parent_pipe.send((
2149
 
                    'data', client_object.__getattribute__(attrname)))
 
2105
                parent_pipe.send(('data', client_object
 
2106
                                  .__getattribute__(attrname)))
2150
2107
        
2151
2108
        if command == 'setattr':
2152
2109
            attrname = request[1]
2183
2140
    # avoid excessive use of external libraries.
2184
2141
    
2185
2142
    # New type for defining tokens, syntax, and semantics all-in-one
2186
 
    Token = collections.namedtuple("Token", (
2187
 
        "regexp",  # To match token; if "value" is not None, must have
2188
 
                   # a "group" containing digits
2189
 
        "value",   # datetime.timedelta or None
2190
 
        "followers"))           # Tokens valid after this token
 
2143
    Token = collections.namedtuple("Token",
 
2144
                                   ("regexp", # To match token; if
 
2145
                                              # "value" is not None,
 
2146
                                              # must have a "group"
 
2147
                                              # containing digits
 
2148
                                    "value",  # datetime.timedelta or
 
2149
                                              # None
 
2150
                                    "followers")) # Tokens valid after
 
2151
                                                  # this token
2191
2152
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
2153
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2193
2154
    token_end = Token(re.compile(r"$"), None, frozenset())
2194
2155
    token_second = Token(re.compile(r"(\d+)S"),
2195
2156
                         datetime.timedelta(seconds=1),
2196
 
                         frozenset((token_end, )))
 
2157
                         frozenset((token_end,)))
2197
2158
    token_minute = Token(re.compile(r"(\d+)M"),
2198
2159
                         datetime.timedelta(minutes=1),
2199
2160
                         frozenset((token_second, token_end)))
2215
2176
                       frozenset((token_month, token_end)))
2216
2177
    token_week = Token(re.compile(r"(\d+)W"),
2217
2178
                       datetime.timedelta(weeks=1),
2218
 
                       frozenset((token_end, )))
 
2179
                       frozenset((token_end,)))
2219
2180
    token_duration = Token(re.compile(r"P"), None,
2220
2181
                           frozenset((token_year, token_month,
2221
2182
                                      token_day, token_time,
2222
 
                                      token_week)))
 
2183
                                      token_week))),
2223
2184
    # Define starting values
2224
2185
    value = datetime.timedelta() # Value so far
2225
2186
    found_token = None
2226
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
2187
    followers = frozenset(token_duration,) # Following valid tokens
2227
2188
    s = duration                # String left to parse
2228
2189
    # Loop until end token is found
2229
2190
    while found_token is not token_end:
2246
2207
                break
2247
2208
        else:
2248
2209
            # No currently valid tokens were found
2249
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2250
 
                             .format(duration))
 
2210
            raise ValueError("Invalid RFC 3339 duration")
2251
2211
    # End token found
2252
2212
    return value
2253
2213
 
2277
2237
    timevalue = datetime.timedelta(0)
2278
2238
    for s in interval.split():
2279
2239
        try:
2280
 
            suffix = s[-1]
 
2240
            suffix = unicode(s[-1])
2281
2241
            value = int(s[:-1])
2282
2242
            if suffix == "d":
2283
2243
                delta = datetime.timedelta(value)
2290
2250
            elif suffix == "w":
2291
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2292
2252
            else:
2293
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
2294
 
        except IndexError as e:
 
2253
                raise ValueError("Unknown suffix {0!r}"
 
2254
                                 .format(suffix))
 
2255
        except (ValueError, IndexError) as e:
2295
2256
            raise ValueError(*(e.args))
2296
2257
        timevalue += delta
2297
2258
    return timevalue
2313
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2314
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2315
2276
            raise OSError(errno.ENODEV,
2316
 
                          "{} not a character device"
 
2277
                          "{0} not a character device"
2317
2278
                          .format(os.devnull))
2318
2279
        os.dup2(null, sys.stdin.fileno())
2319
2280
        os.dup2(null, sys.stdout.fileno())
2329
2290
    
2330
2291
    parser = argparse.ArgumentParser()
2331
2292
    parser.add_argument("-v", "--version", action="version",
2332
 
                        version = "%(prog)s {}".format(version),
 
2293
                        version = "%(prog)s {0}".format(version),
2333
2294
                        help="show version number and exit")
2334
2295
    parser.add_argument("-i", "--interface", metavar="IF",
2335
2296
                        help="Bind to interface IF")
2368
2329
                        help="Directory to save/restore state in")
2369
2330
    parser.add_argument("--foreground", action="store_true",
2370
2331
                        help="Run in foreground", default=None)
2371
 
    parser.add_argument("--no-zeroconf", action="store_false",
2372
 
                        dest="zeroconf", help="Do not use Zeroconf",
2373
 
                        default=None)
2374
2332
    
2375
2333
    options = parser.parse_args()
2376
2334
    
2377
2335
    if options.check:
2378
2336
        import doctest
2379
 
        fail_count, test_count = doctest.testmod()
2380
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2337
        doctest.testmod()
 
2338
        sys.exit()
2381
2339
    
2382
2340
    # Default values for config file for server-global settings
2383
2341
    server_defaults = { "interface": "",
2385
2343
                        "port": "",
2386
2344
                        "debug": "False",
2387
2345
                        "priority":
2388
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2389
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2390
2347
                        "servicename": "Mandos",
2391
2348
                        "use_dbus": "True",
2392
2349
                        "use_ipv6": "True",
2395
2352
                        "socket": "",
2396
2353
                        "statedir": "/var/lib/mandos",
2397
2354
                        "foreground": "False",
2398
 
                        "zeroconf": "True",
2399
 
                    }
 
2355
                        }
2400
2356
    
2401
2357
    # Parse config file for server-global settings
2402
2358
    server_config = configparser.SafeConfigParser(server_defaults)
2403
2359
    del server_defaults
2404
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2360
    server_config.read(os.path.join(options.configdir,
 
2361
                                    "mandos.conf"))
2405
2362
    # Convert the SafeConfigParser object to a dict
2406
2363
    server_settings = server_config.defaults()
2407
2364
    # Use the appropriate methods on the non-string config options
2425
2382
    # Override the settings from the config file with command line
2426
2383
    # options, if set.
2427
2384
    for option in ("interface", "address", "port", "debug",
2428
 
                   "priority", "servicename", "configdir", "use_dbus",
2429
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2430
 
                   "socket", "foreground", "zeroconf"):
 
2385
                   "priority", "servicename", "configdir",
 
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2387
                   "statedir", "socket", "foreground"):
2431
2388
        value = getattr(options, option)
2432
2389
        if value is not None:
2433
2390
            server_settings[option] = value
2434
2391
    del options
2435
2392
    # Force all strings to be unicode
2436
2393
    for option in server_settings.keys():
2437
 
        if isinstance(server_settings[option], bytes):
2438
 
            server_settings[option] = (server_settings[option]
2439
 
                                       .decode("utf-8"))
 
2394
        if type(server_settings[option]) is str:
 
2395
            server_settings[option] = unicode(server_settings[option])
2440
2396
    # Force all boolean options to be boolean
2441
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
 
                   "foreground", "zeroconf"):
 
2398
                   "foreground"):
2443
2399
        server_settings[option] = bool(server_settings[option])
2444
2400
    # Debug implies foreground
2445
2401
    if server_settings["debug"]:
2448
2404
    
2449
2405
    ##################################################################
2450
2406
    
2451
 
    if (not server_settings["zeroconf"]
2452
 
        and not (server_settings["port"]
2453
 
                 or server_settings["socket"] != "")):
2454
 
        parser.error("Needs port or socket to work without Zeroconf")
2455
 
    
2456
2407
    # For convenience
2457
2408
    debug = server_settings["debug"]
2458
2409
    debuglevel = server_settings["debuglevel"]
2461
2412
    stored_state_path = os.path.join(server_settings["statedir"],
2462
2413
                                     stored_state_file)
2463
2414
    foreground = server_settings["foreground"]
2464
 
    zeroconf = server_settings["zeroconf"]
2465
2415
    
2466
2416
    if debug:
2467
2417
        initlogger(debug, logging.DEBUG)
2473
2423
            initlogger(debug, level)
2474
2424
    
2475
2425
    if server_settings["servicename"] != "Mandos":
2476
 
        syslogger.setFormatter(
2477
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2478
 
                              ' %(levelname)s: %(message)s'.format(
2479
 
                                  server_settings["servicename"])))
 
2426
        syslogger.setFormatter(logging.Formatter
 
2427
                               ('Mandos ({0}) [%(process)d]:'
 
2428
                                ' %(levelname)s: %(message)s'
 
2429
                                .format(server_settings
 
2430
                                        ["servicename"])))
2480
2431
    
2481
2432
    # Parse config file with clients
2482
2433
    client_config = configparser.SafeConfigParser(Client
2487
2438
    global mandos_dbus_service
2488
2439
    mandos_dbus_service = None
2489
2440
    
2490
 
    socketfd = None
2491
 
    if server_settings["socket"] != "":
2492
 
        socketfd = server_settings["socket"]
2493
 
    tcp_server = MandosServer(
2494
 
        (server_settings["address"], server_settings["port"]),
2495
 
        ClientHandler,
2496
 
        interface=(server_settings["interface"] or None),
2497
 
        use_ipv6=use_ipv6,
2498
 
        gnutls_priority=server_settings["priority"],
2499
 
        use_dbus=use_dbus,
2500
 
        socketfd=socketfd)
 
2441
    tcp_server = MandosServer((server_settings["address"],
 
2442
                               server_settings["port"]),
 
2443
                              ClientHandler,
 
2444
                              interface=(server_settings["interface"]
 
2445
                                         or None),
 
2446
                              use_ipv6=use_ipv6,
 
2447
                              gnutls_priority=
 
2448
                              server_settings["priority"],
 
2449
                              use_dbus=use_dbus,
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
2501
2452
    if not foreground:
2502
 
        pidfilename = "/run/mandos.pid"
2503
 
        if not os.path.isdir("/run/."):
2504
 
            pidfilename = "/var/run/mandos.pid"
 
2453
        pidfilename = "/var/run/mandos.pid"
2505
2454
        pidfile = None
2506
2455
        try:
2507
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2456
            pidfile = open(pidfilename, "w")
2508
2457
        except IOError as e:
2509
2458
            logger.error("Could not open file %r", pidfilename,
2510
2459
                         exc_info=e)
2524
2473
        os.setuid(uid)
2525
2474
    except OSError as error:
2526
2475
        if error.errno != errno.EPERM:
2527
 
            raise
 
2476
            raise error
2528
2477
    
2529
2478
    if debug:
2530
2479
        # Enable all possible GnuTLS debugging
2537
2486
        def debug_gnutls(level, string):
2538
2487
            logger.debug("GnuTLS: %s", string[:-1])
2539
2488
        
2540
 
        gnutls.library.functions.gnutls_global_set_log_function(
2541
 
            debug_gnutls)
 
2489
        (gnutls.library.functions
 
2490
         .gnutls_global_set_log_function(debug_gnutls))
2542
2491
        
2543
2492
        # Redirect stdin so all checkers get /dev/null
2544
2493
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2564
2513
    if use_dbus:
2565
2514
        try:
2566
2515
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2567
 
                                            bus,
2568
 
                                            do_not_queue=True)
2569
 
            old_bus_name = dbus.service.BusName(
2570
 
                "se.bsnet.fukt.Mandos", bus,
2571
 
                do_not_queue=True)
2572
 
        except dbus.exceptions.DBusException as e:
 
2516
                                            bus, do_not_queue=True)
 
2517
            old_bus_name = (dbus.service.BusName
 
2518
                            ("se.bsnet.fukt.Mandos", bus,
 
2519
                             do_not_queue=True))
 
2520
        except dbus.exceptions.NameExistsException as e:
2573
2521
            logger.error("Disabling D-Bus:", exc_info=e)
2574
2522
            use_dbus = False
2575
2523
            server_settings["use_dbus"] = False
2576
2524
            tcp_server.use_dbus = False
2577
 
    if zeroconf:
2578
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
 
        service = AvahiServiceToSyslog(
2580
 
            name = server_settings["servicename"],
2581
 
            servicetype = "_mandos._tcp",
2582
 
            protocol = protocol,
2583
 
            bus = bus)
2584
 
        if server_settings["interface"]:
2585
 
            service.interface = if_nametoindex(
2586
 
                server_settings["interface"].encode("utf-8"))
 
2525
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2526
    service = AvahiServiceToSyslog(name =
 
2527
                                   server_settings["servicename"],
 
2528
                                   servicetype = "_mandos._tcp",
 
2529
                                   protocol = protocol, bus = bus)
 
2530
    if server_settings["interface"]:
 
2531
        service.interface = (if_nametoindex
 
2532
                             (str(server_settings["interface"])))
2587
2533
    
2588
2534
    global multiprocessing_manager
2589
2535
    multiprocessing_manager = multiprocessing.Manager()
2608
2554
    if server_settings["restore"]:
2609
2555
        try:
2610
2556
            with open(stored_state_path, "rb") as stored_state:
2611
 
                clients_data, old_client_settings = pickle.load(
2612
 
                    stored_state)
 
2557
                clients_data, old_client_settings = (pickle.load
 
2558
                                                     (stored_state))
2613
2559
            os.remove(stored_state_path)
2614
2560
        except IOError as e:
2615
2561
            if e.errno == errno.ENOENT:
2616
 
                logger.warning("Could not load persistent state:"
2617
 
                               " {}".format(os.strerror(e.errno)))
 
2562
                logger.warning("Could not load persistent state: {0}"
 
2563
                                .format(os.strerror(e.errno)))
2618
2564
            else:
2619
2565
                logger.critical("Could not load persistent state:",
2620
2566
                                exc_info=e)
2621
2567
                raise
2622
2568
        except EOFError as e:
2623
2569
            logger.warning("Could not load persistent state: "
2624
 
                           "EOFError:",
2625
 
                           exc_info=e)
 
2570
                           "EOFError:", exc_info=e)
2626
2571
    
2627
2572
    with PGPEngine() as pgp:
2628
 
        for client_name, client in clients_data.items():
 
2573
        for client_name, client in clients_data.iteritems():
2629
2574
            # Skip removed clients
2630
2575
            if client_name not in client_settings:
2631
2576
                continue
2640
2585
                    # For each value in new config, check if it
2641
2586
                    # differs from the old config value (Except for
2642
2587
                    # the "secret" attribute)
2643
 
                    if (name != "secret"
2644
 
                        and (value !=
2645
 
                             old_client_settings[client_name][name])):
 
2588
                    if (name != "secret" and
 
2589
                        value != old_client_settings[client_name]
 
2590
                        [name]):
2646
2591
                        client[name] = value
2647
2592
                except KeyError:
2648
2593
                    pass
2649
2594
            
2650
2595
            # Clients who has passed its expire date can still be
2651
 
            # enabled if its last checker was successful.  A Client
 
2596
            # enabled if its last checker was successful.  Clients
2652
2597
            # whose checker succeeded before we stored its state is
2653
2598
            # assumed to have successfully run all checkers during
2654
2599
            # downtime.
2656
2601
                if datetime.datetime.utcnow() >= client["expires"]:
2657
2602
                    if not client["last_checked_ok"]:
2658
2603
                        logger.warning(
2659
 
                            "disabling client {} - Client never "
2660
 
                            "performed a successful checker".format(
2661
 
                                client_name))
 
2604
                            "disabling client {0} - Client never "
 
2605
                            "performed a successful checker"
 
2606
                            .format(client_name))
2662
2607
                        client["enabled"] = False
2663
2608
                    elif client["last_checker_status"] != 0:
2664
2609
                        logger.warning(
2665
 
                            "disabling client {} - Client last"
2666
 
                            " checker failed with error code"
2667
 
                            " {}".format(
2668
 
                                client_name,
2669
 
                                client["last_checker_status"]))
 
2610
                            "disabling client {0} - Client "
 
2611
                            "last checker failed with error code {1}"
 
2612
                            .format(client_name,
 
2613
                                    client["last_checker_status"]))
2670
2614
                        client["enabled"] = False
2671
2615
                    else:
2672
 
                        client["expires"] = (
2673
 
                            datetime.datetime.utcnow()
2674
 
                            + client["timeout"])
 
2616
                        client["expires"] = (datetime.datetime
 
2617
                                             .utcnow()
 
2618
                                             + client["timeout"])
2675
2619
                        logger.debug("Last checker succeeded,"
2676
 
                                     " keeping {} enabled".format(
2677
 
                                         client_name))
 
2620
                                     " keeping {0} enabled"
 
2621
                                     .format(client_name))
2678
2622
            try:
2679
 
                client["secret"] = pgp.decrypt(
2680
 
                    client["encrypted_secret"],
2681
 
                    client_settings[client_name]["secret"])
 
2623
                client["secret"] = (
 
2624
                    pgp.decrypt(client["encrypted_secret"],
 
2625
                                client_settings[client_name]
 
2626
                                ["secret"]))
2682
2627
            except PGPError:
2683
2628
                # If decryption fails, we use secret from new settings
2684
 
                logger.debug("Failed to decrypt {} old secret".format(
2685
 
                    client_name))
2686
 
                client["secret"] = (client_settings[client_name]
2687
 
                                    ["secret"])
 
2629
                logger.debug("Failed to decrypt {0} old secret"
 
2630
                             .format(client_name))
 
2631
                client["secret"] = (
 
2632
                    client_settings[client_name]["secret"])
2688
2633
    
2689
2634
    # Add/remove clients based on new changes made to config
2690
2635
    for client_name in (set(old_client_settings)
2695
2640
        clients_data[client_name] = client_settings[client_name]
2696
2641
    
2697
2642
    # Create all client objects
2698
 
    for client_name, client in clients_data.items():
 
2643
    for client_name, client in clients_data.iteritems():
2699
2644
        tcp_server.clients[client_name] = client_class(
2700
 
            name = client_name,
2701
 
            settings = client,
 
2645
            name = client_name, settings = client,
2702
2646
            server_settings = server_settings)
2703
2647
    
2704
2648
    if not tcp_server.clients:
2706
2650
    
2707
2651
    if not foreground:
2708
2652
        if pidfile is not None:
2709
 
            pid = os.getpid()
2710
2653
            try:
2711
2654
                with pidfile:
2712
 
                    print(pid, file=pidfile)
 
2655
                    pid = os.getpid()
 
2656
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2713
2657
            except IOError:
2714
2658
                logger.error("Could not write to file %r with PID %d",
2715
2659
                             pidfilename, pid)
2720
2664
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2721
2665
    
2722
2666
    if use_dbus:
2723
 
        
2724
 
        @alternate_dbus_interfaces(
2725
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
2667
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2668
                                        "se.bsnet.fukt.Mandos"})
2726
2669
        class MandosDBusService(DBusObjectWithProperties):
2727
2670
            """A D-Bus proxy object"""
2728
 
            
2729
2671
            def __init__(self):
2730
2672
                dbus.service.Object.__init__(self, bus, "/")
2731
 
            
2732
2673
            _interface = "se.recompile.Mandos"
2733
2674
            
2734
2675
            @dbus_interface_annotations(_interface)
2735
2676
            def _foo(self):
2736
 
                return {
2737
 
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
2738
 
                    "false" }
 
2677
                return { "org.freedesktop.DBus.Property"
 
2678
                         ".EmitsChangedSignal":
 
2679
                             "false"}
2739
2680
            
2740
2681
            @dbus.service.signal(_interface, signature="o")
2741
2682
            def ClientAdded(self, objpath):
2755
2696
            @dbus.service.method(_interface, out_signature="ao")
2756
2697
            def GetAllClients(self):
2757
2698
                "D-Bus method"
2758
 
                return dbus.Array(c.dbus_object_path for c in
 
2699
                return dbus.Array(c.dbus_object_path
 
2700
                                  for c in
2759
2701
                                  tcp_server.clients.itervalues())
2760
2702
            
2761
2703
            @dbus.service.method(_interface,
2763
2705
            def GetAllClientsWithProperties(self):
2764
2706
                "D-Bus method"
2765
2707
                return dbus.Dictionary(
2766
 
                    { c.dbus_object_path: c.GetAll("")
2767
 
                      for c in tcp_server.clients.itervalues() },
 
2708
                    ((c.dbus_object_path, c.GetAll(""))
 
2709
                     for c in tcp_server.clients.itervalues()),
2768
2710
                    signature="oa{sv}")
2769
2711
            
2770
2712
            @dbus.service.method(_interface, in_signature="o")
2787
2729
    
2788
2730
    def cleanup():
2789
2731
        "Cleanup function; run on exit"
2790
 
        if zeroconf:
2791
 
            service.cleanup()
 
2732
        service.cleanup()
2792
2733
        
2793
2734
        multiprocessing.active_children()
2794
2735
        wnull.close()
2808
2749
                
2809
2750
                # A list of attributes that can not be pickled
2810
2751
                # + secret.
2811
 
                exclude = { "bus", "changedstate", "secret",
2812
 
                            "checker", "server_settings" }
2813
 
                for name, typ in inspect.getmembers(dbus.service
2814
 
                                                    .Object):
 
2752
                exclude = set(("bus", "changedstate", "secret",
 
2753
                               "checker", "server_settings"))
 
2754
                for name, typ in (inspect.getmembers
 
2755
                                  (dbus.service.Object)):
2815
2756
                    exclude.add(name)
2816
2757
                
2817
2758
                client_dict["encrypted_secret"] = (client
2824
2765
                del client_settings[client.name]["secret"]
2825
2766
        
2826
2767
        try:
2827
 
            with tempfile.NamedTemporaryFile(
2828
 
                    mode='wb',
2829
 
                    suffix=".pickle",
2830
 
                    prefix='clients-',
2831
 
                    dir=os.path.dirname(stored_state_path),
2832
 
                    delete=False) as stored_state:
 
2768
            with (tempfile.NamedTemporaryFile
 
2769
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2770
                   dir=os.path.dirname(stored_state_path),
 
2771
                   delete=False)) as stored_state:
2833
2772
                pickle.dump((clients, client_settings), stored_state)
2834
 
                tempname = stored_state.name
 
2773
                tempname=stored_state.name
2835
2774
            os.rename(tempname, stored_state_path)
2836
2775
        except (IOError, OSError) as e:
2837
2776
            if not debug:
2840
2779
                except NameError:
2841
2780
                    pass
2842
2781
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2843
 
                logger.warning("Could not save persistent state: {}"
 
2782
                logger.warning("Could not save persistent state: {0}"
2844
2783
                               .format(os.strerror(e.errno)))
2845
2784
            else:
2846
2785
                logger.warning("Could not save persistent state:",
2847
2786
                               exc_info=e)
2848
 
                raise
 
2787
                raise e
2849
2788
        
2850
2789
        # Delete all clients, and settings from config
2851
2790
        while tcp_server.clients:
2856
2795
            client.disable(quiet=True)
2857
2796
            if use_dbus:
2858
2797
                # Emit D-Bus signal
2859
 
                mandos_dbus_service.ClientRemoved(
2860
 
                    client.dbus_object_path, client.name)
 
2798
                mandos_dbus_service.ClientRemoved(client
 
2799
                                                  .dbus_object_path,
 
2800
                                                  client.name)
2861
2801
        client_settings.clear()
2862
2802
    
2863
2803
    atexit.register(cleanup)
2874
2814
    tcp_server.server_activate()
2875
2815
    
2876
2816
    # Find out what port we got
2877
 
    if zeroconf:
2878
 
        service.port = tcp_server.socket.getsockname()[1]
 
2817
    service.port = tcp_server.socket.getsockname()[1]
2879
2818
    if use_ipv6:
2880
2819
        logger.info("Now listening on address %r, port %d,"
2881
2820
                    " flowinfo %d, scope_id %d",
2887
2826
    #service.interface = tcp_server.socket.getsockname()[3]
2888
2827
    
2889
2828
    try:
2890
 
        if zeroconf:
2891
 
            # From the Avahi example code
2892
 
            try:
2893
 
                service.activate()
2894
 
            except dbus.exceptions.DBusException as error:
2895
 
                logger.critical("D-Bus Exception", exc_info=error)
2896
 
                cleanup()
2897
 
                sys.exit(1)
2898
 
            # End of Avahi example code
 
2829
        # From the Avahi example code
 
2830
        try:
 
2831
            service.activate()
 
2832
        except dbus.exceptions.DBusException as error:
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
 
2834
            cleanup()
 
2835
            sys.exit(1)
 
2836
        # End of Avahi example code
2899
2837
        
2900
2838
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2901
2839
                             lambda *args, **kwargs:
2916
2854
    # Must run before the D-Bus bus name gets deregistered
2917
2855
    cleanup()
2918
2856
 
2919
 
 
2920
2857
if __name__ == '__main__':
2921
2858
    main()