/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: 2014-02-16 13:12:20 UTC
  • mto: This revision was merged to the branch mainline in revision 656.
  • Revision ID: teddy@recompile.se-20140216131220-4nv9kjolkrxvn6l3
Tags: version-1.6.4-1
* Makefile (version): Changed to "1.6.4".
* NEWS (Version 1.6.4): New entry.
* debian/changelog (1.6.4-1): - '' -

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-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 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.4"
108
92
stored_state_file = "clients.pickle"
109
93
 
110
94
logger = logging.getLogger()
111
95
syslogger = None
112
96
 
113
97
try:
114
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
115
 
        ctypes.util.find_library("c")).if_nametoindex
 
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
                      (ctypes.util.find_library("c"))
 
100
                      .if_nametoindex)
116
101
except (OSError, AttributeError):
117
 
    
118
102
    def if_nametoindex(interface):
119
103
        "Get an interface index the hard way, i.e. using fcntl()"
120
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
121
105
        with contextlib.closing(socket.socket()) as s:
122
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
 
                                struct.pack(b"16s16x", interface))
124
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
107
                                struct.pack(str("16s16x"),
 
108
                                            interface))
 
109
        interface_index = struct.unpack(str("I"),
 
110
                                        ifreq[16:20])[0]
125
111
        return interface_index
126
112
 
127
113
 
128
114
def initlogger(debug, level=logging.WARNING):
129
115
    """init logger and add loglevel"""
130
116
    
131
 
    global syslogger
132
 
    syslogger = (logging.handlers.SysLogHandler(
133
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
 
        address = "/dev/log"))
 
117
    syslogger = (logging.handlers.SysLogHandler
 
118
                 (facility =
 
119
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
120
                  address = str("/dev/log")))
135
121
    syslogger.setFormatter(logging.Formatter
136
122
                           ('Mandos [%(process)d]: %(levelname)s:'
137
123
                            ' %(message)s'))
154
140
 
155
141
class PGPEngine(object):
156
142
    """A simple class for OpenPGP symmetric encryption & decryption"""
157
 
    
158
143
    def __init__(self):
159
144
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
145
        self.gnupgargs = ['--batch',
199
184
    
200
185
    def encrypt(self, data, password):
201
186
        passphrase = self.password_encode(password)
202
 
        with tempfile.NamedTemporaryFile(
203
 
                dir=self.tempdir) as passfile:
 
187
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
188
                                         ) as passfile:
204
189
            passfile.write(passphrase)
205
190
            passfile.flush()
206
191
            proc = subprocess.Popen(['gpg', '--symmetric',
217
202
    
218
203
    def decrypt(self, data, password):
219
204
        passphrase = self.password_encode(password)
220
 
        with tempfile.NamedTemporaryFile(
221
 
                dir = self.tempdir) as passfile:
 
205
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
206
                                         ) as passfile:
222
207
            passfile.write(passphrase)
223
208
            passfile.flush()
224
209
            proc = subprocess.Popen(['gpg', '--decrypt',
228
213
                                    stdin = subprocess.PIPE,
229
214
                                    stdout = subprocess.PIPE,
230
215
                                    stderr = subprocess.PIPE)
231
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
216
            decrypted_plaintext, err = proc.communicate(input
 
217
                                                        = data)
232
218
        if proc.returncode != 0:
233
219
            raise PGPError(err)
234
220
        return decrypted_plaintext
237
223
class AvahiError(Exception):
238
224
    def __init__(self, value, *args, **kwargs):
239
225
        self.value = value
240
 
        return super(AvahiError, self).__init__(value, *args,
241
 
                                                **kwargs)
242
 
 
 
226
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
227
    def __unicode__(self):
 
228
        return unicode(repr(self.value))
243
229
 
244
230
class AvahiServiceError(AvahiError):
245
231
    pass
246
232
 
247
 
 
248
233
class AvahiGroupError(AvahiError):
249
234
    pass
250
235
 
270
255
    bus: dbus.SystemBus()
271
256
    """
272
257
    
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):
 
258
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
259
                 servicetype = None, port = None, TXT = None,
 
260
                 domain = "", host = "", max_renames = 32768,
 
261
                 protocol = avahi.PROTO_UNSPEC, bus = None):
284
262
        self.interface = interface
285
263
        self.name = name
286
264
        self.type = servicetype
296
274
        self.bus = bus
297
275
        self.entry_group_state_changed_match = None
298
276
    
299
 
    def rename(self, remove=True):
 
277
    def rename(self):
300
278
        """Derived from the Avahi example code"""
301
279
        if self.rename_count >= self.max_renames:
302
280
            logger.critical("No suitable Zeroconf service name found"
303
281
                            " after %i retries, exiting.",
304
282
                            self.rename_count)
305
283
            raise AvahiServiceError("Too many renames")
306
 
        self.name = str(
307
 
            self.server.GetAlternativeServiceName(self.name))
308
 
        self.rename_count += 1
 
284
        self.name = unicode(self.server
 
285
                            .GetAlternativeServiceName(self.name))
309
286
        logger.info("Changing Zeroconf service name to %r ...",
310
287
                    self.name)
311
 
        if remove:
312
 
            self.remove()
 
288
        self.remove()
313
289
        try:
314
290
            self.add()
315
291
        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)
 
292
            logger.critical("D-Bus Exception", exc_info=error)
 
293
            self.cleanup()
 
294
            os._exit(1)
 
295
        self.rename_count += 1
324
296
    
325
297
    def remove(self):
326
298
        """Derived from the Avahi example code"""
364
336
            self.rename()
365
337
        elif state == avahi.ENTRY_GROUP_FAILURE:
366
338
            logger.critical("Avahi: Error in group state changed %s",
367
 
                            str(error))
368
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
339
                            unicode(error))
 
340
            raise AvahiGroupError("State changed: {0!s}"
 
341
                                  .format(error))
369
342
    
370
343
    def cleanup(self):
371
344
        """Derived from the Avahi example code"""
381
354
    def server_state_changed(self, state, error=None):
382
355
        """Derived from the Avahi example code"""
383
356
        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
 
        }
 
357
        bad_states = { avahi.SERVER_INVALID:
 
358
                           "Zeroconf server invalid",
 
359
                       avahi.SERVER_REGISTERING: None,
 
360
                       avahi.SERVER_COLLISION:
 
361
                           "Zeroconf server name collision",
 
362
                       avahi.SERVER_FAILURE:
 
363
                           "Zeroconf server failure" }
390
364
        if state in bad_states:
391
365
            if bad_states[state] is not None:
392
366
                if error is None:
395
369
                    logger.error(bad_states[state] + ": %r", error)
396
370
            self.cleanup()
397
371
        elif state == avahi.SERVER_RUNNING:
398
 
            try:
399
 
                self.add()
400
 
            except dbus.exceptions.DBusException as error:
401
 
                if (error.get_dbus_name()
402
 
                    == "org.freedesktop.Avahi.CollisionError"):
403
 
                    logger.info("Local Zeroconf service name"
404
 
                                " collision.")
405
 
                    return self.rename(remove=False)
406
 
                else:
407
 
                    logger.critical("D-Bus Exception", exc_info=error)
408
 
                    self.cleanup()
409
 
                    os._exit(1)
 
372
            self.add()
410
373
        else:
411
374
            if error is None:
412
375
                logger.debug("Unknown state: %r", state)
422
385
                                    follow_name_owner_changes=True),
423
386
                avahi.DBUS_INTERFACE_SERVER)
424
387
        self.server.connect_to_signal("StateChanged",
425
 
                                      self.server_state_changed)
 
388
                                 self.server_state_changed)
426
389
        self.server_state_changed(self.server.GetState())
427
390
 
428
391
 
429
392
class AvahiServiceToSyslog(AvahiService):
430
 
    def rename(self, *args, **kwargs):
 
393
    def rename(self):
431
394
        """Add the new name to the syslog messages"""
432
 
        ret = AvahiService.rename(self, *args, **kwargs)
433
 
        syslogger.setFormatter(logging.Formatter(
434
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
435
 
            .format(self.name)))
 
395
        ret = AvahiService.rename(self)
 
396
        syslogger.setFormatter(logging.Formatter
 
397
                               ('Mandos ({0}) [%(process)d]:'
 
398
                                ' %(levelname)s: %(message)s'
 
399
                                .format(self.name)))
436
400
        return ret
437
401
 
438
 
def call_pipe(connection,       # : multiprocessing.Connection
439
 
              func, *args, **kwargs):
440
 
    """This function is meant to be called by multiprocessing.Process
441
 
    
442
 
    This function runs func(*args, **kwargs), and writes the resulting
443
 
    return value on the provided multiprocessing.Connection.
444
 
    """
445
 
    connection.send(func(*args, **kwargs))
446
 
    connection.close()
 
402
 
 
403
def timedelta_to_milliseconds(td):
 
404
    "Convert a datetime.timedelta() to milliseconds"
 
405
    return ((td.days * 24 * 60 * 60 * 1000)
 
406
            + (td.seconds * 1000)
 
407
            + (td.microseconds // 1000))
 
408
 
447
409
 
448
410
class Client(object):
449
411
    """A representation of a client host served by this server.
476
438
    last_checker_status: integer between 0 and 255 reflecting exit
477
439
                         status of last checker. -1 reflects crashed
478
440
                         checker, -2 means no checker completed yet.
479
 
    last_checker_signal: The signal which killed the last checker, if
480
 
                         last_checker_status is -1
481
441
    last_enabled: datetime.datetime(); (UTC) or None
482
442
    name:       string; from the config file, used in log messages and
483
443
                        D-Bus identifiers
496
456
                          "fingerprint", "host", "interval",
497
457
                          "last_approval_request", "last_checked_ok",
498
458
                          "last_enabled", "name", "timeout")
499
 
    client_defaults = {
500
 
        "timeout": "PT5M",
501
 
        "extended_timeout": "PT15M",
502
 
        "interval": "PT2M",
503
 
        "checker": "fping -q -- %%(host)s",
504
 
        "host": "",
505
 
        "approval_delay": "PT0S",
506
 
        "approval_duration": "PT1S",
507
 
        "approved_by_default": "True",
508
 
        "enabled": "True",
509
 
    }
 
459
    client_defaults = { "timeout": "PT5M",
 
460
                        "extended_timeout": "PT15M",
 
461
                        "interval": "PT2M",
 
462
                        "checker": "fping -q -- %%(host)s",
 
463
                        "host": "",
 
464
                        "approval_delay": "PT0S",
 
465
                        "approval_duration": "PT1S",
 
466
                        "approved_by_default": "True",
 
467
                        "enabled": "True",
 
468
                        }
 
469
    
 
470
    def timeout_milliseconds(self):
 
471
        "Return the 'timeout' attribute in milliseconds"
 
472
        return timedelta_to_milliseconds(self.timeout)
 
473
    
 
474
    def extended_timeout_milliseconds(self):
 
475
        "Return the 'extended_timeout' attribute in milliseconds"
 
476
        return timedelta_to_milliseconds(self.extended_timeout)
 
477
    
 
478
    def interval_milliseconds(self):
 
479
        "Return the 'interval' attribute in milliseconds"
 
480
        return timedelta_to_milliseconds(self.interval)
 
481
    
 
482
    def approval_delay_milliseconds(self):
 
483
        return timedelta_to_milliseconds(self.approval_delay)
510
484
    
511
485
    @staticmethod
512
486
    def config_parser(config):
528
502
            client["enabled"] = config.getboolean(client_name,
529
503
                                                  "enabled")
530
504
            
531
 
            # Uppercase and remove spaces from fingerprint for later
532
 
            # comparison purposes with return value from the
533
 
            # fingerprint() function
534
505
            client["fingerprint"] = (section["fingerprint"].upper()
535
506
                                     .replace(" ", ""))
536
507
            if "secret" in section:
541
512
                          "rb") as secfile:
