/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-06-02 17:43:53 UTC
  • Revision ID: teddy@recompile.se-20150602174353-tvqw31mgxfapl985
mandos.service ([Service]/KillMode): Changed to "mixed".

Show diffs side-by-side

added added

removed removed

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