/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-12 01:41:14 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150712014114-qbala4mutkixxct3
Handle local Zeroconf service name collisions on startup, too.

* mandos (AvahiService.server_state_changed): Catch name collision
                                              error when adding
                                              server.

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.1"
 
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:
361
395
                    logger.error(bad_states[state] + ": %r", error)
362
396
            self.cleanup()
363
397
        elif state == avahi.SERVER_RUNNING:
364
 
            self.add()
 
398
            try:
 
399
                self.add()
 
400
            except dbus.exceptions.DBusException as error:
 
401
                if (error.get_dbus_name()
 
402
                    == "org.freedesktop.Avahi.CollisionError"):
 
403
                    logger.info("Local Zeroconf service name"
 
404
                                " collision.")
 
405
                    return self.rename(remove=False)
 
406
                else:
 
407
                    logger.critical("D-Bus Exception", exc_info=error)
 
408
                    self.cleanup()
 
409
                    os._exit(1)
365
410
        else:
366
411
            if error is None:
367
412
                logger.debug("Unknown state: %r", state)
377
422
                                    follow_name_owner_changes=True),
378
423
                avahi.DBUS_INTERFACE_SERVER)
379
424
        self.server.connect_to_signal("StateChanged",
380
 
                                 self.server_state_changed)
 
425
                                      self.server_state_changed)
381
426
        self.server_state_changed(self.server.GetState())
382
427
 
383
428
 
384
429
class AvahiServiceToSyslog(AvahiService):
385
 
    def rename(self):
 
430
    def rename(self, *args, **kwargs):
386
431
        """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)))
 
432
        ret = AvahiService.rename(self, *args, **kwargs)
 
433
        syslogger.setFormatter(logging.Formatter(
 
434
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
435
            .format(self.name)))
392
436
        return ret
393
437
 
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
 
 
 
438
def call_pipe(connection,       # : multiprocessing.Connection
 
439
              func, *args, **kwargs):
 
440
    """This function is meant to be called by multiprocessing.Process
 
441
    
 
442
    This function runs func(*args, **kwargs), and writes the resulting
 
443
    return value on the provided multiprocessing.Connection.
 
444
    """
 
445
    connection.send(func(*args, **kwargs))
 
446
    connection.close()
401
447
 
402
448
class Client(object):
403
449
    """A representation of a client host served by this server.
430
476
    last_checker_status: integer between 0 and 255 reflecting exit
431
477
                         status of last checker. -1 reflects crashed
432
478
                         checker, -2 means no checker completed yet.
 
479
    last_checker_signal: The signal which killed the last checker, if
 
480
                         last_checker_status is -1
433
481
    last_enabled: datetime.datetime(); (UTC) or None
434
482
    name:       string; from the config file, used in log messages and
435
483
                        D-Bus identifiers
448
496
                          "fingerprint", "host", "interval",
449
497
                          "last_approval_request", "last_checked_ok",
450
498
                          "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)
 
499
    client_defaults = {
 
500
        "timeout": "PT5M",
 
501
        "extended_timeout": "PT15M",
 
502
        "interval": "PT2M",
 
503
        "checker": "fping -q -- %%(host)s",
 
504
        "host": "",
 
505
        "approval_delay": "PT0S",
 
506
        "approval_duration": "PT1S",
 
507
        "approved_by_default": "True",
 
508
        "enabled": "True",
 
509
    }
476
510
    
477
511
    @staticmethod
478
512
    def config_parser(config):
494
528
            client["enabled"] = config.getboolean(client_name,
495
529
                                                  "enabled")
496
530
            
 
531
            # Uppercase and remove spaces from fingerprint for later
 
532
            # comparison purposes with return value from the
 
533
            # fingerprint() function
497
534
            client["fingerprint"] = (section["fingerprint"].upper()
498
535
                                     .replace(" ", ""))
499
536
            if "secret" in section:
504
541
                          "rb") as secfile:
505
542
                    client["secret"] = secfile.read()
506
543
            else:
507
 
                raise TypeError("No secret or secfile for section {0}"
 
544
                raise TypeError("No secret or secfile for section {}"
508
545
                                .format(section))
509
546
            client["timeout"] = string_to_delta(section["timeout"])
510
547
            client["extended_timeout"] = string_to_delta(
527
564
            server_settings = {}
528
565
        self.server_settings = server_settings
529
566
        # adding all client settings
530
 
        for setting, value in settings.iteritems():
 
567
        for setting, value in settings.items():
531
568
            setattr(self, setting, value)
532
569
        
533
570
        if self.enabled:
541
578
            self.expires = None
542
579
        
543
580
        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
581
        logger.debug("  Fingerprint: %s", self.fingerprint)
548
582
        self.created = settings.get("created",
549
583
                                    datetime.datetime.utcnow())
556
590
        self.current_checker_command = None
557
591
        self.approved = None
558
592
        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()
 
593
        self.changedstate = multiprocessing_manager.Condition(
 
594
            multiprocessing_manager.Lock())
 
595
        self.client_structure = [attr
 
596
                                 for attr in self.__dict__.iterkeys()
564
597
                                 if not attr.startswith("_")]
565
598
        self.client_structure.append("client_structure")
566
599
        
567
 
        for name, t in inspect.getmembers(type(self),
568
 
                                          lambda obj:
569
 
                                              isinstance(obj,
570
 
                                                         property)):
 
600
        for name, t in inspect.getmembers(
 
601
                type(self), lambda obj: isinstance(obj, property)):
571
602
            if not name.startswith("_"):
572
603
                self.client_structure.append(name)
573
604
    
615
646
        # and every interval from then on.
616
647
        if self.checker_initiator_tag is not None:
617
648
            gobject.source_remove(self.checker_initiator_tag)
618
 
        self.checker_initiator_tag = (gobject.timeout_add
619
 
                                      (self.interval_milliseconds(),
620
 
                                       self.start_checker))
 
649
        self.checker_initiator_tag = gobject.timeout_add(
 
650
            int(self.interval.total_seconds() * 1000),
 
651
            self.start_checker)
621
652
        # Schedule a disable() when 'timeout' has passed
622
653
        if self.disable_initiator_tag is not None:
623
654
            gobject.source_remove(self.disable_initiator_tag)
624
 
        self.disable_initiator_tag = (gobject.timeout_add
625
 
                                   (self.timeout_milliseconds(),
626
 
                                    self.disable))
 
655
        self.disable_initiator_tag = gobject.timeout_add(
 
656
            int(self.timeout.total_seconds() * 1000), self.disable)
627
657
        # Also start a new checker *right now*.
628
658
        self.start_checker()
629
659
    
630
 
    def checker_callback(self, pid, condition, command):
 
660
    def checker_callback(self, source, condition, connection,
 
661
                         command):
631
662
        """The checker has completed, so take appropriate actions."""
632
663
        self.checker_callback_tag = None
633
664
        self.checker = None
634
 
        if os.WIFEXITED(condition):
635
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
665
        # Read return code from connection (see call_pipe)
 
666
        returncode = connection.recv()
 
667
        connection.close()
 
668
        
 
669
        if returncode >= 0:
 
670
            self.last_checker_status = returncode
 
671
            self.last_checker_signal = None
636
672
            if self.last_checker_status == 0:
637
673
                logger.info("Checker for %(name)s succeeded",
638
674
                            vars(self))
639
675
                self.checked_ok()
640
676
            else:
641
 
                logger.info("Checker for %(name)s failed",
642
 
                            vars(self))
 
677
                logger.info("Checker for %(name)s failed", vars(self))
643
678
        else:
644
679
            self.last_checker_status = -1
 
680
            self.last_checker_signal = -returncode
645
681
            logger.warning("Checker for %(name)s crashed?",
646
682
                           vars(self))
 
683
        return False
647
684
    
648
685
    def checked_ok(self):
649
686
        """Assert that the client has been seen, alive and well."""
650
687
        self.last_checked_ok = datetime.datetime.utcnow()
651
688
        self.last_checker_status = 0
 
689
        self.last_checker_signal = None
652
690
        self.bump_timeout()
653
691
    
654
692
    def bump_timeout(self, timeout=None):
659
697
            gobject.source_remove(self.disable_initiator_tag)
660
698
            self.disable_initiator_tag = None
661
699
        if getattr(self, "enabled", False):
662
 
            self.disable_initiator_tag = (gobject.timeout_add
663
 
                                          (timedelta_to_milliseconds
664
 
                                           (timeout), self.disable))
 
700
            self.disable_initiator_tag = gobject.timeout_add(
 
701
                int(timeout.total_seconds() * 1000), self.disable)
665
702
            self.expires = datetime.datetime.utcnow() + timeout
666
703
    
667
704
    def need_approval(self):
681
718
        # than 'timeout' for the client to be disabled, which is as it
682
719
        # should be.
683
720
        
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)
 
721
        if self.checker is not None and not self.checker.is_alive():
 
722
            logger.warning("Checker was not alive; joining")
 
723
            self.checker.join()
 
724
            self.checker = None
697
725
        # Start a new checker if needed
698
726
        if self.checker is None:
699
727
            # 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)
 
728
            escaped_attrs = {
 
729
                attr: re.escape(str(getattr(self, attr)))
 
730
                for attr in self.runtime_expansions }
704
731
            try:
705
732
                command = self.checker_command % escaped_attrs
706
733
            except TypeError as error:
707
734
                logger.error('Could not format string "%s"',
708
 
                             self.checker_command, exc_info=error)
709
 
                return True # Try again later
 
735
                             self.checker_command,
 
736
                             exc_info=error)
 