542
513
                    client["secret"] = secfile.read()
543
514
            else:
544
 
                raise TypeError("No secret or secfile for section {}"
 
515
                raise TypeError("No secret or secfile for section {0}"
545
516
                                .format(section))
546
517
            client["timeout"] = string_to_delta(section["timeout"])
547
518
            client["extended_timeout"] = string_to_delta(
564
535
            server_settings = {}
565
536
        self.server_settings = server_settings
566
537
        # adding all client settings
567
 
        for setting, value in settings.items():
 
538
        for setting, value in settings.iteritems():
568
539
            setattr(self, setting, value)
569
540
        
570
541
        if self.enabled:
578
549
            self.expires = None
579
550
        
580
551
        logger.debug("Creating client %r", self.name)
 
552
        # Uppercase and remove spaces from fingerprint for later
 
553
        # comparison purposes with return value from the fingerprint()
 
554
        # function
581
555
        logger.debug("  Fingerprint: %s", self.fingerprint)
582
556
        self.created = settings.get("created",
583
557
                                    datetime.datetime.utcnow())
590
564
        self.current_checker_command = None
591
565
        self.approved = None
592
566
        self.approvals_pending = 0
593
 
        self.changedstate = multiprocessing_manager.Condition(
594
 
            multiprocessing_manager.Lock())
595
 
        self.client_structure = [attr
596
 
                                 for attr in self.__dict__.iterkeys()
 
567
        self.changedstate = (multiprocessing_manager
 
568
                             .Condition(multiprocessing_manager
 
569
                                        .Lock()))
 
570
        self.client_structure = [attr for attr in
 
571
                                 self.__dict__.iterkeys()
597
572
                                 if not attr.startswith("_")]
598
573
        self.client_structure.append("client_structure")
599
574
        
600
 
        for name, t in inspect.getmembers(
601
 
                type(self), lambda obj: isinstance(obj, property)):
 
575
        for name, t in inspect.getmembers(type(self),
 
576
                                          lambda obj:
 
577
                                              isinstance(obj,
 
578
                                                         property)):
602
579
            if not name.startswith("_"):
603
580
                self.client_structure.append(name)
604
581
    
646
623
        # and every interval from then on.
647
624
        if self.checker_initiator_tag is not None:
648
625
            gobject.source_remove(self.checker_initiator_tag)
649
 
        self.checker_initiator_tag = gobject.timeout_add(
650
 
            int(self.interval.total_seconds() * 1000),
651
 
            self.start_checker)
 
626
        self.checker_initiator_tag = (gobject.timeout_add
 
627
                                      (self.interval_milliseconds(),
 
628
                                       self.start_checker))
652
629
        # Schedule a disable() when 'timeout' has passed
653
630
        if self.disable_initiator_tag is not None:
654
631
            gobject.source_remove(self.disable_initiator_tag)
655
 
        self.disable_initiator_tag = gobject.timeout_add(
656
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
632
        self.disable_initiator_tag = (gobject.timeout_add
 
633
                                   (self.timeout_milliseconds(),
 
634
                                    self.disable))
657
635
        # Also start a new checker *right now*.
658
636
        self.start_checker()
659
637
    
660
 
    def checker_callback(self, source, condition, connection,
661
 
                         command):
 
638
    def checker_callback(self, pid, condition, command):
662
639
        """The checker has completed, so take appropriate actions."""
663
640
        self.checker_callback_tag = None
664
641
        self.checker = None
665
 
        # Read return code from connection (see call_pipe)
666
 
        returncode = connection.recv()
667
 
        connection.close()
668
 
        
669
 
        if returncode >= 0:
670
 
            self.last_checker_status = returncode
671
 
            self.last_checker_signal = None
 
642
        if os.WIFEXITED(condition):
 
643
            self.last_checker_status = os.WEXITSTATUS(condition)
672
644
            if self.last_checker_status == 0:
673
645
                logger.info("Checker for %(name)s succeeded",
674
646
                            vars(self))
675
647
                self.checked_ok()
676
648
            else:
677
 
                logger.info("Checker for %(name)s failed", vars(self))
 
649
                logger.info("Checker for %(name)s failed",
 
650
                            vars(self))
678
651
        else:
679
652
            self.last_checker_status = -1
680
 
            self.last_checker_signal = -returncode
681
653
            logger.warning("Checker for %(name)s crashed?",
682
654
                           vars(self))
683
 
        return False
684
655
    
685
656
    def checked_ok(self):
686
657
        """Assert that the client has been seen, alive and well."""
687
658
        self.last_checked_ok = datetime.datetime.utcnow()
688
659
        self.last_checker_status = 0
689
 
        self.last_checker_signal = None
690
660
        self.bump_timeout()
691
661
    
692
662
    def bump_timeout(self, timeout=None):
697
667
            gobject.source_remove(self.disable_initiator_tag)
698
668
            self.disable_initiator_tag = None
699
669
        if getattr(self, "enabled", False):
700
 
            self.disable_initiator_tag = gobject.timeout_add(
701
 
                int(timeout.total_seconds() * 1000), self.disable)
 
670
            self.disable_initiator_tag = (gobject.timeout_add
 
671
                                          (timedelta_to_milliseconds
 
672
                                           (timeout), self.disable))
702
673
            self.expires = datetime.datetime.utcnow() + timeout
703
674
    
704
675
    def need_approval(self):
718
689
        # than 'timeout' for the client to be disabled, which is as it
719
690
        # should be.
720
691
        
721
 
        if self.checker is not None and not self.checker.is_alive():
722
 
            logger.warning("Checker was not alive; joining")
723
 
            self.checker.join()
724
 
            self.checker = None
 
692
        # If a checker exists, make sure it is not a zombie
 
693
        try:
 
694
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
695
        except AttributeError:
 
696
            pass
 
697
        except OSError as error:
 
698
            if error.errno != errno.ECHILD:
 
699
                raise
 
700
        else:
 
701
            if pid:
 
702
                logger.warning("Checker was a zombie")
 
703
                gobject.source_remove(self.checker_callback_tag)
 
704
                self.checker_callback(pid, status,
 
705
                                      self.current_checker_command)
725
706
        # Start a new checker if needed
726
707
        if self.checker is None:
727
708
            # Escape attributes for the shell
728
 
            escaped_attrs = {
729
 
                attr: re.escape(str(getattr(self, attr)))
730
 
                for attr in self.runtime_expansions }
 
709
            escaped_attrs = dict(
 
710
                (attr, re.escape(unicode(getattr(self, attr))))
 
711
                for attr in
 
712
                self.runtime_expansions)
731
713
            try:
732
714
                command = self.checker_command % escaped_attrs
733
715
            except TypeError as error:
734
716
                logger.error('Could not format string "%s"',
735
 
                             self.checker_command,
 
717
                             self.checker_command, exc_info=error)
 
718
                return True # Try again later
 
719
            self.current_checker_command = command
 
720
            try:
 
721
                logger.info("Starting checker %r for %s",
 
722
                            command, self.name)
 
723
                # We don't need to redirect stdout and stderr, since
 
724
                # in normal mode, that is already done by daemon(),
 
725
                # and in debug mode we don't want to.  (Stdin is
 
726
                # always replaced by /dev/null.)
 
727
                # The exception is when not debugging but nevertheless
 
728
                # running in the foreground; use the previously
 
729
                # created wnull.
 
730
                popen_args = {}
 
731
                if (not self.server_settings["debug"]
 
732
                    and self.server_settings["foreground"]):
 
733
                    popen_args.update({"stdout": wnull,
 
734
                                       "stderr": wnull })
 
735
                self.checker = subprocess.Popen(command,
 
736
                                                close_fds=True,
 
737
                                                shell=True, cwd="/",
 
738
                                                **popen_args)
 
739
            except OSError as error:
 
740
                logger.error("Failed to start subprocess",
736
741
                             exc_info=error)
737
 
                return True     # Try again later
738
 
            self.current_checker_command = command
739
 
            logger.info("Starting checker %r for %s", command,
740
 
                        self.name)
741
 
            # We don't need to redirect stdout and stderr, since
742
 
            # in normal mode, that is already done by daemon(),
743
 
            # and in debug mode we don't want to.  (Stdin is
744
 
            # always replaced by /dev/null.)
745
 
            # The exception is when not debugging but nevertheless
746
 
            # running in the foreground; use the previously
747
 
            # created wnull.
748
 
            popen_args = { "close_fds": True,
749
 
                           "shell": True,
750
 
                           "cwd": "/" }
751
 
            if (not self.server_settings["debug"]
752
 
                and self.server_settings["foreground"]):
753
 
                popen_args.update({"stdout": wnull,
754
 
                                   "stderr": wnull })
755
 
            pipe = multiprocessing.Pipe(duplex = False)
756
 
            self.checker = multiprocessing.Process(
757
 
                target = call_pipe,
758
 
                args = (pipe[1], subprocess.call, command),
759
 
                kwargs = popen_args)
760
 
            self.checker.start()
761
 
            self.checker_callback_tag = gobject.io_add_watch(
762
 
                pipe[0].fileno(), gobject.IO_IN,
763
 
                self.checker_callback, pipe[0], command)
 
742
                return True
 
743
            self.checker_callback_tag = (gobject.child_watch_add
 
744
                                         (self.checker.pid,
 
745
                                          self.checker_callback,
 
746
                                          data=command))
 
747
            # The checker may have completed before the gobject
 
748
            # watch was added.  Check for this.
 
749
            try:
 
750
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
751
            except OSError as error:
 
752
                if error.errno == errno.ECHILD:
 
753
                    # This should never happen
 
754
                    logger.error("Child process vanished",
 
755
                                 exc_info=error)
 
756
                    return True
 
757
                raise
 
758
            if pid:
 
759
                gobject.source_remove(self.checker_callback_tag)
 
760
                self.checker_callback(pid, status, command)
764
761
        # Re-run this periodically if run by gobject.timeout_add
765
762
        return True
766
763
    
772
769
        if getattr(self, "checker", None) is None:
773
770
            return
774
771
        logger.debug("Stopping checker for %(name)s", vars(self))
775
 
        self.checker.terminate()
 
772
        try:
 
773
            self.checker.terminate()
 
774
            #time.sleep(0.5)
 
775
            #if self.checker.poll() is None:
 
776
            #    self.checker.kill()
 
777
        except OSError as error:
 
778
            if error.errno != errno.ESRCH: # No such process
 
779
                raise
776
780
        self.checker = None
777
781
 
778
782
 
779
 
def dbus_service_property(dbus_interface,
780
 
                          signature="v",
781
 
                          access="readwrite",
782
 
                          byte_arrays=False):
 
783
def dbus_service_property(dbus_interface, signature="v",
 
784
                          access="readwrite", byte_arrays=False):
783
785
    """Decorators for marking methods of a DBusObjectWithProperties to
784
786
    become properties on the D-Bus.
785
787
    
794
796
    # "Set" method, so we fail early here:
795
797
    if byte_arrays and signature != "ay":
796
798
        raise ValueError("Byte arrays not supported for non-'ay'"
797
 
                         " signature {!r}".format(signature))
798
 
    
 
799
                         " signature {0!r}".format(signature))
799
800
    def decorator(func):
800
801
        func._dbus_is_property = True
801
802
        func._dbus_interface = dbus_interface
806
807
            func._dbus_name = func._dbus_name[:-14]
807
808
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
808
809
        return func
809
 
    
810
810
    return decorator
811
811
 
812
812
 
821
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
822
822
                    "false"}
823
823
    """
824
 
    
825
824
    def decorator(func):
826
825
        func._dbus_is_interface = True
827
826
        func._dbus_interface = dbus_interface
828
827
        func._dbus_name = dbus_interface
829
828
        return func
830
 
    
831
829
    return decorator
832
830
 
833
831
 
835
833
    """Decorator to annotate D-Bus methods, signals or properties
836
834
    Usage:
837
835
    
838
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
 
                       "org.freedesktop.DBus.Property."
840
 
                       "EmitsChangedSignal": "false"})
841
836
    @dbus_service_property("org.example.Interface", signature="b",
842
837
                           access="r")
 
838
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
839
                        "org.freedesktop.DBus.Property."
 
840
                        "EmitsChangedSignal": "false"})
843
841
    def Property_dbus_property(self):
844
842
        return dbus.Boolean(False)
845
843
    """
846
 
    
847
844
    def decorator(func):
848
845
        func._dbus_annotations = annotations
849
846
        return func
850
 
    
851
847
    return decorator
852
848
 
853
849
 
854
850
class DBusPropertyException(dbus.exceptions.DBusException):
855
851
    """A base class for D-Bus property-related exceptions
856
852
    """
857
 
    pass
 
853
    def __unicode__(self):
 
854
        return unicode(str(self))
858
855
 
859
856
 
860
857
class DBusPropertyAccessException(DBusPropertyException):
884
881
        If called like _is_dbus_thing("method") it returns a function
885
882
        suitable for use as predicate to inspect.getmembers().
886
883
        """
887
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
884
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
885
                                   False)
889
886
    
890
887
    def _get_all_dbus_things(self, thing):
891
888
        """Returns a generator of (name, attribute) pairs
892
889
        """
893
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
890
        return ((getattr(athing.__get__(self), "_dbus_name",
 
891
                         name),
894
892
                 athing.__get__(self))
895
893
                for cls in self.__class__.__mro__
896
894
                for name, athing in
897
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
895
                inspect.getmembers(cls,
 
896
                                   self._is_dbus_thing(thing)))
898
897
    
899
898
    def _get_dbus_property(self, interface_name, property_name):
900
899
        """Returns a bound method if one exists which is a D-Bus
901
900
        property with the specified name and interface.
902
901
        """
903
 
        for cls in self.__class__.__mro__:
904
 
            for name, value in inspect.getmembers(
905
 
                    cls, self._is_dbus_thing("property")):
 
902
        for cls in  self.__class__.__mro__:
 
903
            for name, value in (inspect.getmembers
 
904
                                (cls,
 
905
                                 self._is_dbus_thing("property"))):
906
906
                if (value._dbus_name == property_name
907
907
                    and value._dbus_interface == interface_name):
908
908
                    return value.__get__(self)
909
909
        
910
910
        # No such property
911
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
912
 
            self.dbus_object_path, interface_name, property_name))
 
911
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
912
                                   + interface_name + "."
 
913
                                   + property_name)
913
914
    
914
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
915
 
                         in_signature="ss",
 
915
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
916
                         out_signature="v")
917
917
    def Get(self, interface_name, property_name):
918
918
        """Standard D-Bus property Get() method, see D-Bus standard.
937
937
            # signatures other than "ay".
938
938
            if prop._dbus_signature != "ay":
939
939
                raise ValueError("Byte arrays not supported for non-"
940
 
                                 "'ay' signature {!r}"
 
940
                                 "'ay' signature {0!r}"
941
941
                                 .format(prop._dbus_signature))
942
942
            value = dbus.ByteArray(b''.join(chr(byte)
943
943
                                            for byte in value))
944
944
        prop(value)
945
945
    
946
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
947
 
                         in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
948
947
                         out_signature="a{sv}")
949
948
    def GetAll(self, interface_name):
950
949
        """Standard D-Bus property GetAll() method, see D-Bus
965
964
            if not hasattr(value, "variant_level"):
966
965
                properties[name] = value
967
966
                continue
968
 
            properties[name] = type(value)(
969
 
                value, variant_level = value.variant_level + 1)
 
967
            properties[name] = type(value)(value, variant_level=
 
968
                                           value.variant_level+1)
970
969
        return dbus.Dictionary(properties, signature="sv")
971
970
    
972
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
 
    def PropertiesChanged(self, interface_name, changed_properties,
974
 
                          invalidated_properties):
975
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
976
 
        standard.
977
 
        """
978
 
        pass
979
 
    
980
971
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
972
                         out_signature="s",
982
973
                         path_keyword='object_path',
990
981
                                                   connection)
991
982
        try:
992
983
            document = xml.dom.minidom.parseString(xmlstring)
993
 
            
994
984
            def make_tag(document, name, prop):
995
985
                e = document.createElement("property")
996
986
                e.setAttribute("name", name)
997
987
                e.setAttribute("type", prop._dbus_signature)
998
988
                e.setAttribute("access", prop._dbus_access)
999
989
                return e
1000
 
            
1001
990
            for if_tag in document.getElementsByTagName("interface"):
1002
991
                # Add property tags
1003
992
                for tag in (make_tag(document, name, prop)
1015
1004
                            if (name == tag.getAttribute("name")
1016
1005
                                and prop._dbus_interface
1017
1006
                                == if_tag.getAttribute("name")):
1018
 
                                annots.update(getattr(
1019
 
                                    prop, "_dbus_annotations", {}))
1020
 
                        for name, value in annots.items():
 
1007
                                annots.update(getattr
 
1008
                                              (prop,
 
1009
                                               "_dbus_annotations",
 
1010
                                               {}))
 
1011
                        for name, value in annots.iteritems():
1021
1012
                            ann_tag = document.createElement(
1022
1013
                                "annotation")
1023
1014
                            ann_tag.setAttribute("name", name)
1026
1017
                # Add interface annotation tags
1027
1018
                for annotation, value in dict(
1028
1019
                    itertools.chain.from_iterable(
1029
 
                        annotations().items()
1030
 
                        for name, annotations
1031
 
                        in self._get_all_dbus_things("interface")
 
1020
                        annotations().iteritems()
 
1021
                        for name, annotations in
 
1022
                        self._get_all_dbus_things("interface")
1032
1023
                        if name == if_tag.getAttribute("name")
1033
 
                        )).items():
 
1024
                        )).iteritems():
1034
1025
                    ann_tag = document.createElement("annotation")
1035
1026
                    ann_tag.setAttribute("name", annotation)
1036
1027
                    ann_tag.setAttribute("value", value)
1063
1054
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1064
1055
    if dt is None:
1065
1056
        return dbus.String("", variant_level = variant_level)
1066
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1057
    return dbus.String(dt.isoformat(),
 
1058
                       variant_level=variant_level)
1067
1059
 
1068
1060
 
1069
1061
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1089
1081
    (from DBusObjectWithProperties) and interfaces (from the
1090
1082
    dbus_interface_annotations decorator).
1091
1083
    """
1092
 
    
1093
1084
    def wrapper(cls):
1094
1085
        for orig_interface_name, alt_interface_name in (
1095
 
                alt_interface_names.items()):
 
1086
            alt_interface_names.iteritems()):
1096
1087
            attr = {}
1097
1088
            interface_names = set()
1098
1089
            # Go though all attributes of the class
1100
1091
                # Ignore non-D-Bus attributes, and D-Bus attributes
1101
1092
                # with the wrong interface name
1102
1093
                if (not hasattr(attribute, "_dbus_interface")
1103
 
                    or not attribute._dbus_interface.startswith(
1104
 
                        orig_interface_name)):
 
1094
                    or not attribute._dbus_interface
 
1095
                    .startswith(orig_interface_name)):
1105
1096
                    continue
1106
1097
                # Create an alternate D-Bus interface name based on
1107
1098
                # the current name
1108
 
                alt_interface = attribute._dbus_interface.replace(
1109
 
                    orig_interface_name, alt_interface_name)
 
1099
                alt_interface = (attribute._dbus_interface
 
1100
                                 .replace(orig_interface_name,
 
1101
                                          alt_interface_name))
1110
1102
                interface_names.add(alt_interface)
1111
1103
                # Is this a D-Bus signal?
1112
1104
                if getattr(attribute, "_dbus_is_signal", False):
1113
 
                    if sys.version_info.major == 2:
1114
 
                        # Extract the original non-method undecorated
1115
 
                        # function by black magic
1116
 
                        nonmethod_func = (dict(
 
1105
                    # Extract the original non-method undecorated
 
1106
                    # function by black magic
 
1107
                    nonmethod_func = (dict(
1117
1108
                            zip(attribute.func_code.co_freevars,
1118
 
                                attribute.__closure__))
1119
 
                                          ["func"].cell_contents)
1120
 
                    else:
1121
 
                        nonmethod_func = attribute
 
1109
                                attribute.__closure__))["func"]
 
1110
                                      .cell_contents)
1122
1111
                    # Create a new, but exactly alike, function
1123
1112
                    # object, and decorate it to be a new D-Bus signal
1124
1113
                    # with the alternate D-Bus interface name
1125
 
                    if sys.version_info.major == 2:
1126
 
                        new_function = types.FunctionType(
1127
 
                            nonmethod_func.func_code,
1128
 
                            nonmethod_func.func_globals,
1129
 
                            nonmethod_func.func_name,
1130
 
                            nonmethod_func.func_defaults,
1131
 
                            nonmethod_func.func_closure)
1132
 
                    else:
1133
 
                        new_function = types.FunctionType(
1134
 
                            nonmethod_func.__code__,
1135
 
                            nonmethod_func.__globals__,
1136
 
                            nonmethod_func.__name__,
1137
 
                            nonmethod_func.__defaults__,
1138
 
                            nonmethod_func.__closure__)
1139
 
                    new_function = (dbus.service.signal(
1140
 
                        alt_interface,
1141
 
                        attribute._dbus_signature)(new_function))
 
1114
                    new_function = (dbus.service.signal
 
1115
                                    (alt_interface,
 
1116
                                     attribute._dbus_signature)
 
1117
                                    (types.FunctionType(
 
1118
                                nonmethod_func.func_code,
 
1119
                                nonmethod_func.func_globals,
 
1120
                                nonmethod_func.func_name,
 
1121
                                nonmethod_func.func_defaults,
 
1122
                                nonmethod_func.func_closure)))
1142
1123
                    # Copy annotations, if any
1143
1124
                    try:
1144
 
                        new_function._dbus_annotations = dict(
1145
 
                            attribute._dbus_annotations)
 
1125
                        new_function._dbus_annotations = (
 
1126
                            dict(attribute._dbus_annotations))
1146
1127
                    except AttributeError:
1147
1128
                        pass
1148
1129
                    # Define a creator of a function to call both the
1153
1134
                        """This function is a scope container to pass
1154
1135
                        func1 and func2 to the "call_both" function
1155
1136
                        outside of its arguments"""
1156
 
                        
1157
1137
                        def call_both(*args, **kwargs):
1158
1138
                            """This function will emit two D-Bus
1159
1139
                            signals by calling func1 and func2"""
1160
1140
                            func1(*args, **kwargs)
1161
1141
                            func2(*args, **kwargs)
1162
 
                        
1163
1142
                        return call_both
1164
1143
                    # Create the "call_both" function and add it to
1165
1144
                    # the class
1170
1149
                    # object.  Decorate it to be a new D-Bus method
1171
1150
                    # with the alternate D-Bus interface name.  Add it
1172
1151
                    # to the class.
1173
 
                    attr[attrname] = (
1174
 
                        dbus.service.method(
1175
 
                            alt_interface,
1176
 
                            attribute._dbus_in_signature,
1177
 
                            attribute._dbus_out_signature)
1178
 
                        (types.FunctionType(attribute.func_code,
1179
 
                                            attribute.func_globals,
1180
 
                                            attribute.func_name,
1181
 
                                            attribute.func_defaults,
1182
 
                                            attribute.func_closure)))
 
1152
                    attr[attrname] = (dbus.service.method
 
1153
                                      (alt_interface,
 
1154
                                       attribute._dbus_in_signature,
 
1155
                                       attribute._dbus_out_signature)
 
1156
                                      (types.FunctionType
 
1157
                                       (attribute.func_code,
 
1158
                                        attribute.func_globals,
 
1159
                                        attribute.func_name,
 
1160
                                        attribute.func_defaults,
 
1161
                                        attribute.func_closure)))
1183
1162
                    # Copy annotations, if any
1184
1163
                    try:
1185
 
                        attr[attrname]._dbus_annotations = dict(
1186
 
                            attribute._dbus_annotations)
 
1164
                        attr[attrname]._dbus_annotations = (
 
1165
                            dict(attribute._dbus_annotations))
1187
1166
                    except AttributeError:
1188
1167
                        pass
1189
1168
                # Is this a D-Bus property?
1192
1171
                    # object, and decorate it to be a new D-Bus
1193
1172
                    # property with the alternate D-Bus interface
1194
1173
                    # name.  Add it to the class.
1195
 
                    attr[attrname] = (dbus_service_property(
1196
 
                        alt_interface, attribute._dbus_signature,
1197
 
                        attribute._dbus_access,
1198
 
                        attribute._dbus_get_args_options
1199
 
                        ["byte_arrays"])
1200
 
                                      (types.FunctionType(
1201
 
                                          attribute.func_code,
1202
 
                                          attribute.func_globals,
1203
 
                                          attribute.func_name,
1204
 
                                          attribute.func_defaults,
1205
 
                                          attribute.func_closure)))
 
1174
                    attr[attrname] = (dbus_service_property
 
1175
                                      (alt_interface,
 
1176
                                       attribute._dbus_signature,
 
1177
                                       attribute._dbus_access,
 
1178
                                       attribute
 
1179
                                       ._dbus_get_args_options
 
1180
                                       ["byte_arrays"])
 
1181
                                      (types.FunctionType
 
1182
                                       (attribute.func_code,
 
1183
                                        attribute.func_globals,
 
1184
                                        attribute.func_name,
 
1185
                                        attribute.func_defaults,
 
1186
                                        attribute.func_closure)))
1206
1187
                    # Copy annotations, if any
1207
1188
                    try:
1208
 
                        attr[attrname]._dbus_annotations = dict(
1209
 
                            attribute._dbus_annotations)
 
1189
                        attr[attrname]._dbus_annotations = (
 
1190
                            dict(attribute._dbus_annotations))
1210
1191
                    except AttributeError:
1211
1192
                        pass
1212
1193
                # Is this a D-Bus interface?
1215
1196
                    # object.  Decorate it to be a new D-Bus interface
1216
1197
                    # with the alternate D-Bus interface name.  Add it
1217
1198
                    # to the class.
1218
 
                    attr[attrname] = (
1219
 
                        dbus_interface_annotations(alt_interface)
1220
 
                        (types.FunctionType(attribute.func_code,
1221
 
                                            attribute.func_globals,
1222
 
                                            attribute.func_name,
1223
 
                                            attribute.func_defaults,
1224
 
                                            attribute.func_closure)))
 
1199
                    attr[attrname] = (dbus_interface_annotations
 
1200
                                      (alt_interface)
 
1201
                                      (types.FunctionType
 
1202
                                       (attribute.func_code,
 
1203
                                        attribute.func_globals,
 
1204
                                        attribute.func_name,
 
1205
                                        attribute.func_defaults,
 
1206
                                        attribute.func_closure)))
1225
1207
            if deprecate:
1226
1208
                # Deprecate all alternate interfaces
1227
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1209
                iname="_AlternateDBusNames_interface_annotation{0}"
1228
1210
                for interface_name in interface_names:
1229
 
                    
1230
1211
                    @dbus_interface_annotations(interface_name)
1231
1212
                    def func(self):
1232
1213
                        return { "org.freedesktop.DBus.Deprecated":
1233
 
                                 "true" }
 
1214
                                     "true" }
1234
1215
                    # Find an unused name
1235
1216
                    for aname in (iname.format(i)
1236
1217
                                  for i in itertools.count()):
1240
1221
            if interface_names:
1241
1222
                # Replace the class with a new subclass of it with
1242
1223
                # methods, signals, etc. as created above.
1243
 
                cls = type(b"{}Alternate".format(cls.__name__),
1244
 
                           (cls, ), attr)
 
1224
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1225
                           (cls,), attr)
1245
1226
        return cls
1246
 
    
1247
1227
    return wrapper
1248
1228
 
1249
1229
 
1250
1230
@alternate_dbus_interfaces({"se.recompile.Mandos":
1251
 
                            "se.bsnet.fukt.Mandos"})
 
1231
                                "se.bsnet.fukt.Mandos"})
1252
1232
class ClientDBus(Client, DBusObjectWithProperties):
1253
1233
    """A Client class using D-Bus
1254
1234
    
1258
1238
    """
1259
1239
    
1260
1240
    runtime_expansions = (Client.runtime_expansions
1261
 
                          + ("dbus_object_path", ))
1262
 
    
1263
 
    _interface = "se.recompile.Mandos.Client"
 
1241
                          + ("dbus_object_path",))
1264
1242
    
1265
1243
    # dbus.service.Object doesn't use super(), so we can't either.
1266
1244
    
1269
1247
        Client.__init__(self, *args, **kwargs)
1270
1248
        # Only now, when this client is initialized, can it show up on
1271
1249
        # the D-Bus
1272
 
        client_object_name = str(self.name).translate(
 
1250
        client_object_name = unicode(self.name).translate(
1273
1251
            {ord("."): ord("_"),
1274
1252
             ord("-"): ord("_")})
1275
 
        self.dbus_object_path = dbus.ObjectPath(
1276
 
            "/clients/" + client_object_name)
 
1253
        self.dbus_object_path = (dbus.ObjectPath
 
1254
                                 ("/clients/" + client_object_name))
1277
1255
        DBusObjectWithProperties.__init__(self, self.bus,
1278
1256
                                          self.dbus_object_path)
1279
1257
    
1280
 
    def notifychangeproperty(transform_func, dbus_name,
1281
 
                             type_func=lambda x: x,
1282
 
                             variant_level=1,
1283
 
                             invalidate_only=False,
1284
 
                             _interface=_interface):
 
1258
    def notifychangeproperty(transform_func,
 
1259
                             dbus_name, type_func=lambda x: x,
 
1260
                             variant_level=1):
1285
1261
        """ Modify a variable so that it's a property which announces
1286
1262
        its changes to DBus.
1287
1263
        
1292
1268
                   to the D-Bus.  Default: no transform
1293
1269
        variant_level: D-Bus variant level.  Default: 1
1294
1270
        """
1295
 
        attrname = "_{}".format(dbus_name)
1296
 
        
 
1271
        attrname = "_{0}".format(dbus_name)
1297
1272
        def setter(self, value):
1298
1273
            if hasattr(self, "dbus_object_path"):
1299
1274
                if (not hasattr(self, attrname) or
1300
1275
                    type_func(getattr(self, attrname, None))
1301
1276
                    != type_func(value)):
1302
 
                    if invalidate_only:
1303
 
                        self.PropertiesChanged(
1304
 
                            _interface, dbus.Dictionary(),
1305
 
                            dbus.Array((dbus_name, )))
1306
 
                    else:
1307
 
                        dbus_value = transform_func(
1308
 
                            type_func(value),
1309
 
                            variant_level = variant_level)
1310
 
                        self.PropertyChanged(dbus.String(dbus_name),
1311
 
                                             dbus_value)
1312
 
                        self.PropertiesChanged(
1313
 
                            _interface,
1314
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1315
 
                                              dbus_value }),
1316
 
                            dbus.Array())
 
1277
                    dbus_value = transform_func(type_func(value),
 
1278
                                                variant_level
 
1279
                                                =variant_level)
 
1280
                    self.PropertyChanged(dbus.String(dbus_name),
 
1281
                                         dbus_value)
1317
1282
            setattr(self, attrname, value)
1318
1283
        
1319
1284
        return property(lambda self: getattr(self, attrname), setter)
1325
1290
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
1291
    last_enabled = notifychangeproperty(datetime_to_dbus,
1327
1292
                                        "LastEnabled")
1328
 
    checker = notifychangeproperty(
1329
 
        dbus.Boolean, "CheckerRunning",
1330
 
        type_func = lambda checker: checker is not None)
 
1293
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1294
                                   type_func = lambda checker:
 
1295
                                       checker is not None)
1331
1296
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1332
1297
                                           "LastCheckedOK")
1333
1298
    last_checker_status = notifychangeproperty(dbus.Int16,
1336
1301
        datetime_to_dbus, "LastApprovalRequest")
1337
1302
    approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1303
                                               "ApprovedByDefault")
1339
 
    approval_delay = notifychangeproperty(
1340
 
        dbus.UInt64, "ApprovalDelay",
1341
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1304
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1305
                                          "ApprovalDelay",
 
1306
                                          type_func =
 
1307
                                          timedelta_to_milliseconds)
1342
1308
    approval_duration = notifychangeproperty(
1343
1309
        dbus.UInt64, "ApprovalDuration",
1344
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1310
        type_func = timedelta_to_milliseconds)
1345
1311
    host = notifychangeproperty(dbus.String, "Host")
1346
 
    timeout = notifychangeproperty(
1347
 
        dbus.UInt64, "Timeout",
1348
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1312
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1313
                                   type_func =
 
1314
                                   timedelta_to_milliseconds)
1349
1315
    extended_timeout = notifychangeproperty(
1350
1316
        dbus.UInt64, "ExtendedTimeout",
1351
 
        type_func = lambda td: td.total_seconds() * 1000)
1352
 
    interval = notifychangeproperty(
1353
 
        dbus.UInt64, "Interval",
1354
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1317
        type_func = timedelta_to_milliseconds)
 
1318
    interval = notifychangeproperty(dbus.UInt64,
 
1319
                                    "Interval",
 
1320
                                    type_func =
 
1321
                                    timedelta_to_milliseconds)
1355
1322
    checker_command = notifychangeproperty(dbus.String, "Checker")
1356
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
 
                                  invalidate_only=True)
1358
1323
    
1359
1324
    del notifychangeproperty
1360
1325
    
1367
1332
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1333
        Client.__del__(self, *args, **kwargs)
1369
1334
    
1370
 
    def checker_callback(self, source, condition,
1371
 
                         connection, command, *args, **kwargs):
1372
 
        ret = Client.checker_callback(self, source, condition,
1373
 
                                      connection, command, *args,
1374
 
                                      **kwargs)
1375
 
        exitstatus = self.last_checker_status
1376
 
        if exitstatus >= 0:
 
1335
    def checker_callback(self, pid, condition, command,
 
1336
                         *args, **kwargs):
 
1337
        self.checker_callback_tag = None
 
1338
        self.checker = None
 
1339
        if os.WIFEXITED(condition):
 
1340
            exitstatus = os.WEXITSTATUS(condition)
1377
1341
            # Emit D-Bus signal
1378
1342
            self.CheckerCompleted(dbus.Int16(exitstatus),
1379
 
                                  dbus.Int64(0),
 
1343
                                  dbus.Int64(condition),
1380
1344
                                  dbus.String(command))
1381
1345
        else:
1382
1346
            # Emit D-Bus signal
1383
1347
            self.CheckerCompleted(dbus.Int16(-1),
1384
 
                                  dbus.Int64(
1385
 
                                      self.last_checker_signal),
 
1348
                                  dbus.Int64(condition),
1386
1349
                                  dbus.String(command))
1387
 
        return ret
 
1350
        
 
1351
        return Client.checker_callback(self, pid, condition, command,
 
1352
                                       *args, **kwargs)
1388
1353
    
1389
1354
    def start_checker(self, *args, **kwargs):
1390
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1355
        old_checker = self.checker
 
1356
        if self.checker is not None:
 
1357
            old_checker_pid = self.checker.pid
 
1358
        else:
 
1359
            old_checker_pid = None
1391
1360
        r = Client.start_checker(self, *args, **kwargs)
1392
1361
        # Only if new checker process was started
1393
1362
        if (self.checker is not None
1402
1371
    
1403
1372
    def approve(self, value=True):
1404
1373
        self.approved = value
1405
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1406
 
                                * 1000), self._reset_approved)
 
1374
        gobject.timeout_add(timedelta_to_milliseconds
 
1375
                            (self.approval_duration),
 
1376
                            self._reset_approved)
1407
1377
        self.send_changedstate()
1408
1378
    
1409
1379
    ## D-Bus methods, signals & properties
 
1380
    _interface = "se.recompile.Mandos.Client"
1410
1381
    
1411
1382
    ## Interfaces
1412
1383
    
 
1384
    @dbus_interface_annotations(_interface)
 
1385
    def _foo(self):
 
1386
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1387
                     "false"}
 
1388
    
1413
1389
    ## Signals
1414
1390
    
1415
1391
    # CheckerCompleted - signal
1425
1401
        pass
1426
1402
    
1427
1403
    # PropertyChanged - signal
1428
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1429
1404
    @dbus.service.signal(_interface, signature="sv")
1430
1405
    def PropertyChanged(self, property, value):
1431
1406
        "D-Bus signal"
1495
1470
        return dbus.Boolean(bool(self.approvals_pending))
1496
1471
    
1497
1472
    # ApprovedByDefault - property
1498
 
    @dbus_service_property(_interface,
1499
 
                           signature="b",
 
1473
    @dbus_service_property(_interface, signature="b",
1500
1474
                           access="readwrite")
1501
1475
    def ApprovedByDefault_dbus_property(self, value=None):
1502
1476
        if value is None:       # get
1504
1478
        self.approved_by_default = bool(value)
1505
1479
    
1506
1480
    # ApprovalDelay - property
1507
 
    @dbus_service_property(_interface,
1508
 
                           signature="t",
 
1481
    @dbus_service_property(_interface, signature="t",
1509
1482
                           access="readwrite")
1510
1483
    def ApprovalDelay_dbus_property(self, value=None):
1511
1484
        if value is None:       # get
1512
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1513
 
                               * 1000)
 
1485
            return dbus.UInt64(self.approval_delay_milliseconds())
1514
1486
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1515
1487
    
1516
1488
    # ApprovalDuration - property
1517
 
    @dbus_service_property(_interface,
1518
 
                           signature="t",
 
1489
    @dbus_service_property(_interface, signature="t",
1519
1490
                           access="readwrite")
1520
1491
    def ApprovalDuration_dbus_property(self, value=None):
1521
1492
        if value is None:       # get
1522
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1523
 
                               * 1000)
 
1493
            return dbus.UInt64(timedelta_to_milliseconds(
 
1494
                    self.approval_duration))
1524
1495
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1525
1496
    
1526
1497
    # Name - property
1534
1505
        return dbus.String(self.fingerprint)
1535
1506
    
1536
1507
    # Host - property
1537
 
    @dbus_service_property(_interface,
1538
 
                           signature="s",
 
1508
    @dbus_service_property(_interface, signature="s",
1539
1509
                           access="readwrite")
1540
1510
    def Host_dbus_property(self, value=None):
1541
1511
        if value is None:       # get
1542
1512
            return dbus.String(self.host)
1543
 
        self.host = str(value)
 
1513
        self.host = unicode(value)
1544
1514
    
1545
1515
    # Created - property
1546
1516
    @dbus_service_property(_interface, signature="s", access="read")
1553
1523
        return datetime_to_dbus(self.last_enabled)
1554
1524
    
1555
1525
    # Enabled - property
1556
 
    @dbus_service_property(_interface,
1557
 
                           signature="b",
 
1526
    @dbus_service_property(_interface, signature="b",
1558
1527
                           access="readwrite")
1559
1528
    def Enabled_dbus_property(self, value=None):
1560
1529
        if value is None:       # get
1565
1534
            self.disable()
1566
1535
    
1567
1536
    # LastCheckedOK - property
1568
 
    @dbus_service_property(_interface,
1569
 
                           signature="s",
 
1537
    @dbus_service_property(_interface, signature="s",
1570
1538
                           access="readwrite")
1571
1539
    def LastCheckedOK_dbus_property(self, value=None):
1572
1540
        if value is not None:
1575
1543
        return datetime_to_dbus(self.last_checked_ok)
1576
1544
    
1577
1545
    # LastCheckerStatus - property
1578
 
    @dbus_service_property(_interface, signature="n", access="read")
 
1546
    @dbus_service_property(_interface, signature="n",
 
1547
                           access="read")
1579
1548
    def LastCheckerStatus_dbus_property(self):
1580
1549
        return dbus.Int16(self.last_checker_status)
1581
1550
    
1590
1559
        return datetime_to_dbus(self.last_approval_request)
1591
1560
    
1592
1561
    # Timeout - property
1593
 
    @dbus_service_property(_interface,
1594
 
                           signature="t",
 
1562
    @dbus_service_property(_interface, signature="t",
1595
1563
                           access="readwrite")
1596
1564
    def Timeout_dbus_property(self, value=None):
1597
1565
        if value is None:       # get
1598
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1566
            return dbus.UInt64(self.timeout_milliseconds())
1599
1567
        old_timeout = self.timeout
1600
1568
        self.timeout = datetime.timedelta(0, 0, 0, value)
1601
1569
        # Reschedule disabling
1610
1578
                    is None):
1611
1579
                    return
1612
1580
                gobject.source_remove(self.disable_initiator_tag)
1613
 
                self.disable_initiator_tag = gobject.timeout_add(
1614
 
                    int((self.expires - now).total_seconds() * 1000),
1615
 
                    self.disable)
 
1581
                self.disable_initiator_tag = (
 
1582
                    gobject.timeout_add(
 
1583
                        timedelta_to_milliseconds(self.expires - now),
 
1584
                        self.disable))
1616
1585
    
1617
1586
    # ExtendedTimeout - property
1618
 
    @dbus_service_property(_interface,
1619
 
                           signature="t",
 
1587
    @dbus_service_property(_interface, signature="t",
1620
1588
                           access="readwrite")
1621
1589
    def ExtendedTimeout_dbus_property(self, value=None):
1622
1590
        if value is None:       # get
1623
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1624
 
                               * 1000)
 
1591
            return dbus.UInt64(self.extended_timeout_milliseconds())
1625
1592
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1626
1593
    
1627
1594
    # Interval - property
1628
 
    @dbus_service_property(_interface,
1629
 
                           signature="t",
 
1595
    @dbus_service_property(_interface, signature="t",
1630
1596
                           access="readwrite")
1631
1597
    def Interval_dbus_property(self, value=None):
1632
1598
        if value is None:       # get
1633
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1599
            return dbus.UInt64(self.interval_milliseconds())
1634
1600
        self.interval = datetime.timedelta(0, 0, 0, value)
1635
1601
        if getattr(self, "checker_initiator_tag", None) is None:
1636
1602
            return
1637
1603
        if self.enabled:
1638
1604
            # Reschedule checker run
1639
1605
            gobject.source_remove(self.checker_initiator_tag)
1640
 
            self.checker_initiator_tag = gobject.timeout_add(
1641
 
                value, self.start_checker)
1642
 
            self.start_checker() # Start one now, too
 
1606
            self.checker_initiator_tag = (gobject.timeout_add
 
1607
                                          (value, self.start_checker))
 
1608
            self.start_checker()    # Start one now, too
1643
1609
    
1644
1610
    # Checker - property
1645
 
    @dbus_service_property(_interface,
1646
 
                           signature="s",
 
1611
    @dbus_service_property(_interface, signature="s",
1647
1612
                           access="readwrite")
1648
1613
    def Checker_dbus_property(self, value=None):
1649
1614
        if value is None:       # get
1650
1615
            return dbus.String(self.checker_command)
1651
 
        self.checker_command = str(value)
 
1616
        self.checker_command = unicode(value)
1652
1617
    
1653
1618
    # CheckerRunning - property
1654
 
    @dbus_service_property(_interface,
1655
 
                           signature="b",
 
1619
    @dbus_service_property(_interface, signature="b",
1656
1620
                           access="readwrite")
1657
1621
    def CheckerRunning_dbus_property(self, value=None):
1658
1622
        if value is None:       # get
1668
1632
        return self.dbus_object_path # is already a dbus.ObjectPath
1669
1633
    
1670
1634
    # Secret = property
1671
 
    @dbus_service_property(_interface,
1672
 
                           signature="ay",
1673
 
                           access="write",
1674
 
                           byte_arrays=True)
 
1635
    @dbus_service_property(_interface, signature="ay",
 
1636
                           access="write", byte_arrays=True)
1675
1637
    def Secret_dbus_property(self, value):
1676
 
        self.secret = bytes(value)
 
1638
        self.secret = str(value)
1677
1639
    
1678
1640
    del _interface
1679
1641
 
1683
1645
        self._pipe = child_pipe
1684
1646
        self._pipe.send(('init', fpr, address))
1685
1647
        if not self._pipe.recv():
1686
 
            raise KeyError(fpr)
 
1648
            raise KeyError()
1687
1649
    
1688
1650
    def __getattribute__(self, name):
1689
1651
        if name == '_pipe':
1693
1655
        if data[0] == 'data':
1694
1656
            return data[1]
1695
1657
        if data[0] == 'function':
1696
 
            
1697
1658
            def func(*args, **kwargs):
1698
1659
                self._pipe.send(('funcall', name, args, kwargs))
1699
1660
                return self._pipe.recv()[1]
1700
 
            
1701
1661
            return func
1702
1662
    
1703
1663
    def __setattr__(self, name, value):
1715
1675
    def handle(self):
1716
1676
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1717
1677
            logger.info("TCP connection from: %s",
1718
 
                        str(self.client_address))
 
1678
                        unicode(self.client_address))
1719
1679
            logger.debug("Pipe FD: %d",
1720
1680
                         self.server.child_pipe.fileno())
1721
1681
            
1722
 
            session = gnutls.connection.ClientSession(
1723
 
                self.request, gnutls.connection .X509Credentials())
 
1682
            session = (gnutls.connection
 
1683
                       .ClientSession(self.request,
 
1684
                                      gnutls.connection
 
1685
                                      .X509Credentials()))
1724
1686
            
1725
1687
            # Note: gnutls.connection.X509Credentials is really a
1726
1688
            # generic GnuTLS certificate credentials object so long as
1735
1697
            priority = self.server.gnutls_priority
1736
1698
            if priority is None:
1737
1699
                priority = "NORMAL"
1738
 
            gnutls.library.functions.gnutls_priority_set_direct(
1739
 
                session._c_object, priority, None)
 
1700
            (gnutls.library.functions
 
1701
             .gnutls_priority_set_direct(session._c_object,
 
1702
                                         priority, None))
1740
1703
            
1741
1704
            # Start communication using the Mandos protocol
1742
1705
            # Get protocol number
1762
1725
            approval_required = False
1763
1726
            try:
1764
1727
                try:
1765
 
                    fpr = self.fingerprint(
1766
 
                        self.peer_certificate(session))
 
1728
                    fpr = self.fingerprint(self.peer_certificate
 
1729
                                           (session))
1767
1730
                except (TypeError,
1768
1731
                        gnutls.errors.GNUTLSError) as error:
1769
1732
                    logger.warning("Bad certificate: %s", error)
1784
1747
                while True:
1785
1748
                    if not client.enabled:
1786
1749
                        logger.info("Client %s is disabled",
1787
 
                                    client.name)
 
1750
                                       client.name)
1788
1751
                        if self.server.use_dbus:
1789
1752
                            # Emit D-Bus signal
1790
1753
                            client.Rejected("Disabled")
1799
1762
                        if self.server.use_dbus:
1800
1763
                            # Emit D-Bus signal
1801
1764
                            client.NeedApproval(
1802
 
                                client.approval_delay.total_seconds()
1803
 
                                * 1000, client.approved_by_default)
 
1765
                                client.approval_delay_milliseconds(),
 
1766
                                client.approved_by_default)
1804
1767
                    else:
1805
1768
                        logger.warning("Client %s was not approved",
1806
1769
                                       client.name)
1812
1775
                    #wait until timeout or approved
1813
1776
                    time = datetime.datetime.now()
1814
1777
                    client.changedstate.acquire()
1815
 
                    client.changedstate.wait(delay.total_seconds())
 
1778
                    client.changedstate.wait(
 
1779
                        float(timedelta_to_milliseconds(delay)
 
1780
                              / 1000))
1816
1781
                    client.changedstate.release()
1817
1782
                    time2 = datetime.datetime.now()
1818
1783
                    if (time2 - time) >= delay:
1837
1802
                        logger.warning("gnutls send failed",
1838
1803
                                       exc_info=error)
1839
1804
                        return
1840
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1841
 
                                 len(client.secret) - (sent_size
1842
 
                                                       + sent))
 
1805
                    logger.debug("Sent: %d, remaining: %d",
 
1806
                                 sent, len(client.secret)
 
1807
                                 - (sent_size + sent))
1843
1808
                    sent_size += sent
1844
1809
                
1845
1810
                logger.info("Sending secret to %s", client.name)
1862
1827
    def peer_certificate(session):
1863
1828
        "Return the peer's OpenPGP certificate as a bytestring"
1864
1829
        # If not an OpenPGP certificate...
1865
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1866
 
                session._c_object)
 
1830
        if (gnutls.library.functions
 
1831
            .gnutls_certificate_type_get(session._c_object)
1867
1832
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1868
1833
            # ...do the normal thing
1869
1834
            return session.peer_certificate
1883
1848
    def fingerprint(openpgp):
1884
1849
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1850
        # New GnuTLS "datum" with the OpenPGP public key
1886
 
        datum = gnutls.library.types.gnutls_datum_t(
1887
 
            ctypes.cast(ctypes.c_char_p(openpgp),
1888
 
                        ctypes.POINTER(ctypes.c_ubyte)),
1889
 
            ctypes.c_uint(len(openpgp)))
 
1851
        datum = (gnutls.library.types
 
1852
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1853
                                             ctypes.POINTER
 
1854
                                             (ctypes.c_ubyte)),
 
1855
                                 ctypes.c_uint(len(openpgp))))
1890
1856
        # New empty GnuTLS certificate
1891
1857
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1893
 
            ctypes.byref(crt))
 
1858
        (gnutls.library.functions
 
1859
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1860
        # Import the OpenPGP public key into the certificate
1895
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
1896
 
            crt, ctypes.byref(datum),
1897
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
1861
        (gnutls.library.functions
 
1862
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1863
                                    gnutls.library.constants
 
1864
                                    .GNUTLS_OPENPGP_FMT_RAW))
1898
1865
        # Verify the self signature in the key
1899
1866
        crtverify = ctypes.c_uint()
1900
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
 
            crt, 0, ctypes.byref(crtverify))
 
1867
        (gnutls.library.functions
 
1868
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1869
                                         ctypes.byref(crtverify)))
1902
1870
        if crtverify.value != 0:
1903
1871
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
 
            raise gnutls.errors.CertificateSecurityError(
1905
 
                "Verify failed")
 
1872
            raise (gnutls.errors.CertificateSecurityError
 
1873
                   ("Verify failed"))
1906
1874
        # New buffer for the fingerprint
1907
1875
        buf = ctypes.create_string_buffer(20)
1908
1876
        buf_len = ctypes.c_size_t()
1909
1877
        # Get the fingerprint from the certificate into the buffer
1910
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
1878
        (gnutls.library.functions
 
1879
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1880
                                             ctypes.byref(buf_len)))
1912
1881
        # Deinit the certificate
1913
1882
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1883
        # Convert the buffer to a Python bytestring
1920
1889
 
1921
1890
class MultiprocessingMixIn(object):
1922
1891
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1923
 
    
1924
1892
    def sub_process_main(self, request, address):
1925
1893
        try:
1926
1894
            self.finish_request(request, address)
1938
1906
 
1939
1907
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1940
1908
    """ adds a pipe to the MixIn """
1941
 
    
1942
1909
    def process_request(self, request, client_address):
1943
1910
        """Overrides and wraps the original process_request().
1944
1911
        
1965
1932
        interface:      None or a network interface name (string)
1966
1933
        use_ipv6:       Boolean; to use IPv6 or not
1967
1934
    """
1968
 
    
1969
1935
    def __init__(self, server_address, RequestHandlerClass,
1970
 
                 interface=None,
1971
 
                 use_ipv6=True,
1972
 
                 socketfd=None):
 
1936
                 interface=None, use_ipv6=True, socketfd=None):
1973
1937
        """If socketfd is set, use that file descriptor instead of
1974
1938
        creating a new one with socket.socket().
1975
1939
        """
2016
1980
                             self.interface)
2017
1981
            else:
2018
1982
                try:
2019
 
                    self.socket.setsockopt(
2020
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
2021
 
                        (self.interface + "\0").encode("utf-8"))
 
1983
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1984
                                           SO_BINDTODEVICE,
 
1985
                                           str(self.interface + '\0'))
2022
1986
                except socket.error as error:
2023
1987
                    if error.errno == errno.EPERM:
2024
1988
                        logger.error("No permission to bind to"
2042
2006
                self.server_address = (any_address,
2043
2007
                                       self.server_address[1])
2044
2008
            elif not self.server_address[1]:
2045
 
                self.server_address = (self.server_address[0], 0)
 
2009
                self.server_address = (self.server_address[0],
 
2010
                                       0)
2046
2011
#                 if self.interface:
2047
2012
#                     self.server_address = (self.server_address[0],
2048
2013
#                                            0, # port
2062
2027
    
2063
2028
    Assumes a gobject.MainLoop event loop.
2064
2029
    """
2065
 
    
2066
2030
    def __init__(self, server_address, RequestHandlerClass,
2067
 
                 interface=None,
2068
 
                 use_ipv6=True,
2069
 
                 clients=None,
2070
 
                 gnutls_priority=None,
2071
 
                 use_dbus=True,
2072
 
                 socketfd=None):
 
2031
                 interface=None, use_ipv6=True, clients=None,
 
2032
                 gnutls_priority=None, use_dbus=True, socketfd=None):
2073
2033
        self.enabled = False
2074
2034
        self.clients = clients
2075
2035
        if self.clients is None:
2081
2041
                                interface = interface,
2082
2042
                                use_ipv6 = use_ipv6,
2083
2043
                                socketfd = socketfd)
2084
 
    
2085
2044
    def server_activate(self):
2086
2045
        if self.enabled:
2087
2046
            return socketserver.TCPServer.server_activate(self)
2091
2050
    
2092
2051
    def add_pipe(self, parent_pipe, proc):
2093
2052
        # Call "handle_ipc" for both data and EOF events
2094
 
        gobject.io_add_watch(
2095
 
            parent_pipe.fileno(),
2096
 
            gobject.IO_IN | gobject.IO_HUP,
2097
 
            functools.partial(self.handle_ipc,
2098
 
                              parent_pipe = parent_pipe,
2099
 
                              proc = proc))
 
2053
        gobject.io_add_watch(parent_pipe.fileno(),
 
2054
                             gobject.IO_IN | gobject.IO_HUP,
 
2055
                             functools.partial(self.handle_ipc,
 
2056
                                               parent_pipe =
 
2057
                                               parent_pipe,
 
2058
                                               proc = proc))
2100
2059
    
2101
 
    def handle_ipc(self, source, condition,
2102
 
                   parent_pipe=None,
2103
 
                   proc = None,
2104
 
                   client_object=None):
 