737
                return True     # Try again later
710
738
            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)
 
739
            logger.info("Starting checker %r for %s", command,
 
740
                        self.name)
 
741
            # We don't need to redirect stdout and stderr, since
 
742
            # in normal mode, that is already done by daemon(),
 
743
            # and in debug mode we don't want to.  (Stdin is
 
744
            # always replaced by /dev/null.)
 
745
            # The exception is when not debugging but nevertheless
 
746
            # running in the foreground; use the previously
 
747
            # created wnull.
 
748
            popen_args = { "close_fds": True,
 
749
                           "shell": True,
 
750
                           "cwd": "/" }
 
751
            if (not self.server_settings["debug"]
 
752
                and self.server_settings["foreground"]):
 
753
                popen_args.update({"stdout": wnull,
 
754
                                   "stderr": wnull })
 
755
            pipe = multiprocessing.Pipe(duplex = False)
 
756
            self.checker = multiprocessing.Process(
 
757
                target = call_pipe,
 
758
                args = (pipe[1], subprocess.call, command),
 
759
                kwargs = popen_args)
 
760
            self.checker.start()
 
761
            self.checker_callback_tag = gobject.io_add_watch(
 
762
                pipe[0].fileno(), gobject.IO_IN,
 
763
                self.checker_callback, pipe[0], command)
752
764
        # Re-run this periodically if run by gobject.timeout_add
753
765
        return True
754
766
    
760
772
        if getattr(self, "checker", None) is None:
761
773
            return
762
774
        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
 
775
        self.checker.terminate()
771
776
        self.checker = None
772
777
 
773
778
 
774
 
def dbus_service_property(dbus_interface, signature="v",
775
 
                          access="readwrite", byte_arrays=False):
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
776
783
    """Decorators for marking methods of a DBusObjectWithProperties to
777
784
    become properties on the D-Bus.
778
785
    
787
794
    # "Set" method, so we fail early here:
788
795
    if byte_arrays and signature != "ay":
789
796
        raise ValueError("Byte arrays not supported for non-'ay'"
790
 
                         " signature {0!r}".format(signature))
 
797
                         " signature {!r}".format(signature))
 
798
    
791
799
    def decorator(func):
792
800
        func._dbus_is_property = True
793
801
        func._dbus_interface = dbus_interface
798
806
            func._dbus_name = func._dbus_name[:-14]
799
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
800
808
        return func
 
809
    
801
810
    return decorator
802
811
 
803
812
 
812
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
813
822
                    "false"}
814
823
    """
 
824
    
815
825
    def decorator(func):
816
826
        func._dbus_is_interface = True
817
827
        func._dbus_interface = dbus_interface
818
828
        func._dbus_name = dbus_interface
819
829
        return func
 
830
    
820
831
    return decorator
821
832
 
822
833
 
824
835
    """Decorator to annotate D-Bus methods, signals or properties
825
836
    Usage:
826
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
827
841
    @dbus_service_property("org.example.Interface", signature="b",
828
842
                           access="r")
829
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
 
                        "org.freedesktop.DBus.Property."
831
 
                        "EmitsChangedSignal": "false"})
832
843
    def Property_dbus_property(self):
833
844
        return dbus.Boolean(False)
834
845
    """
 
846
    
835
847
    def decorator(func):
836
848
        func._dbus_annotations = annotations
837
849
        return func
 
850
    
838
851
    return decorator
839
852
 
840
853
 
841
854
class DBusPropertyException(dbus.exceptions.DBusException):
842
855
    """A base class for D-Bus property-related exceptions
843
856
    """
844
 
    def __unicode__(self):
845
 
        return unicode(str(self))
 
857
    pass
846
858
 
847
859
 
848
860
class DBusPropertyAccessException(DBusPropertyException):
872
884
        If called like _is_dbus_thing("method") it returns a function
873
885
        suitable for use as predicate to inspect.getmembers().
874
886
        """
875
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
887
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
876
888
                                   False)
877
889
    
878
890
    def _get_all_dbus_things(self, thing):
879
891
        """Returns a generator of (name, attribute) pairs
880
892
        """
881
 
        return ((getattr(athing.__get__(self), "_dbus_name",
882
 
                         name),
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
883
894
                 athing.__get__(self))
884
895
                for cls in self.__class__.__mro__
885
896
                for name, athing in
886
 
                inspect.getmembers(cls,
887
 
                                   self._is_dbus_thing(thing)))
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
888
898
    
889
899
    def _get_dbus_property(self, interface_name, property_name):
890
900
        """Returns a bound method if one exists which is a D-Bus
891
901
        property with the specified name and interface.
892
902
        """
893
 
        for cls in  self.__class__.__mro__:
894
 
            for name, value in (inspect.getmembers
895
 
                                (cls,
896
 
                                 self._is_dbus_thing("property"))):
 
903
        for cls in self.__class__.__mro__:
 
904
            for name, value in inspect.getmembers(
 
905
                    cls, self._is_dbus_thing("property")):
897
906
                if (value._dbus_name == property_name
898
907
                    and value._dbus_interface == interface_name):
899
908
                    return value.__get__(self)
900
909
        
901
910
        # No such property
902
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
 
                                   + interface_name + "."
904
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
905
913
    
906
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
907
916
                         out_signature="v")
908
917
    def Get(self, interface_name, property_name):
909
918
        """Standard D-Bus property Get() method, see D-Bus standard.
927
936
            # The byte_arrays option is not supported yet on
928
937
            # signatures other than "ay".
929
938
            if prop._dbus_signature != "ay":
930
 
                raise ValueError
 
939
                raise ValueError("Byte arrays not supported for non-"
 
940
                                 "'ay' signature {!r}"
 
941
                                 .format(prop._dbus_signature))
931
942
            value = dbus.ByteArray(b''.join(chr(byte)
932
943
                                            for byte in value))
933
944
        prop(value)
934
945
    
935
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
936
948
                         out_signature="a{sv}")
937
949
    def GetAll(self, interface_name):
938
950
        """Standard D-Bus property GetAll() method, see D-Bus
953
965
            if not hasattr(value, "variant_level"):
954
966
                properties[name] = value
955
967
                continue
956
 
            properties[name] = type(value)(value, variant_level=
957
 
                                           value.variant_level+1)
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
958
970
        return dbus.Dictionary(properties, signature="sv")
959
971
    
 
972
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
973
    def PropertiesChanged(self, interface_name, changed_properties,
 
974
                          invalidated_properties):
 
975
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
976
        standard.
 
977
        """
 
978
        pass
 
979
    
960
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
961
981
                         out_signature="s",
962
982
                         path_keyword='object_path',
970
990
                                                   connection)
971
991
        try:
972
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
973
994
            def make_tag(document, name, prop):
974
995
                e = document.createElement("property")
975
996
                e.setAttribute("name", name)
976
997
                e.setAttribute("type", prop._dbus_signature)
977
998
                e.setAttribute("access", prop._dbus_access)
978
999
                return e
 
1000
            
979
1001
            for if_tag in document.getElementsByTagName("interface"):
980
1002
                # Add property tags
981
1003
                for tag in (make_tag(document, name, prop)
993
1015
                            if (name == tag.getAttribute("name")
994
1016
                                and prop._dbus_interface
995
1017
                                == if_tag.getAttribute("name")):
996
 
                                annots.update(getattr
997
 
                                              (prop,
998
 
                                               "_dbus_annotations",
999
 
                                               {}))
1000
 
                        for name, value in annots.iteritems():
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
 
1020
                        for name, value in annots.items():
1001
1021
                            ann_tag = document.createElement(
1002
1022
                                "annotation")
1003
1023
                            ann_tag.setAttribute("name", name)
1006
1026
                # Add interface annotation tags
1007
1027
                for annotation, value in dict(
1008
1028
                    itertools.chain.from_iterable(
1009
 
                        annotations().iteritems()
1010
 
                        for name, annotations in
1011
 
                        self._get_all_dbus_things("interface")
 
1029
                        annotations().items()
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
1012
1032
                        if name == if_tag.getAttribute("name")
1013
 
                        )).iteritems():
 
1033
                        )).items():
1014
1034
                    ann_tag = document.createElement("annotation")
1015
1035
                    ann_tag.setAttribute("name", annotation)
1016
1036
                    ann_tag.setAttribute("value", value)
1043
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1044
1064
    if dt is None:
1045
1065
        return dbus.String("", variant_level = variant_level)
1046
 
    return dbus.String(dt.isoformat(),
1047
 
                       variant_level=variant_level)
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1048
1067
 
1049
1068
 
1050
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1070
1089
    (from DBusObjectWithProperties) and interfaces (from the
1071
1090
    dbus_interface_annotations decorator).