2060
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2061
                   proc = None, client_object=None):
2105
2062
        # error, or the other end of multiprocessing.Pipe has closed
2106
2063
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2107
2064
            # Wait for other process to exit
2130
2087
                parent_pipe.send(False)
2131
2088
                return False
2132
2089
            
2133
 
            gobject.io_add_watch(
2134
 
                parent_pipe.fileno(),
2135
 
                gobject.IO_IN | gobject.IO_HUP,
2136
 
                functools.partial(self.handle_ipc,
2137
 
                                  parent_pipe = parent_pipe,
2138
 
                                  proc = proc,
2139
 
                                  client_object = client))
 
2090
            gobject.io_add_watch(parent_pipe.fileno(),
 
2091
                                 gobject.IO_IN | gobject.IO_HUP,
 
2092
                                 functools.partial(self.handle_ipc,
 
2093
                                                   parent_pipe =
 
2094
                                                   parent_pipe,
 
2095
                                                   proc = proc,
 
2096
                                                   client_object =
 
2097
                                                   client))
2140
2098
            parent_pipe.send(True)
2141
2099
            # remove the old hook in favor of the new above hook on
2142
2100
            # same fileno
2148
2106
            
2149
2107
            parent_pipe.send(('data', getattr(client_object,
2150
2108
                                              funcname)(*args,
2151
 
                                                        **kwargs)))
 
2109
                                                         **kwargs)))
2152
2110
        
2153
2111
        if command == 'getattr':
2154
2112
            attrname = request[1]
2155
 
            if isinstance(client_object.__getattribute__(attrname),
2156
 
                          collections.Callable):
2157
 
                parent_pipe.send(('function', ))
 
2113
            if callable(client_object.__getattribute__(attrname)):
 
2114
                parent_pipe.send(('function',))
2158
2115
            else:
2159
 
                parent_pipe.send((
2160
 
                    'data', client_object.__getattribute__(attrname)))
 
2116
                parent_pipe.send(('data', client_object
 
2117
                                  .__getattribute__(attrname)))
2161
2118
        
2162
2119
        if command == 'setattr':
2163
2120
            attrname = request[1]
2194
2151
    # avoid excessive use of external libraries.
2195
2152
    
2196
2153
    # New type for defining tokens, syntax, and semantics all-in-one
2197
 
    Token = collections.namedtuple("Token", (
2198
 
        "regexp",  # To match token; if "value" is not None, must have
2199
 
                   # a "group" containing digits
2200
 
        "value",   # datetime.timedelta or None
2201
 
        "followers"))           # Tokens valid after this token
 
2154
    Token = collections.namedtuple("Token",
 
2155
                                   ("regexp", # To match token; if
 
2156
                                              # "value" is not None,
 
2157
                                              # must have a "group"
 
2158
                                              # containing digits
 
2159
                                    "value",  # datetime.timedelta or
 
2160
                                              # None
 
2161
                                    "followers")) # Tokens valid after
 