1072
1091
    """
 
1092
    
1073
1093
    def wrapper(cls):
1074
1094
        for orig_interface_name, alt_interface_name in (
1075
 
            alt_interface_names.iteritems()):
 
1095
                alt_interface_names.items()):
1076
1096
            attr = {}
1077
1097
            interface_names = set()
1078
1098
            # Go though all attributes of the class
1080
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
1081
1101
                # with the wrong interface name
1082
1102
                if (not hasattr(attribute, "_dbus_interface")
1083
 
                    or not attribute._dbus_interface
1084
 
                    .startswith(orig_interface_name)):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
1085
1105
                    continue
1086
1106
                # Create an alternate D-Bus interface name based on
1087
1107
                # the current name
1088
 
                alt_interface = (attribute._dbus_interface
1089
 
                                 .replace(orig_interface_name,
1090
 
                                          alt_interface_name))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
1091
1110
                interface_names.add(alt_interface)
1092
1111
                # Is this a D-Bus signal?
1093
1112
                if getattr(attribute, "_dbus_is_signal", False):
1094
 
                    # Extract the original non-method undecorated
1095
 
                    # function by black magic
1096
 
                    nonmethod_func = (dict(
 
1113
                    if sys.version_info.major == 2:
 
1114
                        # Extract the original non-method undecorated
 
1115
                        # function by black magic
 
1116
                        nonmethod_func = (dict(
1097
1117
                            zip(attribute.func_code.co_freevars,
1098
 
                                attribute.__closure__))["func"]
1099
 
                                      .cell_contents)
 
1118
                                attribute.__closure__))
 
1119
                                          ["func"].cell_contents)
 
1120
                    else:
 
1121
                        nonmethod_func = attribute
1100
1122
                    # Create a new, but exactly alike, function
1101
1123
                    # object, and decorate it to be a new D-Bus signal
1102
1124
                    # 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)))
 
1125
                    if sys.version_info.major == 2:
 
1126
                        new_function = types.FunctionType(
 
1127
                            nonmethod_func.func_code,
 
1128
                            nonmethod_func.func_globals,
 
1129
                            nonmethod_func.func_name,
 
1130
                            nonmethod_func.func_defaults,
 
1131
                            nonmethod_func.func_closure)
 
1132
                    else:
 
1133
                        new_function = types.FunctionType(
 
1134
                            nonmethod_func.__code__,
 
1135
                            nonmethod_func.__globals__,
 
1136
                            nonmethod_func.__name__,
 
1137
                            nonmethod_func.__defaults__,
 
1138
                            nonmethod_func.__closure__)
 
1139
                    new_function = (dbus.service.signal(
 
1140
                        alt_interface,
 
1141
                        attribute._dbus_signature)(new_function))
1112
1142
                    # Copy annotations, if any
1113
1143
                    try:
1114
 
                        new_function._dbus_annotations = (
1115
 
                            dict(attribute._dbus_annotations))
 
1144
                        new_function._dbus_annotations = dict(
 
1145
                            attribute._dbus_annotations)
1116
1146
                    except AttributeError:
1117
1147
                        pass
1118
1148
                    # Define a creator of a function to call both the
1123
1153
                        """This function is a scope container to pass
1124
1154
                        func1 and func2 to the "call_both" function
1125
1155
                        outside of its arguments"""
 
1156
                        
1126
1157
                        def call_both(*args, **kwargs):
1127
1158
                            """This function will emit two D-Bus
1128
1159
                            signals by calling func1 and func2"""
1129
1160
                            func1(*args, **kwargs)
1130
1161
                            func2(*args, **kwargs)
 
1162
                        
1131
1163
                        return call_both
1132
1164
                    # Create the "call_both" function and add it to
1133
1165
                    # the class
1138
1170
                    # object.  Decorate it to be a new D-Bus method
1139
1171
                    # with the alternate D-Bus interface name.  Add it
1140
1172
                    # 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)))
 
1173
                    attr[attrname] = (
 
1174
                        dbus.service.method(
 
1175
                            alt_interface,
 
1176
                            attribute._dbus_in_signature,
 
1177
                            attribute._dbus_out_signature)
 
1178
                        (types.FunctionType(attribute.func_code,
 
1179
                                            attribute.func_globals,
 
1180
                                            attribute.func_name,
 
1181
                                            attribute.func_defaults,
 
1182
                                            attribute.func_closure)))
1151
1183
                    # Copy annotations, if any
1152
1184
                    try:
1153
 
                        attr[attrname]._dbus_annotations = (
1154
 
                            dict(attribute._dbus_annotations))
 
1185
                        attr[attrname]._dbus_annotations = dict(
 
1186
                            attribute._dbus_annotations)
1155
1187
                    except AttributeError:
1156
1188
                        pass
1157
1189
                # Is this a D-Bus property?
1160
1192
                    # object, and decorate it to be a new D-Bus
1161
1193
                    # property with the alternate D-Bus interface
1162
1194
                    # 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)))
 
1195
                    attr[attrname] = (dbus_service_property(
 
1196
                        alt_interface, attribute._dbus_signature,
 
1197
                        attribute._dbus_access,
 
1198
                        attribute._dbus_get_args_options
 
1199
                        ["byte_arrays"])
 
1200
                                      (types.FunctionType(
 
1201
                                          attribute.func_code,
 
1202
                                          attribute.func_globals,
 
1203
                                          attribute.func_name,
 
1204
                                          attribute.func_defaults,
 
1205
                                          attribute.func_closure)))
1176
1206
                    # Copy annotations, if any
1177
1207
                    try:
1178
 
                        attr[attrname]._dbus_annotations = (
1179
 
                            dict(attribute._dbus_annotations))
 
1208
                        attr[attrname]._dbus_annotations = dict(
 
1209
                            attribute._dbus_annotations)
1180
1210
                    except AttributeError:
1181
1211
                        pass
1182
1212
                # Is this a D-Bus interface?
1185
1215
                    # object.  Decorate it to be a new D-Bus interface
1186
1216
                    # with the alternate D-Bus interface name.  Add it
1187
1217
                    # 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)))
 
1218
                    attr[attrname] = (
 
1219
                        dbus_interface_annotations(alt_interface)
 
1220
                        (types.FunctionType(attribute.func_code,
 
1221
                                            attribute.func_globals,
 
1222
                                            attribute.func_name,
 
1223
                                            attribute.func_defaults,
 
1224
                                            attribute.func_closure)))
1196
1225
            if deprecate:
1197
1226
                # Deprecate all alternate interfaces
1198
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1227
                iname="_AlternateDBusNames_interface_annotation{}"
1199
1228
                for interface_name in interface_names:
 
1229
                    
1200
1230
                    @dbus_interface_annotations(interface_name)
1201
1231
                    def func(self):
1202
1232
                        return { "org.freedesktop.DBus.Deprecated":
1203
 
                                     "true" }
 
1233
                                 "true" }
1204
1234
                    # Find an unused name
1205
1235
                    for aname in (iname.format(i)
1206
1236
                                  for i in itertools.count()):
1210
1240
            if interface_names:
1211
1241
                # Replace the class with a new subclass of it with
1212
1242
                # methods, signals, etc. as created above.
1213
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1214
 
                           (cls,), attr)
 
1243
                cls = type(b"{}Alternate".format(cls.__name__),
 
1244
                           (cls, ), attr)
1215
1245
        return cls
 
1246
    
1216
1247
    return wrapper
1217
1248
 
1218
1249
 
1219
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
 
                                "se.bsnet.fukt.Mandos"})
 
1251
                            "se.bsnet.fukt.Mandos"})
1221
1252
class ClientDBus(Client, DBusObjectWithProperties):
1222
1253
    """A Client class using D-Bus
1223
1254
    
1227
1258
    """
1228
1259
    
1229
1260
    runtime_expansions = (Client.runtime_expansions
1230
 
                          + ("dbus_object_path",))
 
1261
                          + ("dbus_object_path", ))
 
1262
    
 
1263
    _interface = "se.recompile.Mandos.Client"
1231
1264
    
1232
1265
    # dbus.service.Object doesn't use super(), so we can't either.
1233
1266
    
1236
1269
        Client.__init__(self, *args, **kwargs)
1237
1270
        # Only now, when this client is initialized, can it show up on
1238
1271
        # the D-Bus
1239
 
        client_object_name = unicode(self.name).translate(
 
1272
        client_object_name = str(self.name).translate(
1240
1273
            {ord("."): ord("_"),
1241
1274
             ord("-"): ord("_")})
1242
 
        self.dbus_object_path = (dbus.ObjectPath
1243
 
                                 ("/clients/" + client_object_name))
 
1275
        self.dbus_object_path = dbus.ObjectPath(
 
1276
            "/clients/" + client_object_name)
1244
1277
        DBusObjectWithProperties.__init__(self, self.bus,
1245
1278
                                          self.dbus_object_path)
1246
1279
    
1247
 
    def notifychangeproperty(transform_func,
1248
 
                             dbus_name, type_func=lambda x: x,
1249
 
                             variant_level=1):
 
1280
    def notifychangeproperty(transform_func, dbus_name,
 
1281
                             type_func=lambda x: x,
 
1282
                             variant_level=1,
 
1283
                             invalidate_only=False,
 
1284
                             _interface=_interface):
1250
1285
        """ Modify a variable so that it's a property which announces
1251
1286
        its changes to DBus.
1252
1287
        
1257
1292
                   to the D-Bus.  Default: no transform
1258
1293
        variant_level: D-Bus variant level.  Default: 1
1259
1294
        """
1260
 
        attrname = "_{0}".format(dbus_name)
 
1295
        attrname = "_{}".format(dbus_name)
 
1296
        
1261
1297
        def setter(self, value):
1262
1298
            if hasattr(self, "dbus_object_path"):
1263
1299
                if (not hasattr(self, attrname) or
1264
1300
                    type_func(getattr(self, attrname, None))
1265
1301
                    != 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)
 
1302
                    if invalidate_only:
 
1303
                        self.PropertiesChanged(
 
1304
                            _interface, dbus.Dictionary(),
 
1305
                            dbus.Array((dbus_name, )))
 
1306
                    else:
 
1307
                        dbus_value = transform_func(
 
1308
                            type_func(value),
 
1309
                            variant_level = variant_level)
 
1310
                        self.PropertyChanged(dbus.String(dbus_name),
 
1311
                                             dbus_value)
 
1312
                        self.PropertiesChanged(
 
1313
                            _interface,
 
1314
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1315
                                              dbus_value }),
 
1316
                            dbus.Array())
1271
1317
            setattr(self, attrname, value)
1272
1318
        
1273
1319
        return property(lambda self: getattr(self, attrname), setter)
1279
1325
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1280
1326
    last_enabled = notifychangeproperty(datetime_to_dbus,
1281
1327
                                        "LastEnabled")
1282
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1283
 
                                   type_func = lambda checker:
1284
 
                                       checker is not None)
 
1328
    checker = notifychangeproperty(
 
1329
        dbus.Boolean, "CheckerRunning",
 
1330
        type_func = lambda checker: checker is not None)
1285
1331
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1286
1332
                                           "LastCheckedOK")
1287
1333
    last_checker_status = notifychangeproperty(dbus.Int16,
1290
1336
        datetime_to_dbus, "LastApprovalRequest")
1291
1337
    approved_by_default = notifychangeproperty(dbus.Boolean,
1292
1338
                                               "ApprovedByDefault")
1293
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1294
 
                                          "ApprovalDelay",
1295
 
                                          type_func =
1296
 
                                          timedelta_to_milliseconds)
 
1339
    approval_delay = notifychangeproperty(
 
1340
        dbus.UInt64, "ApprovalDelay",
 
1341
        type_func = lambda td: td.total_seconds() * 1000)
1297
1342
    approval_duration = notifychangeproperty(
1298
1343
        dbus.UInt64, "ApprovalDuration",
1299
 
        type_func = timedelta_to_milliseconds)
 
1344
        type_func = lambda td: td.total_seconds() * 1000)
1300
1345
    host = notifychangeproperty(dbus.String, "Host")
1301
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1302
 
                                   type_func =
1303
 
                                   timedelta_to_milliseconds)
 
1346
    timeout = notifychangeproperty(
 
1347
        dbus.UInt64, "Timeout",
 
1348
        type_func = lambda td: td.total_seconds() * 1000)
1304
1349
    extended_timeout = notifychangeproperty(
1305
1350
        dbus.UInt64, "ExtendedTimeout",
1306
 
        type_func = timedelta_to_milliseconds)
1307
 
    interval = notifychangeproperty(dbus.UInt64,
1308
 
                                    "Interval",
1309
 
                                    type_func =
1310
 
                                    timedelta_to_milliseconds)
 
1351
        type_func = lambda td: td.total_seconds() * 1000)
 
1352
    interval = notifychangeproperty(
 
1353
        dbus.UInt64, "Interval",
 
1354
        type_func = lambda td: td.total_seconds() * 1000)
1311
1355
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1356
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1357
                                  invalidate_only=True)
1312
1358
    
1313
1359
    del notifychangeproperty
1314
1360
    
1321
1367
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1322
1368
        Client.__del__(self, *args, **kwargs)
1323
1369
    
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)
 
1370
    def checker_callback(self, source, condition,
 
1371
                         connection, command, *args, **kwargs):
 
1372
        ret = Client.checker_callback(self, source, condition,
 
1373
                                      connection, command, *args,
 
1374
                                      **kwargs)
 
1375
        exitstatus = self.last_checker_status
 
1376
        if exitstatus >= 0:
1330
1377
            # Emit D-Bus signal
1331
1378
            self.CheckerCompleted(dbus.Int16(exitstatus),
1332
 
                                  dbus.Int64(condition),
 
1379
                                  dbus.Int64(0),
1333
1380
                                  dbus.String(command))
1334
1381
        else:
1335
1382
            # Emit D-Bus signal
1336
1383
            self.CheckerCompleted(dbus.Int16(-1),
1337
 
                                  dbus.Int64(condition),
 
1384
                                  dbus.Int64(
 
1385
                                      self.last_checker_signal),
1338
1386
                                  dbus.String(command))
1339
 
        
1340
 
        return Client.checker_callback(self, pid, condition, command,
1341
 
                                       *args, **kwargs)
 
1387
        return ret
1342
1388
    
1343
1389
    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
 
1390
        old_checker_pid = getattr(self.checker, "pid", None)
1349
1391
        r = Client.start_checker(self, *args, **kwargs)
1350
1392
        # Only if new checker process was started
1351
1393
        if (self.checker is not None
1360
1402
    
1361
1403
    def approve(self, value=True):
1362
1404
        self.approved = value
1363
 
        gobject.timeout_add(timedelta_to_milliseconds
1364
 
                            (self.approval_duration),
1365
 
                            self._reset_approved)
 
1405
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1406
                                * 1000), self._reset_approved)
1366
1407
        self.send_changedstate()
1367
1408
    
1368
1409
    ## D-Bus methods, signals & properties
1369
 
    _interface = "se.recompile.Mandos.Client"
1370
1410
    
1371
1411
    ## Interfaces
1372
1412
    
1373
 
    @dbus_interface_annotations(_interface)
1374
 
    def _foo(self):
1375
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
 
                     "false"}
1377
 
    
1378
1413
    ## Signals
1379
1414
    
1380
1415
    # CheckerCompleted - signal
1390
1425
        pass
1391
1426
    
1392
1427
    # PropertyChanged - signal
 
1428
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1393
1429
    @dbus.service.signal(_interface, signature="sv")
1394
1430
    def PropertyChanged(self, property, value):
1395
1431
        "D-Bus signal"
1459
1495
        return dbus.Boolean(bool(self.approvals_pending))
1460
1496
    
1461
1497
    # ApprovedByDefault - property
1462
 
    @dbus_service_property(_interface, signature="b",
 
1498
    @dbus_service_property(_interface,
 
1499
                           signature="b",
1463
1500
                           access="readwrite")
1464
1501
    def ApprovedByDefault_dbus_property(self, value=None):
1465
1502
        if value is None:       # get
1467
1504
        self.approved_by_default = bool(value)
1468
1505
    
1469
1506
    # ApprovalDelay - property
1470
 
    @dbus_service_property(_interface, signature="t",
 
1507
    @dbus_service_property(_interface,
 
1508
                           signature="t",
1471
1509
                           access="readwrite")
1472
1510
    def ApprovalDelay_dbus_property(self, value=None):
1473
1511
        if value is None:       # get
1474
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1512
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1513
                               * 1000)
1475
1514
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1476
1515
    
1477
1516
    # ApprovalDuration - property
1478
 
    @dbus_service_property(_interface, signature="t",
 
1517
    @dbus_service_property(_interface,
 
1518
                           signature="t",
1479
1519
                           access="readwrite")
1480
1520
    def ApprovalDuration_dbus_property(self, value=None):
1481
1521
        if value is None:       # get
1482
 
            return dbus.UInt64(timedelta_to_milliseconds(
1483
 
                    self.approval_duration))
 
1522
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1523
                               * 1000)
1484
1524
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1485
1525
    
1486
1526
    # Name - property
1494
1534
        return dbus.String(self.fingerprint)
1495
1535
    
1496
1536
    # Host - property
1497
 
    @dbus_service_property(_interface, signature="s",
 
1537
    @dbus_service_property(_interface,
 
1538
                           signature="s",
1498
1539
                           access="readwrite")
1499
1540
    def Host_dbus_property(self, value=None):
1500
1541
        if value is None:       # get
1501
1542
            return dbus.String(self.host)
1502
 
        self.host = unicode(value)
 
1543
        self.host = str(value)
1503
1544
    
1504
1545
    # Created - property
1505
1546
    @dbus_service_property(_interface, signature="s", access="read")
1512
1553
        return datetime_to_dbus(self.last_enabled)
1513
1554
    
1514
1555
    # Enabled - property
1515
 
    @dbus_service_property(_interface, signature="b",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="b",
1516
1558
                           access="readwrite")
1517
1559
    def Enabled_dbus_property(self, value=None):
1518
1560
        if value is None:       # get
1523
1565
            self.disable()
1524
1566
    
1525
1567
    # LastCheckedOK - property
1526
 
    @dbus_service_property(_interface, signature="s",
 
1568
    @dbus_service_property(_interface,
 
1569
                           signature="s",
1527
1570
                           access="readwrite")
1528
1571
    def LastCheckedOK_dbus_property(self, value=None):
1529
1572
        if value is not None:
1532
1575
        return datetime_to_dbus(self.last_checked_ok)
1533
1576
    
1534
1577
    # LastCheckerStatus - property
1535
 
    @dbus_service_property(_interface, signature="n",
1536
 
                           access="read")
 
1578
    @dbus_service_property(_interface, signature="n", access="read")
1537
1579
    def LastCheckerStatus_dbus_property(self):
1538
1580
        return dbus.Int16(self.last_checker_status)
1539
1581
    
1548
1590
        return datetime_to_dbus(self.last_approval_request)
1549
1591
    
1550
1592
    # Timeout - property
1551
 
    @dbus_service_property(_interface, signature="t",
 
1593
    @dbus_service_property(_interface,
 
1594
                           signature="t",
1552
1595
                           access="readwrite")
1553
1596
    def Timeout_dbus_property(self, value=None):
1554
1597
        if value is None:       # get
1555
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1598
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1556
1599
        old_timeout = self.timeout
1557
1600
        self.timeout = datetime.timedelta(0, 0, 0, value)
1558
1601
        # Reschedule disabling
1567
1610
                    is None):
1568
1611
                    return
1569
1612
                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))
 
1613
                self.disable_initiator_tag = gobject.timeout_add(
 
1614
                    int((self.expires - now).total_seconds() * 1000),
 
1615
                    self.disable)
1574
1616
    
1575
1617
    # ExtendedTimeout - property
1576
 
    @dbus_service_property(_interface, signature="t",
 
1618
    @dbus_service_property(_interface,
 
1619
                           signature="t",
1577
1620
                           access="readwrite")
1578
1621
    def ExtendedTimeout_dbus_property(self, value=None):
1579
1622
        if value is None:       # get
1580
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1623
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1624
                               * 1000)
1581
1625
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1582
1626
    
1583
1627
    # Interval - property
1584
 
    @dbus_service_property(_interface, signature="t",
 
1628
    @dbus_service_property(_interface,
 
1629
                           signature="t",
1585
1630
                           access="readwrite")
1586
1631
    def Interval_dbus_property(self, value=None):
1587
1632
        if value is None:       # get
1588
 
            return dbus.UInt64(self.interval_milliseconds())
 
1633
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
1634
        self.interval = datetime.timedelta(0, 0, 0, value)
1590
1635
        if getattr(self, "checker_initiator_tag", None) is None:
1591
1636
            return
1592
1637
        if self.enabled:
1593
1638
            # Reschedule checker run
1594
1639
            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
 
1640
            self.checker_initiator_tag = gobject.timeout_add(
 
1641
                value, self.start_checker)
 
1642
            self.start_checker() # Start one now, too
1598
1643
    
1599
1644
    # Checker - property
1600
 
    @dbus_service_property(_interface, signature="s",
 
1645
    @dbus_service_property(_interface,
 
1646
                           signature="s",
1601
1647
                           access="readwrite")
1602
1648
    def Checker_dbus_property(self, value=None):
1603
1649
        if value is None:       # get
1604
1650
            return dbus.String(self.checker_command)
1605
 
        self.checker_command = unicode(value)
 
1651
        self.checker_command = str(value)
1606
1652
    
1607
1653
    # CheckerRunning - property
1608
 
    @dbus_service_property(_interface, signature="b",
 
1654
    @dbus_service_property(_interface,
 
1655
                           signature="b",
1609
1656
                           access="readwrite")
1610
1657
    def CheckerRunning_dbus_property(self, value=None):
1611
1658
        if value is None:       # get
1621
1668
        return self.dbus_object_path # is already a dbus.ObjectPath
1622
1669
    
1623
1670
    # Secret = property
1624
 
    @dbus_service_property(_interface, signature="ay",
1625
 
                           access="write", byte_arrays=True)
 
1671
    @dbus_service_property(_interface,
 
1672
                           signature="ay",
 
1673
                           access="write",
 
1674
                           byte_arrays=True)
1626
1675
    def Secret_dbus_property(self, value):
1627
 
        self.secret = str(value)
 
1676
        self.secret = bytes(value)
1628
1677
    
1629
1678
    del _interface
1630
1679
 
1634
1683
        self._pipe = child_pipe
1635
1684
        self._pipe.send(('init', fpr, address))
1636
1685
        if not self._pipe.recv():
1637
 
            raise KeyError()
 
1686
            raise KeyError(fpr)
1638
1687
    
1639
1688
    def __getattribute__(self, name):
1640
1689
        if name == '_pipe':
1644
1693
        if data[0] == 'data':
1645
1694
            return data[1]
1646
1695
        if data[0] == 'function':
 
1696
            
1647
1697
            def func(*args, **kwargs):
1648
1698
                self._pipe.send(('funcall', name, args, kwargs))
1649
1699
                return self._pipe.recv()[1]
 
1700
            
1650
1701
            return func
1651
1702
    
1652
1703
    def __setattr__(self, name, value):
1664
1715
    def handle(self):
1665
1716
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1666
1717
            logger.info("TCP connection from: %s",
1667
 
                        unicode(self.client_address))
 
1718
                        str(self.client_address))
1668
1719
            logger.debug("Pipe FD: %d",
1669
1720
                         self.server.child_pipe.fileno())
1670
1721
            
1671
 
            session = (gnutls.connection
1672
 
                       .ClientSession(self.request,
1673
 
                                      gnutls.connection
1674
 
                                      .X509Credentials()))
 
1722
            session = gnutls.connection.ClientSession(
 
1723
                self.request, gnutls.connection .X509Credentials())
1675
1724
            
1676
1725
            # Note: gnutls.connection.X509Credentials is really a
1677
1726
            # generic GnuTLS certificate credentials object so long as
1686
1735
            priority = self.server.gnutls_priority
1687
1736
            if priority is None:
1688
1737
                priority = "NORMAL"
1689
 
            (gnutls.library.functions
1690
 
             .gnutls_priority_set_direct(session._c_object,
1691
 
                                         priority, None))
 
1738
            gnutls.library.functions.gnutls_priority_set_direct(
 
1739
                session._c_object, priority, None)
1692
1740
            
1693
1741
            # Start communication using the Mandos protocol
1694
1742
            # Get protocol number
1696
1744
            logger.debug("Protocol version: %r", line)
1697
1745
            try:
1698
1746
                if int(line.strip().split()[0]) > 1:
1699
 
                    raise RuntimeError
 
1747
                    raise RuntimeError(line)
1700
1748
            except (ValueError, IndexError, RuntimeError) as error:
1701
1749
                logger.error("Unknown protocol version: %s", error)
1702
1750
                return
1714
1762
            approval_required = False
1715
1763
            try:
1716
1764
                try:
1717
 
                    fpr = self.fingerprint(self.peer_certificate
1718
 
                                           (session))
 
1765
                    fpr = self.fingerprint(
 
1766
                        self.peer_certificate(session))
1719
1767
                except (TypeError,
1720
1768
                        gnutls.errors.GNUTLSError) as error:
1721
1769
                    logger.warning("Bad certificate: %s", error)
1736
1784
                while True:
1737
1785
                    if not client.enabled:
1738
1786
                        logger.info("Client %s is disabled",
1739
 
                                       client.name)
 
1787
                                    client.name)
1740
1788
                        if self.server.use_dbus:
1741
1789
                            # Emit D-Bus signal
1742
1790
                            client.Rejected("Disabled")
1751
1799
                        if self.server.use_dbus:
1752
1800
                            # Emit D-Bus signal
1753
1801
                            client.NeedApproval(
1754
 
                                client.approval_delay_milliseconds(),
1755
 
                                client.approved_by_default)
 
1802
                                client.approval_delay.total_seconds()
 
1803
                                * 1000, client.approved_by_default)
1756
1804
                    else:
1757
1805
                        logger.warning("Client %s was not approved",
1758
1806
                                       client.name)
1764
1812
                    #wait until timeout or approved
1765
1813
                    time = datetime.datetime.now()
1766
1814
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1815
                    client.changedstate.wait(delay.total_seconds())
1770
1816
                    client.changedstate.release()
1771
1817
                    time2 = datetime.datetime.now()
1772
1818
                    if (time2 - time) >= delay:
1791
1837
                        logger.warning("gnutls send failed",
1792
1838
                                       exc_info=error)
1793
1839
                        return
1794
 
                    logger.debug("Sent: %d, remaining: %d",
1795
 
                                 sent, len(client.secret)
1796
 
                                 - (sent_size + sent))
 
1840
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1841
                                 len(client.secret) - (sent_size
 
1842
                                                       + sent))
1797
1843
                    sent_size += sent
1798
1844
                
1799
1845
                logger.info("Sending secret to %s", client.name)
1816
1862
    def peer_certificate(session):
1817
1863
        "Return the peer's OpenPGP certificate as a bytestring"
1818
1864
        # If not an OpenPGP certificate...
1819
 
        if (gnutls.library.functions
1820
 
            .gnutls_certificate_type_get(session._c_object)
 
1865
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1866
                session._c_object)
1821
1867
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1822
1868
            # ...do the normal thing
1823
1869
            return session.peer_certificate
1837
1883
    def fingerprint(openpgp):
1838
1884
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1839
1885
        # 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))))
 
1886
        datum = gnutls.library.types.gnutls_datum_t(
 
1887
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1888
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1889
            ctypes.c_uint(len(openpgp)))
1845
1890
        # New empty GnuTLS certificate
1846
1891
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
 
        (gnutls.library.functions
1848
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1892
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1893
            ctypes.byref(crt))
1849
1894
        # 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))
 
1895
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1896
            crt, ctypes.byref(datum),
 
1897
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1854
1898
        # Verify the self signature in the key
1855
1899
        crtverify = ctypes.c_uint()
1856
 
        (gnutls.library.functions
1857
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1858
 
                                         ctypes.byref(crtverify)))
 
1900
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1901
            crt, 0, ctypes.byref(crtverify))
1859
1902
        if crtverify.value != 0:
1860
1903
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
 
            raise (gnutls.errors.CertificateSecurityError
1862
 
                   ("Verify failed"))
 
1904
            raise gnutls.errors.CertificateSecurityError(
 
1905
                "Verify failed")
1863
1906
        # New buffer for the fingerprint
1864
1907
        buf = ctypes.create_string_buffer(20)
1865
1908
        buf_len = ctypes.c_size_t()
1866
1909
        # 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)))
 
1910
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1911
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1870
1912
        # Deinit the certificate
1871
1913
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1872
1914
        # Convert the buffer to a Python bytestring
1878
1920
 
1879
1921
class MultiprocessingMixIn(object):
1880
1922
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1923
    
1881
1924
    def sub_process_main(self, request, address):
1882
1925
        try:
1883
1926
            self.finish_request(request, address)
1895
1938
 
1896
1939
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1897
1940
    """ adds a pipe to the MixIn """
 
1941
    
1898
1942
    def process_request(self, request, client_address):
1899
1943
        """Overrides and wraps the original process_request().