2162
                                                  # this token
2202
2163
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2164
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2165
    token_end = Token(re.compile(r"$"), None, frozenset())
2205
2166
    token_second = Token(re.compile(r"(\d+)S"),
2206
2167
                         datetime.timedelta(seconds=1),
2207
 
                         frozenset((token_end, )))
 
2168
                         frozenset((token_end,)))
2208
2169
    token_minute = Token(re.compile(r"(\d+)M"),
2209
2170
                         datetime.timedelta(minutes=1),
2210
2171
                         frozenset((token_second, token_end)))
2226
2187
                       frozenset((token_month, token_end)))
2227
2188
    token_week = Token(re.compile(r"(\d+)W"),
2228
2189
                       datetime.timedelta(weeks=1),
2229
 
                       frozenset((token_end, )))
 
2190
                       frozenset((token_end,)))
2230
2191
    token_duration = Token(re.compile(r"P"), None,
2231
2192
                           frozenset((token_year, token_month,
2232
2193
                                      token_day, token_time,
2233
 
                                      token_week)))
 
2194
                                      token_week))),
2234
2195
    # Define starting values
2235
2196
    value = datetime.timedelta() # Value so far
2236
2197
    found_token = None
2237
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
2198
    followers = frozenset(token_duration,) # Following valid tokens