1900
1944
        
1909
1953
    
1910
1954
    def add_pipe(self, parent_pipe, proc):
1911
1955
        """Dummy function; override as necessary"""
1912
 
        raise NotImplementedError
 
1956
        raise NotImplementedError()
1913
1957
 
1914
1958
 
1915
1959
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1921
1965
        interface:      None or a network interface name (string)
1922
1966
        use_ipv6:       Boolean; to use IPv6 or not
1923
1967
    """
 
1968
    
1924
1969
    def __init__(self, server_address, RequestHandlerClass,
1925
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1970
                 interface=None,
 
1971
                 use_ipv6=True,
 
1972
                 socketfd=None):
1926
1973
        """If socketfd is set, use that file descriptor instead of
1927
1974
        creating a new one with socket.socket().
1928
1975
        """
1969
2016
                             self.interface)
1970
2017
            else:
1971
2018
                try:
1972
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
 
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
2019
                    self.socket.setsockopt(
 
2020
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2021
                        (self.interface + "\0").encode("utf-8"))
1975
2022
                except socket.error as error:
1976
2023
                    if error.errno == errno.EPERM:
1977
2024
                        logger.error("No permission to bind to"
1995
2042
                self.server_address = (any_address,
1996
2043
                                       self.server_address[1])
1997
2044
            elif not self.server_address[1]:
1998
 
                self.server_address = (self.server_address[0],
1999
 
                                       0)
 
2045
                self.server_address = (self.server_address[0], 0)
2000
2046
#                 if self.interface:
2001
2047
#                     self.server_address = (self.server_address[0],
2002
2048
#                                            0, # port
2016
2062
    
2017
2063
    Assumes a gobject.MainLoop event loop.
2018
2064
    """
 
2065
    
2019
2066
    def __init__(self, server_address, RequestHandlerClass,
2020
 
                 interface=None, use_ipv6=True, clients=None,
2021
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2067
                 interface=None,
 
2068
                 use_ipv6=True,
 
2069
                 clients=None,
 
2070
                 gnutls_priority=None,
 
2071
                 use_dbus=True,
 
2072
                 socketfd=None):
2022
2073
        self.enabled = False
2023
2074
        self.clients = clients
2024
2075
        if self.clients is None:
2030
2081
                                interface = interface,
2031
2082
                                use_ipv6 = use_ipv6,
2032
2083
                                socketfd = socketfd)
 
2084
    
2033
2085
    def server_activate(self):
2034
2086
        if self.enabled:
2035
2087
            return socketserver.TCPServer.server_activate(self)
2039
2091
    
2040
2092
    def add_pipe(self, parent_pipe, proc):
2041
2093
        # 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))
 
2094
        gobject.io_add_watch(
 
2095
            parent_pipe.fileno(),
 
2096
            gobject.IO_IN | gobject.IO_HUP,
 
2097
            functools.partial(self.handle_ipc,
 
2098
                              parent_pipe = parent_pipe,
 
2099
                              proc = proc))
2048
2100
    
2049
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2050
 
                   proc = None, client_object=None):
 
2101
    def handle_ipc(self, source, condition,
 
2102
                   parent_pipe=None,
 
2103
                   proc = None,
 
2104
                   client_object=None):
2051
2105
        # error, or the other end of multiprocessing.Pipe has closed
2052
2106
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2053
2107
            # Wait for other process to exit
2076
2130
                parent_pipe.send(False)
2077
2131
                return False
2078
2132
            
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))
 
2133
            gobject.io_add_watch(
 
2134
                parent_pipe.fileno(),
 
2135
                gobject.IO_IN | gobject.IO_HUP,
 
2136
                functools.partial(self.handle_ipc,
 
2137
                                  parent_pipe = parent_pipe,
 
2138
                                  proc = proc,
 
2139
                                  client_object = client))
2087
2140
            parent_pipe.send(True)
2088
2141
            # remove the old hook in favor of the new above hook on
2089
2142
            # same fileno
2095
2148
            
2096
2149
            parent_pipe.send(('data', getattr(client_object,
2097
2150
                                              funcname)(*args,
2098
 
                                                         **kwargs)))
 
2151
                                                        **kwargs)))
2099
2152
        
2100
2153
        if command == 'getattr':
2101
2154
            attrname = request[1]
2102
 
            if callable(client_object.__getattribute__(attrname)):
2103
 
                parent_pipe.send(('function',))
 
2155
            if isinstance(client_object.__getattribute__(attrname),
 
2156
                          collections.Callable):
 
2157
                parent_pipe.send(('function', ))
2104
2158
            else:
2105
 
                parent_pipe.send(('data', client_object
2106
 
                                  .__getattribute__(attrname)))
 
2159
                parent_pipe.send((
 
2160
                    'data', client_object.__getattribute__(attrname)))
2107
2161
        
2108
2162
        if command == 'setattr':
2109
2163
            attrname = request[1]
2140
2194
    # avoid excessive use of external libraries.
2141
2195
    
2142
2196
    # 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
 
2197
    Token = collections.namedtuple("Token", (
 
2198
        "regexp",  # To match token; if "value" is not None, must have
 
2199
                   # a "group" containing digits
 
2200
        "value",   # datetime.timedelta or None
 
2201
        "followers"))           # Tokens valid after this token
2152
2202
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
2203
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2154
2204
    token_end = Token(re.compile(r"$"), None, frozenset())
2155
2205
    token_second = Token(re.compile(r"(\d+)S"),
2156
2206
                         datetime.timedelta(seconds=1),
2157
 
                         frozenset((token_end,)))
 
2207
                         frozenset((token_end, )))
2158
2208
    token_minute = Token(re.compile(r"(\d+)M"),
2159
2209
                         datetime.timedelta(minutes=1),
2160
2210
                         frozenset((token_second, token_end)))
2176
2226
                       frozenset((token_month, token_end)))
2177
2227
    token_week = Token(re.compile(r"(\d+)W"),
2178
2228
                       datetime.timedelta(weeks=1),
2179
 
                       frozenset((token_end,)))
 
2229
                       frozenset((token_end, )))
2180
2230
    token_duration = Token(re.compile(r"P"), None,
2181
2231
                           frozenset((token_year, token_month,
2182
2232
                                      token_day, token_time,
2183
 
                                      token_week))),
 
2233
                                      token_week)))
2184
2234
    # Define starting values
2185
2235
    value = datetime.timedelta() # Value so far
2186
2236
    found_token = None
2187
 
    followers = frozenset(token_duration,) # Following valid tokens
 
2237
    followers = frozenset((token_duration, )) # Following valid tokens
2188
2238
    s = duration                # String left to parse
2189
2239
    # Loop until end token is found
2190
2240
    while found_token is not token_end:
2207
2257
                break
2208
2258
        else:
2209
2259
            # No currently valid tokens were found
2210
 
            raise ValueError("Invalid RFC 3339 duration")
 
2260
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2261
                             .format(duration))
2211
2262
    # End token found
2212
2263
    return value
2213
2264
 
2237
2288
    timevalue = datetime.timedelta(0)
2238
2289
    for s in interval.split():
2239
2290
        try:
2240
 
            suffix = unicode(s[-1])
 
2291
            suffix = s[-1]
2241
2292
            value = int(s[:-1])
2242
2293
            if suffix == "d":
2243
2294
                delta = datetime.timedelta(value)
2250
2301
            elif suffix == "w":
2251
2302
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2252
2303
            else:
2253
 
                raise ValueError("Unknown suffix {0!r}"
2254
 
                                 .format(suffix))
2255
 
        except (ValueError, IndexError) as e:
 
2304
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2305
        except IndexError as e:
2256
2306
            raise ValueError(*(e.args))
2257
2307
        timevalue += delta
2258
2308
    return timevalue
2274
2324
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2275
2325
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
2326
            raise OSError(errno.ENODEV,
2277
 
                          "{0} not a character device"
 
2327
                          "{} not a character device"
2278
2328
                          .format(os.devnull))
2279
2329
        os.dup2(null, sys.stdin.fileno())
2280
2330
        os.dup2(null, sys.stdout.fileno())
2290
2340
    
2291
2341
    parser = argparse.ArgumentParser()
2292
2342
    parser.add_argument("-v", "--version", action="version",
2293
 
                        version = "%(prog)s {0}".format(version),
 
2343
                        version = "%(prog)s {}".format(version),
2294
2344
                        help="show version number and exit")
2295
2345
    parser.add_argument("-i", "--interface", metavar="IF",
2296
2346
                        help="Bind to interface IF")
2329
2379
                        help="Directory to save/restore state in")
2330
2380
    parser.add_argument("--foreground", action="store_true",
2331
2381
                        help="Run in foreground", default=None)
 