2238
2199
    s = duration                # String left to parse
2239
2200
    # Loop until end token is found
2240
2201
    while found_token is not token_end:
2257
2218
                break
2258
2219
        else:
2259
2220
            # No currently valid tokens were found
2260
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2261
 
                             .format(duration))
 
2221
            raise ValueError("Invalid RFC 3339 duration")
2262
2222
    # End token found
2263
2223
    return value
2264
2224
 
2288
2248
    timevalue = datetime.timedelta(0)
2289
2249
    for s in interval.split():
2290
2250
        try:
2291
 
            suffix = s[-1]
 
2251
            suffix = unicode(s[-1])
2292
2252
            value = int(s[:-1])
2293
2253
            if suffix == "d":
2294
2254
                delta = datetime.timedelta(value)
2301
2261
            elif suffix == "w":
2302
2262
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2303
2263
            else:
2304
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2264
                raise ValueError("Unknown suffix {0!r}"
 
2265
                                 .format(suffix))
2305
2266
        except IndexError as e:
2306
2267
            raise ValueError(*(e.args))
2307
2268
        timevalue += delta
2324
2285
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2325
2286
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2326
2287
            raise OSError(errno.ENODEV,
2327
 
                          "{} not a character device"
 
2288
                          "{0} not a character device"
2328
2289
                          .format(os.devnull))
2329
2290
        os.dup2(null, sys.stdin.fileno())
2330
2291
        os.dup2(null, sys.stdout.fileno())
2340
2301
    
2341
2302
    parser = argparse.ArgumentParser()
2342
2303
    parser.add_argument("-v", "--version", action="version",
2343
 
                        version = "%(prog)s {}".format(version),
 
2304
                        version = "%(prog)s {0}".format(version),
2344
2305
                        help="show version number and exit")
2345
2306
    parser.add_argument("-i", "--interface", metavar="IF",
2346
2307
                        help="Bind to interface IF")
2379
2340
                        help="Directory to save/restore state in")
2380
2341
    parser.add_argument("--foreground", action="store_true",
2381
2342
                        help="Run in foreground", default=None)
2382
 
    parser.add_argument("--no-zeroconf", action="store_false",
2383
 
                        dest="zeroconf", help="Do not use Zeroconf",
2384
 
                        default=None)
2385
2343
    
2386
2344
    options = parser.parse_args()
2387
2345
    
2396
2354
                        "port": "",
2397
2355
                        "debug": "False",
2398
2356
                        "priority":
2399
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2400
 
                        ":+SIGN-DSA-SHA256",
 
2357
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2401
2358
                        "servicename": "Mandos",
2402
2359
                        "use_dbus": "True",
2403
2360
                        "use_ipv6": "True",
2406
2363
                        "socket": "",
2407
2364
                        "statedir": "/var/lib/mandos",
2408
2365
                        "foreground": "False",
2409
 
                        "zeroconf": "True",
2410
 
                    }
 
2366
                        }
2411
2367
    
2412
2368
    # Parse config file for server-global settings
2413
2369
    server_config = configparser.SafeConfigParser(server_defaults)
2414
2370
    del server_defaults
2415
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2371
    server_config.read(os.path.join(options.configdir,
 
2372
                                    "mandos.conf"))
2416
2373
    # Convert the SafeConfigParser object to a dict
2417
2374
    server_settings = server_config.defaults()
2418
2375
    # Use the appropriate methods on the non-string config options
2436
2393
    # Override the settings from the config file with command line
2437
2394
    # options, if set.
2438
2395
    for option in ("interface", "address", "port", "debug",
2439
 
                   "priority", "servicename", "configdir", "use_dbus",
2440
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2441
 
                   "socket", "foreground", "zeroconf"):
 
2396
                   "priority", "servicename", "configdir",
 
2397
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2398
                   "statedir", "socket", "foreground"):
2442
2399
        value = getattr(options, option)
2443
2400
        if value is not None:
2444
2401
            server_settings[option] = value
2445
2402
    del options
2446
2403
    # Force all strings to be unicode
2447
2404
    for option in server_settings.keys():
2448
 
        if isinstance(server_settings[option], bytes):
2449
 
            server_settings[option] = (server_settings[option]
2450
 
                                       .decode("utf-8"))
 
2405
        if type(server_settings[option]) is str:
 
2406
            server_settings[option] = unicode(server_settings[option])
2451
2407
    # Force all boolean options to be boolean
2452
2408
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
 
                   "foreground", "zeroconf"):
 
2409
                   "foreground"):
2454
2410
        server_settings[option] = bool(server_settings[option])
2455
2411
    # Debug implies foreground
2456
2412
    if server_settings["debug"]:
2459
2415
    
2460
2416
    ##################################################################
2461
2417
    
2462
 
    if (not server_settings["zeroconf"]
2463
 
        and not (server_settings["port"]
2464
 
                 or server_settings["socket"] != "")):
2465
 
        parser.error("Needs port or socket to work without Zeroconf")
2466
 
    
2467
2418
    # For convenience
2468
2419
    debug = server_settings["debug"]
2469
2420
    debuglevel = server_settings["debuglevel"]
2472
2423
    stored_state_path = os.path.join(server_settings["statedir"],
2473
2424
                                     stored_state_file)
2474
2425
    foreground = server_settings["foreground"]
2475
 
    zeroconf = server_settings["zeroconf"]
2476
2426
    
2477
2427
    if debug:
2478
2428
        initlogger(debug, logging.DEBUG)
2484
2434
            initlogger(debug, level)
2485
2435
    
2486
2436
    if server_settings["servicename"] != "Mandos":
2487
 
        syslogger.setFormatter(
2488
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2489
 
                              ' %(levelname)s: %(message)s'.format(
2490
 
                                  server_settings["servicename"])))
 
2437
        syslogger.setFormatter(logging.Formatter
 
2438
                               ('Mandos ({0}) [%(process)d]:'
 
2439
                                ' %(levelname)s: %(message)s'
 
2440
                                .format(server_settings
 
2441
                                        ["servicename"])))
2491
2442
    
2492
2443
    # Parse config file with clients
2493
2444
    client_config = configparser.SafeConfigParser(Client
2498
2449
    global mandos_dbus_service
2499
2450
    mandos_dbus_service = None
2500
2451
    
2501
 
    socketfd = None
2502
 
    if server_settings["socket"] != "":
2503
 
        socketfd = server_settings["socket"]
2504
 
    tcp_server = MandosServer(
2505
 
        (server_settings["address"], server_settings["port"]),
2506
 
        ClientHandler,
2507
 
        interface=(server_settings["interface"] or None),
2508
 
        use_ipv6=use_ipv6,
2509
 
        gnutls_priority=server_settings["priority"],
2510
 
        use_dbus=use_dbus,
2511
 
        socketfd=socketfd)
 
2452
    tcp_server = MandosServer((server_settings["address"],
 
2453
                               server_settings["port"]),
 
2454
                              ClientHandler,
 
2455
                              interface=(server_settings["interface"]
 
2456
                                         or None),
 
2457
                              use_ipv6=use_ipv6,
 
2458
                              gnutls_priority=
 
2459
                              server_settings["priority"],
 
2460
                              use_dbus=use_dbus,
 
2461
                              socketfd=(server_settings["socket"]
 
2462
                                        or None))
2512
2463
    if not foreground:
2513
2464
        pidfilename = "/run/mandos.pid"
2514
2465
        if not os.path.isdir("/run/."):
2515
2466
            pidfilename = "/var/run/mandos.pid"
2516
2467
        pidfile = None
2517
2468
        try:
2518
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2469
            pidfile = open(pidfilename, "w")
2519
2470
        except IOError as e:
2520
2471
            logger.error("Could not open file %r", pidfilename,
2521
2472
                         exc_info=e)
2548
2499
        def debug_gnutls(level, string):
2549
2500
            logger.debug("GnuTLS: %s", string[:-1])
2550
2501
        
2551
 
        gnutls.library.functions.gnutls_global_set_log_function(
2552
 
            debug_gnutls)
 
2502
        (gnutls.library.functions
 
2503
         .gnutls_global_set_log_function(debug_gnutls))
2553
2504
        
2554
2505
        # Redirect stdin so all checkers get /dev/null
2555
2506
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2575
2526
    if use_dbus:
2576
2527
        try:
2577
2528
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2578
 
                                            bus,
2579
 
                                            do_not_queue=True)
2580
 
            old_bus_name = dbus.service.BusName(
2581
 
                "se.bsnet.fukt.Mandos", bus,
2582
 
                do_not_queue=True)
2583
 
        except dbus.exceptions.DBusException as e:
 
2529
                                            bus, do_not_queue=True)
 
2530
            old_bus_name = (dbus.service.BusName
 
2531
                            ("se.bsnet.fukt.Mandos", bus,
 
2532
                             do_not_queue=True))
 
2533
        except dbus.exceptions.NameExistsException as e:
2584
2534
            logger.error("Disabling D-Bus:", exc_info=e)
2585
2535
            use_dbus = False
2586
2536
            server_settings["use_dbus"] = False
2587
2537
            tcp_server.use_dbus = False
2588
 
    if zeroconf:
2589
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
 
        service = AvahiServiceToSyslog(
2591
 
            name = server_settings["servicename"],
2592
 
            servicetype = "_mandos._tcp",
2593
 
            protocol = protocol,
2594
 
            bus = bus)
2595
 
        if server_settings["interface"]:
2596
 
            service.interface = if_nametoindex(
2597
 
                server_settings["interface"].encode("utf-8"))
 
2538
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2539
    service = AvahiServiceToSyslog(name =
 
2540
                                   server_settings["servicename"],
 
2541
                                   servicetype = "_mandos._tcp",
 
2542
                                   protocol = protocol, bus = bus)
 
2543
    if server_settings["interface"]:
 
2544
        service.interface = (if_nametoindex
 
2545
                             (str(server_settings["interface"])))
2598
2546
    
2599
2547
    global multiprocessing_manager
2600
2548
    multiprocessing_manager = multiprocessing.Manager()
2619
2567
    if server_settings["restore"]:
2620
2568
        try:
2621
2569
            with open(stored_state_path, "rb") as stored_state:
2622
 
                clients_data, old_client_settings = pickle.load(
2623
 
                    stored_state)
 
2570
                clients_data, old_client_settings = (pickle.load
 
2571
                                                     (stored_state))