2382
    parser.add_argument("--no-zeroconf", action="store_false",
 
2383
                        dest="zeroconf", help="Do not use Zeroconf",
 
2384
                        default=None)
2332
2385
    
2333
2386
    options = parser.parse_args()
2334
2387
    
2335
2388
    if options.check:
2336
2389
        import doctest
2337
 
        doctest.testmod()
2338
 
        sys.exit()
 
2390
        fail_count, test_count = doctest.testmod()
 
2391
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2339
2392
    
2340
2393
    # Default values for config file for server-global settings
2341
2394
    server_defaults = { "interface": "",
2343
2396
                        "port": "",
2344
2397
                        "debug": "False",
2345
2398
                        "priority":
2346
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
 
2399
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2400
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2347
2401
                        "servicename": "Mandos",
2348
2402
                        "use_dbus": "True",
2349
2403
                        "use_ipv6": "True",
2352
2406
                        "socket": "",
2353
2407
                        "statedir": "/var/lib/mandos",
2354
2408
                        "foreground": "False",
2355
 
                        }
 
2409
                        "zeroconf": "True",
 
2410
                    }
2356
2411
    
2357
2412
    # Parse config file for server-global settings
2358
2413
    server_config = configparser.SafeConfigParser(server_defaults)
2359
2414
    del server_defaults
2360
 
    server_config.read(os.path.join(options.configdir,
2361
 
                                    "mandos.conf"))
 
2415
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2362
2416
    # Convert the SafeConfigParser object to a dict
2363
2417
    server_settings = server_config.defaults()
2364
2418
    # Use the appropriate methods on the non-string config options
2382
2436
    # Override the settings from the config file with command line
2383
2437
    # options, if set.
2384
2438
    for option in ("interface", "address", "port", "debug",
2385
 
                   "priority", "servicename", "configdir",
2386
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
2439
                   "priority", "servicename", "configdir", "use_dbus",
 
2440
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2441
                   "socket", "foreground", "zeroconf"):
2388
2442
        value = getattr(options, option)
2389
2443
        if value is not None:
2390
2444
            server_settings[option] = value
2391
2445
    del options
2392
2446
    # Force all strings to be unicode
2393
2447
    for option in server_settings.keys():
2394
 
        if type(server_settings[option]) is str:
2395
 
            server_settings[option] = unicode(server_settings[option])
 
2448
        if isinstance(server_settings[option], bytes):
 
2449
            server_settings[option] = (server_settings[option]
 
2450
                                       .decode("utf-8"))
2396
2451
    # Force all boolean options to be boolean
2397
2452
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2398
 
                   "foreground"):
 
2453
                   "foreground", "zeroconf"):
2399
2454
        server_settings[option] = bool(server_settings[option])
2400
2455
    # Debug implies foreground
2401
2456
    if server_settings["debug"]:
2404
2459
    
2405
2460
    ##################################################################
2406
2461
    
 
2462
    if (not server_settings["zeroconf"]
 
2463
        and not (server_settings["port"]
 
2464
                 or server_settings["socket"] != "")):
 
2465
        parser.error("Needs port or socket to work without Zeroconf")
 
2466
    
2407
2467
    # For convenience
2408
2468
    debug = server_settings["debug"]
2409
2469
    debuglevel = server_settings["debuglevel"]
2412
2472
    stored_state_path = os.path.join(server_settings["statedir"],
2413
2473
                                     stored_state_file)
2414
2474
    foreground = server_settings["foreground"]
 
2475
    zeroconf = server_settings["zeroconf"]
2415
2476
    
2416
2477
    if debug:
2417
2478
        initlogger(debug, logging.DEBUG)
2423
2484
            initlogger(debug, level)
2424
2485
    
2425
2486
    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"])))
 
2487
        syslogger.setFormatter(
 
2488
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2489
                              ' %(levelname)s: %(message)s'.format(
 
2490
                                  server_settings["servicename"])))
2431
2491
    
2432
2492
    # Parse config file with clients
2433
2493
    client_config = configparser.SafeConfigParser(Client
2438
2498
    global mandos_dbus_service
2439
2499
    mandos_dbus_service = None
2440
2500
    
2441
 
    tcp_server = MandosServer((server_settings["address"],
2442
 
                               server_settings["port"]),
2443
 
                              ClientHandler,
2444
 
                              interface=(server_settings["interface"]
2445
 
                                         or None),
2446
 
                              use_ipv6=use_ipv6,
2447
 
                              gnutls_priority=
2448
 
                              server_settings["priority"],
2449
 
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
 
2501
    socketfd = None
 
2502
    if server_settings["socket"] != "":
 
2503
        socketfd = server_settings["socket"]
 
2504
    tcp_server = MandosServer(
 
2505
        (server_settings["address"], server_settings["port"]),
 
2506
        ClientHandler,
 
2507
        interface=(server_settings["interface"] or None),
 
2508
        use_ipv6=use_ipv6,
 
2509
        gnutls_priority=server_settings["priority"],
 
2510
        use_dbus=use_dbus,
 
2511
        socketfd=socketfd)
2452
2512
    if not foreground:
2453
 
        pidfilename = "/var/run/mandos.pid"
 
2513
        pidfilename = "/run/mandos.pid"
 
2514
        if not os.path.isdir("/run/."):
 
2515
            pidfilename = "/var/run/mandos.pid"
2454
2516
        pidfile = None
2455
2517
        try:
2456
 
            pidfile = open(pidfilename, "w")
 
2518
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2457
2519
        except IOError as e:
2458
2520
            logger.error("Could not open file %r", pidfilename,
2459
2521
                         exc_info=e)
2473
2535
        os.setuid(uid)
2474
2536
    except OSError as error:
2475
2537
        if error.errno != errno.EPERM:
2476
 
            raise error
 
2538
            raise
2477
2539
    
2478
2540
    if debug:
2479
2541
        # Enable all possible GnuTLS debugging
2486
2548
        def debug_gnutls(level, string):
2487
2549
            logger.debug("GnuTLS: %s", string[:-1])
2488
2550
        
2489
 
        (gnutls.library.functions
2490
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2551
        gnutls.library.functions.gnutls_global_set_log_function(
 
2552
            debug_gnutls)
2491
2553
        
2492
2554
        # Redirect stdin so all checkers get /dev/null
2493
2555
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2513
2575
    if use_dbus:
2514
2576
        try:
2515
2577
            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:
 
2578
                                            bus,
 
2579
                                            do_not_queue=True)
 
2580
            old_bus_name = dbus.service.BusName(
 
2581
                "se.bsnet.fukt.Mandos", bus,
 
2582
                do_not_queue=True)
 
2583
        except dbus.exceptions.DBusException as e:
2521
2584
            logger.error("Disabling D-Bus:", exc_info=e)
2522
2585
            use_dbus = False
2523
2586
            server_settings["use_dbus"] = False
2524
2587
            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"])))
 
2588
    if zeroconf:
 
2589
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2590
        service = AvahiServiceToSyslog(
 
2591
            name = server_settings["servicename"],
 
2592
            servicetype = "_mandos._tcp",
 
2593
            protocol = protocol,
 
2594
            bus = bus)
 
2595
        if server_settings["interface"]:
 
2596
            service.interface = if_nametoindex(
 
2597
                server_settings["interface"].encode("utf-8"))
2533
2598
    
2534
2599
    global multiprocessing_manager
2535
2600
    multiprocessing_manager = multiprocessing.Manager()
2554
2619
    if server_settings["restore"]:
2555
2620
        try:
2556
2621
            with open(stored_state_path, "rb") as stored_state:
2557
 
                clients_data, old_client_settings = (pickle.load
2558
 
                                                     (stored_state))
 
2622
                clients_data, old_client_settings = pickle.load(
 
2623
                    stored_state)
2559
2624
            os.remove(stored_state_path)
2560
2625
        except IOError as e:
2561
2626
            if e.errno == errno.ENOENT:
2562
 
                logger.warning("Could not load persistent state: {0}"
2563
 
                                .format(os.strerror(e.errno)))
 
2627
                logger.warning("Could not load persistent state:"
 
2628
                               " {}".format(os.strerror(e.errno)))
2564
2629
            else:
2565
2630
                logger.critical("Could not load persistent state:",
2566
2631
                                exc_info=e)
2567
2632
                raise
2568
2633
        except EOFError as e:
2569
2634
            logger.warning("Could not load persistent state: "
2570
 
                           "EOFError:", exc_info=e)
 
2635
                           "EOFError:",
 
2636
                           exc_info=e)
2571
2637
    
2572
2638
    with PGPEngine() as pgp:
2573
 
        for client_name, client in clients_data.iteritems():
 
2639
        for client_name, client in clients_data.items():
2574
2640
            # Skip removed clients
2575
2641
            if client_name not in client_settings:
2576
2642
                continue
2585
2651
                    # For each value in new config, check if it
2586
2652
                    # differs from the old config value (Except for
2587
2653
                    # the "secret" attribute)
2588
 
                    if (name != "secret" and
2589
 
                        value != old_client_settings[client_name]
2590
 
                        [name]):
 
2654
                    if (name != "secret"
 
2655
                        and (value !=
 
2656
                             old_client_settings[client_name][name])):
2591
2657
                        client[name] = value
2592
2658
                except KeyError:
2593
2659
                    pass
2594
2660
            
2595
2661
            # Clients who has passed its expire date can still be
2596
 
            # enabled if its last checker was successful.  Clients
 
2662
            # enabled if its last checker was successful.  A Client
2597
2663
            # whose checker succeeded before we stored its state is
2598
2664
            # assumed to have successfully run all checkers during
2599
2665
            # downtime.
2601
2667
                if datetime.datetime.utcnow() >= client["expires"]:
2602
2668
                    if not client["last_checked_ok"]:
2603
2669
                        logger.warning(
2604
 
                            "disabling client {0} - Client never "
2605
 
                            "performed a successful checker"
2606
 
                            .format(client_name))
 
2670
                            "disabling client {} - Client never "
 
2671
                            "performed a successful checker".format(
 
2672
                                client_name))
2607
2673
                        client["enabled"] = False
2608
2674
                    elif client["last_checker_status"] != 0:
2609
2675
                        logger.warning(
2610
 
                            "disabling client {0} - Client "
2611
 
                            "last checker failed with error code {1}"
2612
 
                            .format(client_name,
2613
 
                                    client["last_checker_status"]))
 
2676
                            "disabling client {} - Client last"
 
2677
                            " checker failed with error code"
 
2678
                            " {}".format(
 
2679
                                client_name,
 
2680
                                client["last_checker_status"]))
2614
2681
                        client["enabled"] = False
2615
2682
                    else:
2616
 
                        client["expires"] = (datetime.datetime
2617
 
                                             .utcnow()
2618
 
                                             + client["timeout"])
 
2683
                        client["expires"] = (
 
2684
                            datetime.datetime.utcnow()
 
2685
                            + client["timeout"])
2619
2686
                        logger.debug("Last checker succeeded,"
2620
 
                                     " keeping {0} enabled"
2621
 
                                     .format(client_name))
 
2687
                                     " keeping {} enabled".format(
 
2688
                                         client_name))
2622
2689
            try:
2623
 
                client["secret"] = (
2624
 
                    pgp.decrypt(client["encrypted_secret"],
2625
 
                                client_settings[client_name]
2626
 
                                ["secret"]))
 
2690
                client["secret"] = pgp.decrypt(
 
2691
                    client["encrypted_secret"],
 
2692
                    client_settings[client_name]["secret"])
2627
2693
            except PGPError:
2628
2694
                # 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"])
 
2695
                logger.debug("Failed to decrypt {} old secret".format(
 
2696
                    client_name))
 
2697
                client["secret"] = (client_settings[client_name]
 
2698
                                    ["secret"])
2633
2699
    
2634
2700
    # Add/remove clients based on new changes made to config
2635
2701
    for client_name in (set(old_client_settings)
2640
2706
        clients_data[client_name] = client_settings[client_name]
2641
2707
    
2642
2708
    # Create all client objects
2643
 
    for client_name, client in clients_data.iteritems():
 
2709
    for client_name, client in clients_data.items():
2644
2710
        tcp_server.clients[client_name] = client_class(
2645
 
            name = client_name, settings = client,
 
2711
            name = client_name,
 
2712
            settings = client,
2646
2713
            server_settings = server_settings)
2647
2714
    
2648
2715
    if not tcp_server.clients:
2650
2717
    
2651
2718
    if not foreground:
2652
2719
        if pidfile is not None:
 
2720
            pid = os.getpid()
2653
2721
            try:
2654
2722
                with pidfile:
2655
 
                    pid = os.getpid()
2656
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2723
                    print(pid, file=pidfile)
2657
2724
            except IOError:
2658
2725
                logger.error("Could not write to file %r with PID %d",
2659
2726
                             pidfilename, pid)
2664
2731
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2665
2732
    
2666
2733
    if use_dbus:
2667
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2668
 
                                        "se.bsnet.fukt.Mandos"})
 
2734
        
 
2735
        @alternate_dbus_interfaces(
 
2736
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2669
2737
        class MandosDBusService(DBusObjectWithProperties):
2670
2738
            """A D-Bus proxy object"""
 
2739
            
2671
2740
            def __init__(self):
2672
2741
                dbus.service.Object.__init__(self, bus, "/")
 
2742
            
2673
2743
            _interface = "se.recompile.Mandos"
2674
2744
            
2675
2745
            @dbus_interface_annotations(_interface)
2676
2746
            def _foo(self):
2677
 
                return { "org.freedesktop.DBus.Property"
2678
 
                         ".EmitsChangedSignal":
2679
 
                             "false"}
 
2747
                return {
 
2748
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2749
                    "false" }
2680
2750
            
2681
2751
            @dbus.service.signal(_interface, signature="o")
2682
2752
            def ClientAdded(self, objpath):
2696
2766
            @dbus.service.method(_interface, out_signature="ao")
2697
2767
            def GetAllClients(self):
2698
2768
                "D-Bus method"
2699
 
                return dbus.Array(c.dbus_object_path
2700
 
                                  for c in
 
2769
                return dbus.Array(c.dbus_object_path for c in
2701
2770
                                  tcp_server.clients.itervalues())
2702
2771
            
2703
2772
            @dbus.service.method(_interface,
2705
2774
            def GetAllClientsWithProperties(self):
2706
2775
                "D-Bus method"
2707
2776
                return dbus.Dictionary(
2708
 
                    ((c.dbus_object_path, c.GetAll(""))
2709
 
                     for c in tcp_server.clients.itervalues()),
 
2777
                    { c.dbus_object_path: c.GetAll("")
 
2778
                      for c in tcp_server.clients.itervalues() },
2710
2779
                    signature="oa{sv}")
2711
2780
            
2712
2781
            @dbus.service.method(_interface, in_signature="o")
2729
2798
    
2730
2799
    def cleanup():
2731
2800
        "Cleanup function; run on exit"
2732
 
        service.cleanup()
 
2801
        if zeroconf:
 
2802
            service.cleanup()
2733
2803
        
2734
2804
        multiprocessing.active_children()
2735
2805
        wnull.close()
2749
2819
                
2750
2820
                # A list of attributes that can not be pickled
2751
2821
                # + secret.
2752
 
                exclude = set(("bus", "changedstate", "secret",
2753
 
                               "checker", "server_settings"))
2754
 
                for name, typ in (inspect.getmembers
2755
 
                                  (dbus.service.Object)):
 
2822
                exclude = { "bus", "changedstate", "secret",
 
2823
                            "checker", "server_settings" }
 
2824
                for name, typ in inspect.getmembers(dbus.service
 
2825
                                                    .Object):
2756
2826
                    exclude.add(name)
2757
2827
                
2758
2828
                client_dict["encrypted_secret"] = (client
2765
2835
                del client_settings[client.name]["secret"]
2766
2836
        
2767
2837
        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:
 
2838
            with tempfile.NamedTemporaryFile(
 
2839
                    mode='wb',
 
2840
                    suffix=".pickle",
 
2841
                    prefix='clients-',
 
2842
                    dir=os.path.dirname(stored_state_path),
 
2843
                    delete=False) as stored_state:
2772
2844
                pickle.dump((clients, client_settings), stored_state)
2773
 
                tempname=stored_state.name
 
2845
                tempname = stored_state.name
2774
2846
            os.rename(tempname, stored_state_path)
2775
2847
        except (IOError, OSError) as e:
2776
2848
            if not debug:
2779
2851
                except NameError:
2780
2852
                    pass
2781
2853
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
 
                logger.warning("Could not save persistent state: {0}"
 
2854
                logger.warning("Could not save persistent state: {}"
2783
2855
                               .format(os.strerror(e.errno)))
2784
2856
            else:
2785
2857
                logger.warning("Could not save persistent state:",
2786
2858
                               exc_info=e)
2787
 
                raise e
 
2859
                raise
2788
2860
        
2789
2861
        # Delete all clients, and settings from config
2790
2862
        while tcp_server.clients:
2795
2867
            client.disable(quiet=True)
2796
2868
            if use_dbus:
2797
2869
                # Emit D-Bus signal
2798
 
                mandos_dbus_service.ClientRemoved(client
2799
 
                                                  .dbus_object_path,
2800
 
                                                  client.name)
 
2870
                mandos_dbus_service.ClientRemoved(
 
2871
                    client.dbus_object_path, client.name)
2801
2872
        client_settings.clear()
2802
2873
    
2803
2874
    atexit.register(cleanup)
2814
2885
    tcp_server.server_activate()
2815
2886
    
2816
2887
    # Find out what port we got
2817
 
    service.port = tcp_server.socket.getsockname()[1]
 
2888
    if zeroconf:
 
2889
        service.port = tcp_server.socket.getsockname()[1]
2818
2890
    if use_ipv6:
2819
2891
        logger.info("Now listening on address %r, port %d,"
2820
2892
                    " flowinfo %d, scope_id %d",
2826
2898
    #service.interface = tcp_server.socket.getsockname()[3]
2827
2899
    
2828
2900
    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
 
2901
        if zeroconf:
 
2902
            # From the Avahi example code
 
2903
            try:
 
2904
                service.activate()
 
2905
            except dbus.exceptions.DBusException as error:
 
2906
                logger.critical("D-Bus Exception", exc_info=error)
 
2907
                cleanup()
 
2908
                sys.exit(1)
 
2909
            # End of Avahi example code
2837
2910
        
2838
2911
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2839
2912
                             lambda *args, **kwargs:
2854
2927
    # Must run before the D-Bus bus name gets deregistered
2855
2928
    cleanup()
2856
2929
 
 
2930
 
2857
2931
if __name__ == '__main__':
2858
2932
    main()