2624
2572
            os.remove(stored_state_path)
2625
2573
        except IOError as e:
2626
2574
            if e.errno == errno.ENOENT:
2627
 
                logger.warning("Could not load persistent state:"
2628
 
                               " {}".format(os.strerror(e.errno)))
 
2575
                logger.warning("Could not load persistent state: {0}"
 
2576
                                .format(os.strerror(e.errno)))
2629
2577
            else:
2630
2578
                logger.critical("Could not load persistent state:",
2631
2579
                                exc_info=e)
2632
2580
                raise
2633
2581
        except EOFError as e:
2634
2582
            logger.warning("Could not load persistent state: "
2635
 
                           "EOFError:",
2636
 
                           exc_info=e)
 
2583
                           "EOFError:", exc_info=e)
2637
2584
    
2638
2585
    with PGPEngine() as pgp:
2639
 
        for client_name, client in clients_data.items():
 
2586
        for client_name, client in clients_data.iteritems():
2640
2587
            # Skip removed clients
2641
2588
            if client_name not in client_settings:
2642
2589
                continue
2651
2598
                    # For each value in new config, check if it
2652
2599
                    # differs from the old config value (Except for
2653
2600
                    # the "secret" attribute)
2654
 
                    if (name != "secret"
2655
 
                        and (value !=
2656
 
                             old_client_settings[client_name][name])):
 
2601
                    if (name != "secret" and
 
2602
                        value != old_client_settings[client_name]
 
2603
                        [name]):
2657
2604
                        client[name] = value
2658
2605
                except KeyError:
2659
2606
                    pass
2660
2607
            
2661
2608
            # Clients who has passed its expire date can still be
2662
 
            # enabled if its last checker was successful.  A Client
 
2609
            # enabled if its last checker was successful.  Clients
2663
2610
            # whose checker succeeded before we stored its state is
2664
2611
            # assumed to have successfully run all checkers during
2665
2612
            # downtime.
2667
2614
                if datetime.datetime.utcnow() >= client["expires"]:
2668
2615
                    if not client["last_checked_ok"]:
2669
2616
                        logger.warning(
2670
 
                            "disabling client {} - Client never "
2671
 
                            "performed a successful checker".format(
2672
 
                                client_name))
 
2617
                            "disabling client {0} - Client never "
 
2618
                            "performed a successful checker"
 
2619
                            .format(client_name))
2673
2620
                        client["enabled"] = False
2674
2621
                    elif client["last_checker_status"] != 0:
2675
2622
                        logger.warning(
2676
 
                            "disabling client {} - Client last"
2677
 
                            " checker failed with error code"
2678
 
                            " {}".format(
2679
 
                                client_name,
2680
 
                                client["last_checker_status"]))
 
2623
                            "disabling client {0} - Client "
 
2624
                            "last checker failed with error code {1}"
 
2625
                            .format(client_name,
 
2626
                                    client["last_checker_status"]))
2681
2627
                        client["enabled"] = False
2682
2628
                    else:
2683
 
                        client["expires"] = (
2684
 
                            datetime.datetime.utcnow()
2685
 
                            + client["timeout"])
 
2629
                        client["expires"] = (datetime.datetime
 
2630
                                             .utcnow()
 
2631
                                             + client["timeout"])
2686
2632
                        logger.debug("Last checker succeeded,"
2687
 
                                     " keeping {} enabled".format(
2688
 
                                         client_name))
 
2633
                                     " keeping {0} enabled"
 
2634
                                     .format(client_name))
2689
2635
            try:
2690
 
                client["secret"] = pgp.decrypt(
2691
 
                    client["encrypted_secret"],
2692
 
                    client_settings[client_name]["secret"])
 
2636
                client["secret"] = (
 
2637
                    pgp.decrypt(client["encrypted_secret"],
 
2638
                                client_settings[client_name]
 
2639
                                ["secret"]))
2693
2640
            except PGPError:
2694
2641
                # If decryption fails, we use secret from new settings
2695
 
                logger.debug("Failed to decrypt {} old secret".format(
2696
 
                    client_name))
2697
 
                client["secret"] = (client_settings[client_name]
2698
 
                                    ["secret"])
 
2642
                logger.debug("Failed to decrypt {0} old secret"
 
2643
                             .format(client_name))
 
2644
                client["secret"] = (
 
2645
                    client_settings[client_name]["secret"])
2699
2646
    
2700
2647
    # Add/remove clients based on new changes made to config
2701
2648
    for client_name in (set(old_client_settings)
2706
2653
        clients_data[client_name] = client_settings[client_name]
2707
2654
    
2708
2655
    # Create all client objects
2709
 
    for client_name, client in clients_data.items():
 
2656
    for client_name, client in clients_data.iteritems():
2710
2657
        tcp_server.clients[client_name] = client_class(
2711
 
            name = client_name,
2712
 
            settings = client,
 
2658
            name = client_name, settings = client,
2713
2659
            server_settings = server_settings)
2714
2660
    
2715
2661
    if not tcp_server.clients:
2717
2663
    
2718
2664
    if not foreground:
2719
2665
        if pidfile is not None:
2720
 
            pid = os.getpid()
2721
2666
            try:
2722
2667
                with pidfile:
2723
 
                    print(pid, file=pidfile)
 
2668
                    pid = os.getpid()
 
2669
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2724
2670
            except IOError:
2725
2671
                logger.error("Could not write to file %r with PID %d",
2726
2672
                             pidfilename, pid)
2731
2677
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2732
2678
    
2733
2679
    if use_dbus:
2734
 
        
2735
 
        @alternate_dbus_interfaces(
2736
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
2680
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2681
                                        "se.bsnet.fukt.Mandos"})
2737
2682
        class MandosDBusService(DBusObjectWithProperties):
2738
2683
            """A D-Bus proxy object"""
2739
 
            
2740
2684
            def __init__(self):
2741
2685
                dbus.service.Object.__init__(self, bus, "/")
2742
 
            
2743
2686
            _interface = "se.recompile.Mandos"
2744
2687
            
2745
2688
            @dbus_interface_annotations(_interface)
2746
2689
            def _foo(self):
2747
 
                return {
2748
 
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
2749
 
                    "false" }
 
2690
                return { "org.freedesktop.DBus.Property"
 
2691
                         ".EmitsChangedSignal":
 
2692
                             "false"}
2750
2693
            
2751
2694
            @dbus.service.signal(_interface, signature="o")
2752
2695
            def ClientAdded(self, objpath):
2766
2709
            @dbus.service.method(_interface, out_signature="ao")
2767
2710
            def GetAllClients(self):
2768
2711
                "D-Bus method"
2769
 
                return dbus.Array(c.dbus_object_path for c in
 
2712
                return dbus.Array(c.dbus_object_path
 
2713
                                  for c in
2770
2714
                                  tcp_server.clients.itervalues())
2771
2715
            
2772
2716
            @dbus.service.method(_interface,
2774
2718
            def GetAllClientsWithProperties(self):
2775
2719
                "D-Bus method"
2776
2720
                return dbus.Dictionary(
2777
 
                    { c.dbus_object_path: c.GetAll("")
2778
 
                      for c in tcp_server.clients.itervalues() },
 
2721
                    ((c.dbus_object_path, c.GetAll(""))
 
2722
                     for c in tcp_server.clients.itervalues()),
2779
2723
                    signature="oa{sv}")
2780
2724
            
2781
2725
            @dbus.service.method(_interface, in_signature="o")
2798
2742
    
2799
2743
    def cleanup():
2800
2744
        "Cleanup function; run on exit"
2801
 
        if zeroconf:
2802
 
            service.cleanup()
 
2745
        service.cleanup()
2803
2746
        
2804
2747
        multiprocessing.active_children()
2805
2748
        wnull.close()
2819
2762
                
2820
2763
                # A list of attributes that can not be pickled
2821
2764
                # + secret.
2822
 
                exclude = { "bus", "changedstate", "secret",
2823
 
                            "checker", "server_settings" }
2824
 
                for name, typ in inspect.getmembers(dbus.service
2825
 
                                                    .Object):
 
2765
                exclude = set(("bus", "changedstate", "secret",
 
2766
                               "checker", "server_settings"))
 
2767
                for name, typ in (inspect.getmembers
 
2768
                                  (dbus.service.Object)):
2826
2769
                    exclude.add(name)
2827
2770
                
2828
2771
                client_dict["encrypted_secret"] = (client
2835
2778
                del client_settings[client.name]["secret"]
2836
2779
        
2837
2780
        try:
2838
 
            with tempfile.NamedTemporaryFile(
2839
 
                    mode='wb',
2840
 
                    suffix=".pickle",
2841
 
                    prefix='clients-',
2842
 
                    dir=os.path.dirname(stored_state_path),
2843
 
                    delete=False) as stored_state:
 
2781
            with (tempfile.NamedTemporaryFile
 
2782
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2783
                   dir=os.path.dirname(stored_state_path),
 
2784
                   delete=False)) as stored_state:
2844
2785
                pickle.dump((clients, client_settings), stored_state)
2845
 
                tempname = stored_state.name
 
2786
                tempname=stored_state.name
2846
2787
            os.rename(tempname, stored_state_path)
2847
2788
        except (IOError, OSError) as e:
2848
2789
            if not debug:
2851
2792
                except NameError:
2852
2793
                    pass
2853
2794
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2854
 
                logger.warning("Could not save persistent state: {}"
 
2795
                logger.warning("Could not save persistent state: {0}"
2855
2796
                               .format(os.strerror(e.errno)))
2856
2797
            else:
2857
2798
                logger.warning("Could not save persistent state:",
2867
2808
            client.disable(quiet=True)
2868
2809
            if use_dbus:
2869
2810
                # Emit D-Bus signal
2870
 
                mandos_dbus_service.ClientRemoved(
2871
 
                    client.dbus_object_path, client.name)
 
2811
                mandos_dbus_service.ClientRemoved(client
 
2812
                                                  .dbus_object_path,
 
2813
                                                  client.name)
2872
2814
        client_settings.clear()
2873
2815
    
2874
2816
    atexit.register(cleanup)
2885
2827
    tcp_server.server_activate()
2886
2828
    
2887
2829
    # Find out what port we got
2888
 
    if zeroconf:
2889
 
        service.port = tcp_server.socket.getsockname()[1]
 
2830
    service.port = tcp_server.socket.getsockname()[1]
2890
2831
    if use_ipv6:
2891
2832
        logger.info("Now listening on address %r, port %d,"
2892
2833
                    " flowinfo %d, scope_id %d",
2898
2839
    #service.interface = tcp_server.socket.getsockname()[3]
2899
2840
    
2900
2841
    try:
2901
 
        if zeroconf:
2902
 
            # From the Avahi example code
2903
 
            try:
2904
 
                service.activate()
2905
 
            except dbus.exceptions.DBusException as error:
2906
 
                logger.critical("D-Bus Exception", exc_info=error)
2907
 
                cleanup()
2908
 
                sys.exit(1)
2909
 
            # End of Avahi example code
 
2842
        # From the Avahi example code
 
2843
        try:
 
2844
            service.activate()
 
2845
        except dbus.exceptions.DBusException as error:
 
2846
            logger.critical("D-Bus Exception", exc_info=error)
 
2847
            cleanup()
 
2848
            sys.exit(1)
 
2849
        # End of Avahi example code
2910
2850
        
2911
2851
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2912
2852
                             lambda *args, **kwargs:
2927
2867
    # Must run before the D-Bus bus name gets deregistered
2928
2868
    cleanup()
2929
2869
 
2930
 
 
2931
2870
if __name__ == '__main__':
2932
2871
    main()