/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2014-07-16 01:41:23 UTC
  • Revision ID: teddy@recompile.se-20140716014123-kc87e8yoyqkzo24u
plugin-runner: Bug Fix: Fix some memory leaks.

* plugin-runner.c (main): Free the individual direntries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2015 Teddy Hogeborn
15
 
# Copyright © 2008-2015 Björn Påhlsson
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
try:
40
 
    import SocketServer as socketserver
41
 
except ImportError:
42
 
    import socketserver
 
39
import SocketServer as socketserver
43
40
import socket
44
41
import argparse
45
42
import datetime
50
47
import gnutls.library.functions
51
48
import gnutls.library.constants
52
49
import gnutls.library.types
53
 
try:
54
 
    import ConfigParser as configparser
55
 
except ImportError:
56
 
    import configparser
 
50
import ConfigParser as configparser
57
51
import sys
58
52
import re
59
53
import os
68
62
import struct
69
63
import fcntl
70
64
import functools
71
 
try:
72
 
    import cPickle as pickle
73
 
except ImportError:
74
 
    import pickle
 
65
import cPickle as pickle
75
66
import multiprocessing
76
67
import types
77
68
import binascii
81
72
 
82
73
import dbus
83
74
import dbus.service
84
 
try:
85
 
    import gobject
86
 
except ImportError:
87
 
    from gi.repository import GObject as gobject
 
75
import gobject
88
76
import avahi
89
77
from dbus.mainloop.glib import DBusGMainLoop
90
78
import ctypes
100
88
    except ImportError:
101
89
        SO_BINDTODEVICE = None
102
90
 
103
 
if sys.version_info.major == 2:
104
 
    str = unicode
105
 
 
106
 
version = "1.6.9"
 
91
version = "1.6.6"
107
92
stored_state_file = "clients.pickle"
108
93
 
109
94
logger = logging.getLogger()
110
95
syslogger = None
111
96
 
112
97
try:
113
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
114
 
        ctypes.util.find_library("c")).if_nametoindex
 
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
                      (ctypes.util.find_library("c"))
 
100
                      .if_nametoindex)
115
101
except (OSError, AttributeError):
116
 
    
117
102
    def if_nametoindex(interface):
118
103
        "Get an interface index the hard way, i.e. using fcntl()"
119
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
120
105
        with contextlib.closing(socket.socket()) as s:
121
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
122
 
                                struct.pack(b"16s16x", interface))
123
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
107
                                struct.pack(str("16s16x"),
 
108
                                            interface))
 
109
        interface_index = struct.unpack(str("I"),
 
110
                                        ifreq[16:20])[0]
124
111
        return interface_index
125
112
 
126
113
 
128
115
    """init logger and add loglevel"""
129
116
    
130
117
    global syslogger
131
 
    syslogger = (logging.handlers.SysLogHandler(
132
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
133
 
        address = "/dev/log"))
 
118
    syslogger = (logging.handlers.SysLogHandler
 
119
                 (facility =
 
120
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
121
                  address = str("/dev/log")))
134
122
    syslogger.setFormatter(logging.Formatter
135
123
                           ('Mandos [%(process)d]: %(levelname)s:'
136
124
                            ' %(message)s'))
153
141
 
154
142
class PGPEngine(object):
155
143
    """A simple class for OpenPGP symmetric encryption & decryption"""
156
 
    
157
144
    def __init__(self):
158
145
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
159
146
        self.gnupgargs = ['--batch',
198
185
    
199
186
    def encrypt(self, data, password):
200
187
        passphrase = self.password_encode(password)
201
 
        with tempfile.NamedTemporaryFile(
202
 
                dir=self.tempdir) as passfile:
 
188
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
189
                                         ) as passfile:
203
190
            passfile.write(passphrase)
204
191
            passfile.flush()
205
192
            proc = subprocess.Popen(['gpg', '--symmetric',
216
203
    
217
204
    def decrypt(self, data, password):
218
205
        passphrase = self.password_encode(password)
219
 
        with tempfile.NamedTemporaryFile(
220
 
                dir = self.tempdir) as passfile:
 
206
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
207
                                         ) as passfile:
221
208
            passfile.write(passphrase)
222
209
            passfile.flush()
223
210
            proc = subprocess.Popen(['gpg', '--decrypt',
227
214
                                    stdin = subprocess.PIPE,
228
215
                                    stdout = subprocess.PIPE,
229
216
                                    stderr = subprocess.PIPE)
230
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
217
            decrypted_plaintext, err = proc.communicate(input
 
218
                                                        = data)
231
219
        if proc.returncode != 0:
232
220
            raise PGPError(err)
233
221
        return decrypted_plaintext
236
224
class AvahiError(Exception):
237
225
    def __init__(self, value, *args, **kwargs):
238
226
        self.value = value
239
 
        return super(AvahiError, self).__init__(value, *args,
240
 
                                                **kwargs)
241
 
 
 
227
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
228
    def __unicode__(self):
 
229
        return unicode(repr(self.value))
242
230
 
243
231
class AvahiServiceError(AvahiError):
244
232
    pass
245
233
 
246
 
 
247
234
class AvahiGroupError(AvahiError):
248
235
    pass
249
236
 
269
256
    bus: dbus.SystemBus()
270
257
    """
271
258
    
272
 
    def __init__(self,
273
 
                 interface = avahi.IF_UNSPEC,
274
 
                 name = None,
275
 
                 servicetype = None,
276
 
                 port = None,
277
 
                 TXT = None,
278
 
                 domain = "",
279
 
                 host = "",
280
 
                 max_renames = 32768,
281
 
                 protocol = avahi.PROTO_UNSPEC,
282
 
                 bus = None):
 
259
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
260
                 servicetype = None, port = None, TXT = None,
 
261
                 domain = "", host = "", max_renames = 32768,
 
262
                 protocol = avahi.PROTO_UNSPEC, bus = None):
283
263
        self.interface = interface
284
264
        self.name = name
285
265
        self.type = servicetype
295
275
        self.bus = bus
296
276
        self.entry_group_state_changed_match = None
297
277
    
298
 
    def rename(self, remove=True):
 
278
    def rename(self):
299
279
        """Derived from the Avahi example code"""
300
280
        if self.rename_count >= self.max_renames:
301
281
            logger.critical("No suitable Zeroconf service name found"
302
282
                            " after %i retries, exiting.",
303
283
                            self.rename_count)
304
284
            raise AvahiServiceError("Too many renames")
305
 
        self.name = str(
306
 
            self.server.GetAlternativeServiceName(self.name))
307
 
        self.rename_count += 1
 
285
        self.name = unicode(self.server
 
286
                            .GetAlternativeServiceName(self.name))
308
287
        logger.info("Changing Zeroconf service name to %r ...",
309
288
                    self.name)
310
 
        if remove:
311
 
            self.remove()
 
289
        self.remove()
312
290
        try:
313
291
            self.add()
314
292
        except dbus.exceptions.DBusException as error:
315
 
            if (error.get_dbus_name()
316
 
                == "org.freedesktop.Avahi.CollisionError"):
317
 
                logger.info("Local Zeroconf service name collision.")
318
 
                return self.rename(remove=False)
319
 
            else:
320
 
                logger.critical("D-Bus Exception", exc_info=error)
321
 
                self.cleanup()
322
 
                os._exit(1)
 
293
            logger.critical("D-Bus Exception", exc_info=error)
 
294
            self.cleanup()
 
295
            os._exit(1)
 
296
        self.rename_count += 1
323
297
    
324
298
    def remove(self):
325
299
        """Derived from the Avahi example code"""
363
337
            self.rename()
364
338
        elif state == avahi.ENTRY_GROUP_FAILURE:
365
339
            logger.critical("Avahi: Error in group state changed %s",
366
 
                            str(error))
367
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
340
                            unicode(error))
 
341
            raise AvahiGroupError("State changed: {0!s}"
 
342
                                  .format(error))
368
343
    
369
344
    def cleanup(self):
370
345
        """Derived from the Avahi example code"""
380
355
    def server_state_changed(self, state, error=None):
381
356
        """Derived from the Avahi example code"""
382
357
        logger.debug("Avahi server state change: %i", state)
383
 
        bad_states = {
384
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
385
 
            avahi.SERVER_REGISTERING: None,
386
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
387
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
388
 
        }
 
358
        bad_states = { avahi.SERVER_INVALID:
 
359
                           "Zeroconf server invalid",
 
360
                       avahi.SERVER_REGISTERING: None,
 
361
                       avahi.SERVER_COLLISION:
 
362
                           "Zeroconf server name collision",
 
363
                       avahi.SERVER_FAILURE:
 
364
                           "Zeroconf server failure" }
389
365
        if state in bad_states:
390
366
            if bad_states[state] is not None:
391
367
                if error is None:
410
386
                                    follow_name_owner_changes=True),
411
387
                avahi.DBUS_INTERFACE_SERVER)
412
388
        self.server.connect_to_signal("StateChanged",
413
 
                                      self.server_state_changed)
 
389
                                 self.server_state_changed)
414
390
        self.server_state_changed(self.server.GetState())
415
391
 
416
392
 
417
393
class AvahiServiceToSyslog(AvahiService):
418
 
    def rename(self, *args, **kwargs):
 
394
    def rename(self):
419
395
        """Add the new name to the syslog messages"""
420
 
        ret = AvahiService.rename(self, *args, **kwargs)
421
 
        syslogger.setFormatter(logging.Formatter(
422
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
423
 
            .format(self.name)))
 
396
        ret = AvahiService.rename(self)
 
397
        syslogger.setFormatter(logging.Formatter
 
398
                               ('Mandos ({0}) [%(process)d]:'
 
399
                                ' %(levelname)s: %(message)s'
 
400
                                .format(self.name)))
424
401
        return ret
425
402
 
426
 
def subprocess_call_pipe(connection, # : multiprocessing.Connection
427
 
                         *args, **kwargs):
428
 
    """This function is meant to be called by multiprocessing.Process
429
 
    
430
 
    This function runs a synchronous subprocess.call(), and writes the
431
 
    resulting return code on the provided multiprocessing.Connection.
432
 
    """
433
 
    connection.send(subprocess.call(*args, **kwargs))
434
 
    connection.close()
 
403
 
 
404
def timedelta_to_milliseconds(td):
 
405
    "Convert a datetime.timedelta() to milliseconds"
 
406
    return ((td.days * 24 * 60 * 60 * 1000)
 
407
            + (td.seconds * 1000)
 
408
            + (td.microseconds // 1000))
 
409
 
435
410
 
436
411
class Client(object):
437
412
    """A representation of a client host served by this server.
464
439
    last_checker_status: integer between 0 and 255 reflecting exit
465
440
                         status of last checker. -1 reflects crashed
466
441
                         checker, -2 means no checker completed yet.
467
 
    last_checker_signal: The signal which killed the last checker, if
468
 
                         last_checker_status is -1
469
442
    last_enabled: datetime.datetime(); (UTC) or None
470
443
    name:       string; from the config file, used in log messages and
471
444
                        D-Bus identifiers
484
457
                          "fingerprint", "host", "interval",
485
458
                          "last_approval_request", "last_checked_ok",
486
459
                          "last_enabled", "name", "timeout")
487
 
    client_defaults = {
488
 
        "timeout": "PT5M",
489
 
        "extended_timeout": "PT15M",
490
 
        "interval": "PT2M",
491
 
        "checker": "fping -q -- %%(host)s",
492
 
        "host": "",
493
 
        "approval_delay": "PT0S",
494
 
        "approval_duration": "PT1S",
495
 
        "approved_by_default": "True",
496
 
        "enabled": "True",
497
 
    }
 
460
    client_defaults = { "timeout": "PT5M",
 
461
                        "extended_timeout": "PT15M",
 
462
                        "interval": "PT2M",
 
463
                        "checker": "fping -q -- %%(host)s",
 
464
                        "host": "",
 
465
                        "approval_delay": "PT0S",
 
466
                        "approval_duration": "PT1S",
 
467
                        "approved_by_default": "True",
 
468
                        "enabled": "True",
 
469
                        }
 
470
    
 
471
    def timeout_milliseconds(self):
 
472
        "Return the 'timeout' attribute in milliseconds"
 
473
        return timedelta_to_milliseconds(self.timeout)
 
474
    
 
475
    def extended_timeout_milliseconds(self):
 
476
        "Return the 'extended_timeout' attribute in milliseconds"
 
477
        return timedelta_to_milliseconds(self.extended_timeout)
 
478
    
 
479
    def interval_milliseconds(self):
 
480
        "Return the 'interval' attribute in milliseconds"
 
481
        return timedelta_to_milliseconds(self.interval)
 
482
    
 
483
    def approval_delay_milliseconds(self):
 
484
        return timedelta_to_milliseconds(self.approval_delay)
498
485
    
499
486
    @staticmethod
500
487
    def config_parser(config):
516
503
            client["enabled"] = config.getboolean(client_name,
517
504
                                                  "enabled")
518
505
            
519
 
            # Uppercase and remove spaces from fingerprint for later
520
 
            # comparison purposes with return value from the
521
 
            # fingerprint() function
522
506
            client["fingerprint"] = (section["fingerprint"].upper()
523
507
                                     .replace(" ", ""))
524
508
            if "secret" in section:
529
513
                          "rb") as secfile:
530
514
                    client["secret"] = secfile.read()
531
515
            else:
532
 
                raise TypeError("No secret or secfile for section {}"
 
516
                raise TypeError("No secret or secfile for section {0}"
533
517
                                .format(section))
534
518
            client["timeout"] = string_to_delta(section["timeout"])
535
519
            client["extended_timeout"] = string_to_delta(
552
536
            server_settings = {}
553
537
        self.server_settings = server_settings
554
538
        # adding all client settings
555
 
        for setting, value in settings.items():
 
539
        for setting, value in settings.iteritems():
556
540
            setattr(self, setting, value)
557
541
        
558
542
        if self.enabled:
566
550
            self.expires = None
567
551
        
568
552
        logger.debug("Creating client %r", self.name)
 
553
        # Uppercase and remove spaces from fingerprint for later
 
554
        # comparison purposes with return value from the fingerprint()
 
555
        # function
569
556
        logger.debug("  Fingerprint: %s", self.fingerprint)
570
557
        self.created = settings.get("created",
571
558
                                    datetime.datetime.utcnow())
578
565
        self.current_checker_command = None
579
566
        self.approved = None
580
567
        self.approvals_pending = 0
581
 
        self.changedstate = multiprocessing_manager.Condition(
582
 
            multiprocessing_manager.Lock())
583
 
        self.client_structure = [attr
584
 
                                 for attr in self.__dict__.iterkeys()
 
568
        self.changedstate = (multiprocessing_manager
 
569
                             .Condition(multiprocessing_manager
 
570
                                        .Lock()))
 
571
        self.client_structure = [attr for attr in
 
572
                                 self.__dict__.iterkeys()
585
573
                                 if not attr.startswith("_")]
586
574
        self.client_structure.append("client_structure")
587
575
        
588
 
        for name, t in inspect.getmembers(
589
 
                type(self), lambda obj: isinstance(obj, property)):
 
576
        for name, t in inspect.getmembers(type(self),
 
577
                                          lambda obj:
 
578
                                              isinstance(obj,
 
579
                                                         property)):
590
580
            if not name.startswith("_"):
591
581
                self.client_structure.append(name)
592
582
    
634
624
        # and every interval from then on.
635
625
        if self.checker_initiator_tag is not None:
636
626
            gobject.source_remove(self.checker_initiator_tag)
637
 
        self.checker_initiator_tag = gobject.timeout_add(
638
 
            int(self.interval.total_seconds() * 1000),
639
 
            self.start_checker)
 
627
        self.checker_initiator_tag = (gobject.timeout_add
 
628
                                      (self.interval_milliseconds(),
 
629
                                       self.start_checker))
640
630
        # Schedule a disable() when 'timeout' has passed
641
631
        if self.disable_initiator_tag is not None:
642
632
            gobject.source_remove(self.disable_initiator_tag)
643
 
        self.disable_initiator_tag = gobject.timeout_add(
644
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
633
        self.disable_initiator_tag = (gobject.timeout_add
 
634
                                   (self.timeout_milliseconds(),
 
635
                                    self.disable))
645
636
        # Also start a new checker *right now*.
646
637
        self.start_checker()
647
638
    
648
 
    def checker_callback(self, source, condition,
649
 
                         (connection, command)):
 
639
    def checker_callback(self, pid, condition, command):
650
640
        """The checker has completed, so take appropriate actions."""
651
641
        self.checker_callback_tag = None
652
642
        self.checker = None
653
 
        # Read return code from connection (see subprocess_call_pipe)
654
 
        returncode = connection.recv()
655
 
        connection.close()
656
 
        
657
 
        if returncode >= 0:
658
 
            self.last_checker_status = returncode
659
 
            self.last_checker_signal = None
 
643
        if os.WIFEXITED(condition):
 
644
            self.last_checker_status = os.WEXITSTATUS(condition)
660
645
            if self.last_checker_status == 0:
661
646
                logger.info("Checker for %(name)s succeeded",
662
647
                            vars(self))
663
648
                self.checked_ok()
664
649
            else:
665
 
                logger.info("Checker for %(name)s failed", vars(self))
 
650
                logger.info("Checker for %(name)s failed",
 
651
                            vars(self))
666
652
        else:
667
653
            self.last_checker_status = -1
668
 
            self.last_checker_signal = -returncode
669
654
            logger.warning("Checker for %(name)s crashed?",
670
655
                           vars(self))
671
 
        return False
672
656
    
673
657
    def checked_ok(self):
674
658
        """Assert that the client has been seen, alive and well."""
675
659
        self.last_checked_ok = datetime.datetime.utcnow()
676
660
        self.last_checker_status = 0
677
 
        self.last_checker_signal = None
678
661
        self.bump_timeout()
679
662
    
680
663
    def bump_timeout(self, timeout=None):
685
668
            gobject.source_remove(self.disable_initiator_tag)
686
669
            self.disable_initiator_tag = None
687
670
        if getattr(self, "enabled", False):
688
 
            self.disable_initiator_tag = gobject.timeout_add(
689
 
                int(timeout.total_seconds() * 1000), self.disable)
 
671
            self.disable_initiator_tag = (gobject.timeout_add
 
672
                                          (timedelta_to_milliseconds
 
673
                                           (timeout), self.disable))
690
674
            self.expires = datetime.datetime.utcnow() + timeout
691
675
    
692
676
    def need_approval(self):
706
690
        # than 'timeout' for the client to be disabled, which is as it
707
691
        # should be.
708
692
        
709
 
        if self.checker is not None and not self.checker.is_alive():
710
 
            logger.warning("Checker was not alive; joining")
711
 
            self.checker.join()
712
 
            self.checker = None
 
693
        # If a checker exists, make sure it is not a zombie
 
694
        try:
 
695
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
696
        except AttributeError:
 
697
            pass
 
698
        except OSError as error:
 
699
            if error.errno != errno.ECHILD:
 
700
                raise
 
701
        else:
 
702
            if pid:
 
703
                logger.warning("Checker was a zombie")
 
704
                gobject.source_remove(self.checker_callback_tag)
 
705
                self.checker_callback(pid, status,
 
706
                                      self.current_checker_command)
713
707
        # Start a new checker if needed
714
708
        if self.checker is None:
715
709
            # Escape attributes for the shell
716
 
            escaped_attrs = {
717
 
                attr: re.escape(str(getattr(self, attr)))
718
 
                for attr in self.runtime_expansions }
 
710
            escaped_attrs = dict(
 
711
                (attr, re.escape(unicode(getattr(self, attr))))
 
712
                for attr in
 
713
                self.runtime_expansions)
719
714
            try:
720
715
                command = self.checker_command % escaped_attrs
721
716
            except TypeError as error:
722
717
                logger.error('Could not format string "%s"',
723
 
                             self.checker_command,
 
718
                             self.checker_command, exc_info=error)
 
719
                return True # Try again later
 
720
            self.current_checker_command = command
 
721
            try:
 
722
                logger.info("Starting checker %r for %s",
 
723
                            command, self.name)
 
724
                # We don't need to redirect stdout and stderr, since
 
725
                # in normal mode, that is already done by daemon(),
 
726
                # and in debug mode we don't want to.  (Stdin is
 
727
                # always replaced by /dev/null.)
 
728
                # The exception is when not debugging but nevertheless
 
729
                # running in the foreground; use the previously
 
730
                # created wnull.
 
731
                popen_args = {}
 
732
                if (not self.server_settings["debug"]
 
733
                    and self.server_settings["foreground"]):
 
734
                    popen_args.update({"stdout": wnull,
 
735
                                       "stderr": wnull })
 
736
                self.checker = subprocess.Popen(command,
 
737
                                                close_fds=True,
 
738
                                                shell=True, cwd="/",
 
739
                                                **popen_args)
 
740
            except OSError as error:
 
741
                logger.error("Failed to start subprocess",
724
742
                             exc_info=error)
725
 
                return True     # Try again later
726
 
            self.current_checker_command = command
727
 
            logger.info("Starting checker %r for %s", command,
728
 
                        self.name)
729
 
            # We don't need to redirect stdout and stderr, since
730
 
            # in normal mode, that is already done by daemon(),
731
 
            # and in debug mode we don't want to.  (Stdin is
732
 
            # always replaced by /dev/null.)
733
 
            # The exception is when not debugging but nevertheless
734
 
            # running in the foreground; use the previously
735
 
            # created wnull.
736
 
            popen_args = { "close_fds": True,
737
 
                           "shell": True,
738
 
                           "cwd": "/" }
739
 
            if (not self.server_settings["debug"]
740
 
                and self.server_settings["foreground"]):
741
 
                popen_args.update({"stdout": wnull,
742
 
                                   "stderr": wnull })
743
 
            pipe = multiprocessing.Pipe(duplex=False)
744
 
            self.checker = multiprocessing.Process(
745
 
                target=subprocess_call_pipe, args=(pipe[1], command),
746
 
                kwargs=popen_args)
747
 
            self.checker.start()
748
 
            self.checker_callback_tag = gobject.io_add_watch(
749
 
                pipe[0].fileno(), gobject.IO_IN,
750
 
                self.checker_callback, (pipe[0], command))
 
743
                return True
 
744
            self.checker_callback_tag = (gobject.child_watch_add
 
745
                                         (self.checker.pid,
 
746
                                          self.checker_callback,
 
747
                                          data=command))
 
748
            # The checker may have completed before the gobject
 
749
            # watch was added.  Check for this.
 
750
            try:
 
751
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
752
            except OSError as error:
 
753
                if error.errno == errno.ECHILD:
 
754
                    # This should never happen
 
755
                    logger.error("Child process vanished",
 
756
                                 exc_info=error)
 
757
                    return True
 
758
                raise
 
759
            if pid:
 
760
                gobject.source_remove(self.checker_callback_tag)
 
761
                self.checker_callback(pid, status, command)
751
762
        # Re-run this periodically if run by gobject.timeout_add
752
763
        return True
753
764
    
759
770
        if getattr(self, "checker", None) is None:
760
771
            return
761
772
        logger.debug("Stopping checker for %(name)s", vars(self))
762
 
        self.checker.terminate()
 
773
        try:
 
774
            self.checker.terminate()
 
775
            #time.sleep(0.5)
 
776
            #if self.checker.poll() is None:
 
777
            #    self.checker.kill()
 
778
        except OSError as error:
 
779
            if error.errno != errno.ESRCH: # No such process
 
780
                raise
763
781
        self.checker = None
764
782
 
765
783
 
766
 
def dbus_service_property(dbus_interface,
767
 
                          signature="v",
768
 
                          access="readwrite",
769
 
                          byte_arrays=False):
 
784
def dbus_service_property(dbus_interface, signature="v",
 
785
                          access="readwrite", byte_arrays=False):
770
786
    """Decorators for marking methods of a DBusObjectWithProperties to
771
787
    become properties on the D-Bus.
772
788
    
781
797
    # "Set" method, so we fail early here:
782
798
    if byte_arrays and signature != "ay":
783
799
        raise ValueError("Byte arrays not supported for non-'ay'"
784
 
                         " signature {!r}".format(signature))
785
 
    
 
800
                         " signature {0!r}".format(signature))
786
801
    def decorator(func):
787
802
        func._dbus_is_property = True
788
803
        func._dbus_interface = dbus_interface
793
808
            func._dbus_name = func._dbus_name[:-14]
794
809
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
795
810
        return func
796
 
    
797
811
    return decorator
798
812
 
799
813
 
808
822
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
809
823
                    "false"}
810
824
    """
811
 
    
812
825
    def decorator(func):
813
826
        func._dbus_is_interface = True
814
827
        func._dbus_interface = dbus_interface
815
828
        func._dbus_name = dbus_interface
816
829
        return func
817
 
    
818
830
    return decorator
819
831
 
820
832
 
822
834
    """Decorator to annotate D-Bus methods, signals or properties
823
835
    Usage:
824
836
    
825
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
826
 
                       "org.freedesktop.DBus.Property."
827
 
                       "EmitsChangedSignal": "false"})
828
837
    @dbus_service_property("org.example.Interface", signature="b",
829
838
                           access="r")
 
839
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
840
                        "org.freedesktop.DBus.Property."
 
841
                        "EmitsChangedSignal": "false"})
830
842
    def Property_dbus_property(self):
831
843
        return dbus.Boolean(False)
832
844
    """
833
 
    
834
845
    def decorator(func):
835
846
        func._dbus_annotations = annotations
836
847
        return func
837
 
    
838
848
    return decorator
839
849
 
840
850
 
841
851
class DBusPropertyException(dbus.exceptions.DBusException):
842
852
    """A base class for D-Bus property-related exceptions
843
853
    """
844
 
    pass
 
854
    def __unicode__(self):
 
855
        return unicode(str(self))
845
856
 
846
857
 
847
858
class DBusPropertyAccessException(DBusPropertyException):
871
882
        If called like _is_dbus_thing("method") it returns a function
872
883
        suitable for use as predicate to inspect.getmembers().
873
884
        """
874
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
885
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
875
886
                                   False)
876
887
    
877
888
    def _get_all_dbus_things(self, thing):
878
889
        """Returns a generator of (name, attribute) pairs
879
890
        """
880
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
891
        return ((getattr(athing.__get__(self), "_dbus_name",
 
892
                         name),
881
893
                 athing.__get__(self))
882
894
                for cls in self.__class__.__mro__
883
895
                for name, athing in
884
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
896
                inspect.getmembers(cls,
 
897
                                   self._is_dbus_thing(thing)))
885
898
    
886
899
    def _get_dbus_property(self, interface_name, property_name):
887
900
        """Returns a bound method if one exists which is a D-Bus
888
901
        property with the specified name and interface.
889
902
        """
890
 
        for cls in self.__class__.__mro__:
891
 
            for name, value in inspect.getmembers(
892
 
                    cls, self._is_dbus_thing("property")):
 
903
        for cls in  self.__class__.__mro__:
 
904
            for name, value in (inspect.getmembers
 
905
                                (cls,
 
906
                                 self._is_dbus_thing("property"))):
893
907
                if (value._dbus_name == property_name
894
908
                    and value._dbus_interface == interface_name):
895
909
                    return value.__get__(self)
896
910
        
897
911
        # No such property
898
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
899
 
            self.dbus_object_path, interface_name, property_name))
 
912
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
913
                                   + interface_name + "."
 
914
                                   + property_name)
900
915
    
901
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
902
 
                         in_signature="ss",
 
916
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
903
917
                         out_signature="v")
904
918
    def Get(self, interface_name, property_name):
905
919
        """Standard D-Bus property Get() method, see D-Bus standard.
924
938
            # signatures other than "ay".
925
939
            if prop._dbus_signature != "ay":
926
940
                raise ValueError("Byte arrays not supported for non-"
927
 
                                 "'ay' signature {!r}"
 
941
                                 "'ay' signature {0!r}"
928
942
                                 .format(prop._dbus_signature))
929
943
            value = dbus.ByteArray(b''.join(chr(byte)
930
944
                                            for byte in value))
931
945
        prop(value)
932
946
    
933
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
934
 
                         in_signature="s",
 
947
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
935
948
                         out_signature="a{sv}")
936
949
    def GetAll(self, interface_name):
937
950
        """Standard D-Bus property GetAll() method, see D-Bus
952
965
            if not hasattr(value, "variant_level"):
953
966
                properties[name] = value
954
967
                continue
955
 
            properties[name] = type(value)(
956
 
                value, variant_level = value.variant_level + 1)
 
968
            properties[name] = type(value)(value, variant_level=
 
969
                                           value.variant_level+1)
957
970
        return dbus.Dictionary(properties, signature="sv")
958
971
    
959
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
960
 
    def PropertiesChanged(self, interface_name, changed_properties,
961
 
                          invalidated_properties):
962
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
963
 
        standard.
964
 
        """
965
 
        pass
966
 
    
967
972
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
968
973
                         out_signature="s",
969
974
                         path_keyword='object_path',
977
982
                                                   connection)
978
983
        try:
979
984
            document = xml.dom.minidom.parseString(xmlstring)
980
 
            
981
985
            def make_tag(document, name, prop):
982
986
                e = document.createElement("property")
983
987
                e.setAttribute("name", name)
984
988
                e.setAttribute("type", prop._dbus_signature)
985
989
                e.setAttribute("access", prop._dbus_access)
986
990
                return e
987
 
            
988
991
            for if_tag in document.getElementsByTagName("interface"):
989
992
                # Add property tags
990
993
                for tag in (make_tag(document, name, prop)
1002
1005
                            if (name == tag.getAttribute("name")
1003
1006
                                and prop._dbus_interface
1004
1007
                                == if_tag.getAttribute("name")):
1005
 
                                annots.update(getattr(
1006
 
                                    prop, "_dbus_annotations", {}))
1007
 
                        for name, value in annots.items():
 
1008
                                annots.update(getattr
 
1009
                                              (prop,
 
1010
                                               "_dbus_annotations",
 
1011
                                               {}))
 
1012
                        for name, value in annots.iteritems():
1008
1013
                            ann_tag = document.createElement(
1009
1014
                                "annotation")
1010
1015
                            ann_tag.setAttribute("name", name)
1013
1018
                # Add interface annotation tags
1014
1019
                for annotation, value in dict(
1015
1020
                    itertools.chain.from_iterable(
1016
 
                        annotations().items()
1017
 
                        for name, annotations
1018
 
                        in self._get_all_dbus_things("interface")
 
1021
                        annotations().iteritems()
 
1022
                        for name, annotations in
 
1023
                        self._get_all_dbus_things("interface")
1019
1024
                        if name == if_tag.getAttribute("name")
1020
 
                        )).items():
 
1025
                        )).iteritems():
1021
1026
                    ann_tag = document.createElement("annotation")
1022
1027
                    ann_tag.setAttribute("name", annotation)
1023
1028
                    ann_tag.setAttribute("value", value)
1050
1055
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1051
1056
    if dt is None:
1052
1057
        return dbus.String("", variant_level = variant_level)
1053
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1058
    return dbus.String(dt.isoformat(),
 
1059
                       variant_level=variant_level)
1054
1060
 
1055
1061
 
1056
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1076
1082
    (from DBusObjectWithProperties) and interfaces (from the
1077
1083
    dbus_interface_annotations decorator).
1078
1084
    """
1079
 
    
1080
1085
    def wrapper(cls):
1081
1086
        for orig_interface_name, alt_interface_name in (
1082
 
                alt_interface_names.items()):
 
1087
            alt_interface_names.iteritems()):
1083
1088
            attr = {}
1084
1089
            interface_names = set()
1085
1090
            # Go though all attributes of the class
1087
1092
                # Ignore non-D-Bus attributes, and D-Bus attributes
1088
1093
                # with the wrong interface name
1089
1094
                if (not hasattr(attribute, "_dbus_interface")
1090
 
                    or not attribute._dbus_interface.startswith(
1091
 
                        orig_interface_name)):
 
1095
                    or not attribute._dbus_interface
 
1096
                    .startswith(orig_interface_name)):
1092
1097
                    continue
1093
1098
                # Create an alternate D-Bus interface name based on
1094
1099
                # the current name
1095
 
                alt_interface = attribute._dbus_interface.replace(
1096
 
                    orig_interface_name, alt_interface_name)
 
1100
                alt_interface = (attribute._dbus_interface
 
1101
                                 .replace(orig_interface_name,
 
1102
                                          alt_interface_name))
1097
1103
                interface_names.add(alt_interface)
1098
1104
                # Is this a D-Bus signal?
1099
1105
                if getattr(attribute, "_dbus_is_signal", False):
1100
1106
                    # Extract the original non-method undecorated
1101
1107
                    # function by black magic
1102
1108
                    nonmethod_func = (dict(
1103
 
                        zip(attribute.func_code.co_freevars,
1104
 
                            attribute.__closure__))
1105
 
                                      ["func"].cell_contents)
 
1109
                            zip(attribute.func_code.co_freevars,
 
1110
                                attribute.__closure__))["func"]
 
1111
                                      .cell_contents)
1106
1112
                    # Create a new, but exactly alike, function
1107
1113
                    # object, and decorate it to be a new D-Bus signal
1108
1114
                    # with the alternate D-Bus interface name
1109
 
                    new_function = (dbus.service.signal(
1110
 
                        alt_interface, attribute._dbus_signature)
 
1115
                    new_function = (dbus.service.signal
 
1116
                                    (alt_interface,
 
1117
                                     attribute._dbus_signature)
1111
1118
                                    (types.FunctionType(
1112
 
                                        nonmethod_func.func_code,
1113
 
                                        nonmethod_func.func_globals,
1114
 
                                        nonmethod_func.func_name,
1115
 
                                        nonmethod_func.func_defaults,
1116
 
                                        nonmethod_func.func_closure)))
 
1119
                                nonmethod_func.func_code,
 
1120
                                nonmethod_func.func_globals,
 
1121
                                nonmethod_func.func_name,
 
1122
                                nonmethod_func.func_defaults,
 
1123
                                nonmethod_func.func_closure)))
1117
1124
                    # Copy annotations, if any
1118
1125
                    try:
1119
 
                        new_function._dbus_annotations = dict(
1120
 
                            attribute._dbus_annotations)
 
1126
                        new_function._dbus_annotations = (
 
1127
                            dict(attribute._dbus_annotations))
1121
1128
                    except AttributeError:
1122
1129
                        pass
1123
1130
                    # Define a creator of a function to call both the
1128
1135
                        """This function is a scope container to pass
1129
1136
                        func1 and func2 to the "call_both" function
1130
1137
                        outside of its arguments"""
1131
 
                        
1132
1138
                        def call_both(*args, **kwargs):
1133
1139
                            """This function will emit two D-Bus
1134
1140
                            signals by calling func1 and func2"""
1135
1141
                            func1(*args, **kwargs)
1136
1142
                            func2(*args, **kwargs)
1137
 
                        
1138
1143
                        return call_both
1139
1144
                    # Create the "call_both" function and add it to
1140
1145
                    # the class
1145
1150
                    # object.  Decorate it to be a new D-Bus method
1146
1151
                    # with the alternate D-Bus interface name.  Add it
1147
1152
                    # to the class.
1148
 
                    attr[attrname] = (
1149
 
                        dbus.service.method(
1150
 
                            alt_interface,
1151
 
                            attribute._dbus_in_signature,
1152
 
                            attribute._dbus_out_signature)
1153
 
                        (types.FunctionType(attribute.func_code,
1154
 
                                            attribute.func_globals,
1155
 
                                            attribute.func_name,
1156
 
                                            attribute.func_defaults,
1157
 
                                            attribute.func_closure)))
 
1153
                    attr[attrname] = (dbus.service.method
 
1154
                                      (alt_interface,
 
1155
                                       attribute._dbus_in_signature,
 
1156
                                       attribute._dbus_out_signature)
 
1157
                                      (types.FunctionType
 
1158
                                       (attribute.func_code,
 
1159
                                        attribute.func_globals,
 
1160
                                        attribute.func_name,
 
1161
                                        attribute.func_defaults,
 
1162
                                        attribute.func_closure)))
1158
1163
                    # Copy annotations, if any
1159
1164
                    try:
1160
 
                        attr[attrname]._dbus_annotations = dict(
1161
 
                            attribute._dbus_annotations)
 
1165
                        attr[attrname]._dbus_annotations = (
 
1166
                            dict(attribute._dbus_annotations))
1162
1167
                    except AttributeError:
1163
1168
                        pass
1164
1169
                # Is this a D-Bus property?
1167
1172
                    # object, and decorate it to be a new D-Bus
1168
1173
                    # property with the alternate D-Bus interface
1169
1174
                    # name.  Add it to the class.
1170
 
                    attr[attrname] = (dbus_service_property(
1171
 
                        alt_interface, attribute._dbus_signature,
1172
 
                        attribute._dbus_access,
1173
 
                        attribute._dbus_get_args_options
1174
 
                        ["byte_arrays"])
1175
 
                                      (types.FunctionType(
1176
 
                                          attribute.func_code,
1177
 
                                          attribute.func_globals,
1178
 
                                          attribute.func_name,
1179
 
                                          attribute.func_defaults,
1180
 
                                          attribute.func_closure)))
 
1175
                    attr[attrname] = (dbus_service_property
 
1176
                                      (alt_interface,
 
1177
                                       attribute._dbus_signature,
 
1178
                                       attribute._dbus_access,
 
1179
                                       attribute
 
1180
                                       ._dbus_get_args_options
 
1181
                                       ["byte_arrays"])
 
1182
                                      (types.FunctionType
 
1183
                                       (attribute.func_code,
 
1184
                                        attribute.func_globals,
 
1185
                                        attribute.func_name,
 
1186
                                        attribute.func_defaults,
 
1187
                                        attribute.func_closure)))
1181
1188
                    # Copy annotations, if any
1182
1189
                    try:
1183
 
                        attr[attrname]._dbus_annotations = dict(
1184
 
                            attribute._dbus_annotations)
 
1190
                        attr[attrname]._dbus_annotations = (
 
1191
                            dict(attribute._dbus_annotations))
1185
1192
                    except AttributeError:
1186
1193
                        pass
1187
1194
                # Is this a D-Bus interface?
1190
1197
                    # object.  Decorate it to be a new D-Bus interface
1191
1198
                    # with the alternate D-Bus interface name.  Add it
1192
1199
                    # to the class.
1193
 
                    attr[attrname] = (
1194
 
                        dbus_interface_annotations(alt_interface)
1195
 
                        (types.FunctionType(attribute.func_code,
1196
 
                                            attribute.func_globals,
1197
 
                                            attribute.func_name,
1198
 
                                            attribute.func_defaults,
1199
 
                                            attribute.func_closure)))
 
1200
                    attr[attrname] = (dbus_interface_annotations
 
1201
                                      (alt_interface)
 
1202
                                      (types.FunctionType
 
1203
                                       (attribute.func_code,
 
1204
                                        attribute.func_globals,
 
1205
                                        attribute.func_name,
 
1206
                                        attribute.func_defaults,
 
1207
                                        attribute.func_closure)))
1200
1208
            if deprecate:
1201
1209
                # Deprecate all alternate interfaces
1202
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1210
                iname="_AlternateDBusNames_interface_annotation{0}"
1203
1211
                for interface_name in interface_names:
1204
 
                    
1205
1212
                    @dbus_interface_annotations(interface_name)
1206
1213
                    def func(self):
1207
1214
                        return { "org.freedesktop.DBus.Deprecated":
1208
 
                                 "true" }
 
1215
                                     "true" }
1209
1216
                    # Find an unused name
1210
1217
                    for aname in (iname.format(i)
1211
1218
                                  for i in itertools.count()):
1215
1222
            if interface_names:
1216
1223
                # Replace the class with a new subclass of it with
1217
1224
                # methods, signals, etc. as created above.
1218
 
                cls = type(b"{}Alternate".format(cls.__name__),
1219
 
                           (cls, ), attr)
 
1225
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1226
                           (cls,), attr)
1220
1227
        return cls
1221
 
    
1222
1228
    return wrapper
1223
1229
 
1224
1230
 
1225
1231
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
 
                            "se.bsnet.fukt.Mandos"})
 
1232
                                "se.bsnet.fukt.Mandos"})
1227
1233
class ClientDBus(Client, DBusObjectWithProperties):
1228
1234
    """A Client class using D-Bus
1229
1235
    
1233
1239
    """
1234
1240
    
1235
1241
    runtime_expansions = (Client.runtime_expansions
1236
 
                          + ("dbus_object_path", ))
1237
 
    
1238
 
    _interface = "se.recompile.Mandos.Client"
 
1242
                          + ("dbus_object_path",))
1239
1243
    
1240
1244
    # dbus.service.Object doesn't use super(), so we can't either.
1241
1245
    
1244
1248
        Client.__init__(self, *args, **kwargs)
1245
1249
        # Only now, when this client is initialized, can it show up on
1246
1250
        # the D-Bus
1247
 
        client_object_name = str(self.name).translate(
 
1251
        client_object_name = unicode(self.name).translate(
1248
1252
            {ord("."): ord("_"),
1249
1253
             ord("-"): ord("_")})
1250
 
        self.dbus_object_path = dbus.ObjectPath(
1251
 
            "/clients/" + client_object_name)
 
1254
        self.dbus_object_path = (dbus.ObjectPath
 
1255
                                 ("/clients/" + client_object_name))
1252
1256
        DBusObjectWithProperties.__init__(self, self.bus,
1253
1257
                                          self.dbus_object_path)
1254
1258
    
1255
 
    def notifychangeproperty(transform_func, dbus_name,
1256
 
                             type_func=lambda x: x,
1257
 
                             variant_level=1,
1258
 
                             invalidate_only=False,
1259
 
                             _interface=_interface):
 
1259
    def notifychangeproperty(transform_func,
 
1260
                             dbus_name, type_func=lambda x: x,
 
1261
                             variant_level=1):
1260
1262
        """ Modify a variable so that it's a property which announces
1261
1263
        its changes to DBus.
1262
1264
        
1267
1269
                   to the D-Bus.  Default: no transform
1268
1270
        variant_level: D-Bus variant level.  Default: 1
1269
1271
        """
1270
 
        attrname = "_{}".format(dbus_name)
1271
 
        
 
1272
        attrname = "_{0}".format(dbus_name)
1272
1273
        def setter(self, value):
1273
1274
            if hasattr(self, "dbus_object_path"):
1274
1275
                if (not hasattr(self, attrname) or
1275
1276
                    type_func(getattr(self, attrname, None))
1276
1277
                    != type_func(value)):
1277
 
                    if invalidate_only:
1278
 
                        self.PropertiesChanged(
1279
 
                            _interface, dbus.Dictionary(),
1280
 
                            dbus.Array((dbus_name, )))
1281
 
                    else:
1282
 
                        dbus_value = transform_func(
1283
 
                            type_func(value),
1284
 
                            variant_level = variant_level)
1285
 
                        self.PropertyChanged(dbus.String(dbus_name),
1286
 
                                             dbus_value)
1287
 
                        self.PropertiesChanged(
1288
 
                            _interface,
1289
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1290
 
                                              dbus_value }),
1291
 
                            dbus.Array())
 
1278
                    dbus_value = transform_func(type_func(value),
 
1279
                                                variant_level
 
1280
                                                =variant_level)
 
1281
                    self.PropertyChanged(dbus.String(dbus_name),
 
1282
                                         dbus_value)
1292
1283
            setattr(self, attrname, value)
1293
1284
        
1294
1285
        return property(lambda self: getattr(self, attrname), setter)
1300
1291
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1301
1292
    last_enabled = notifychangeproperty(datetime_to_dbus,
1302
1293
                                        "LastEnabled")
1303
 
    checker = notifychangeproperty(
1304
 
        dbus.Boolean, "CheckerRunning",
1305
 
        type_func = lambda checker: checker is not None)
 
1294
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1295
                                   type_func = lambda checker:
 
1296
                                       checker is not None)
1306
1297
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1307
1298
                                           "LastCheckedOK")
1308
1299
    last_checker_status = notifychangeproperty(dbus.Int16,
1311
1302
        datetime_to_dbus, "LastApprovalRequest")
1312
1303
    approved_by_default = notifychangeproperty(dbus.Boolean,
1313
1304
                                               "ApprovedByDefault")
1314
 
    approval_delay = notifychangeproperty(
1315
 
        dbus.UInt64, "ApprovalDelay",
1316
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1305
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1306
                                          "ApprovalDelay",
 
1307
                                          type_func =
 
1308
                                          timedelta_to_milliseconds)
1317
1309
    approval_duration = notifychangeproperty(
1318
1310
        dbus.UInt64, "ApprovalDuration",
1319
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1311
        type_func = timedelta_to_milliseconds)
1320
1312
    host = notifychangeproperty(dbus.String, "Host")
1321
 
    timeout = notifychangeproperty(
1322
 
        dbus.UInt64, "Timeout",
1323
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1313
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1314
                                   type_func =
 
1315
                                   timedelta_to_milliseconds)
1324
1316
    extended_timeout = notifychangeproperty(
1325
1317
        dbus.UInt64, "ExtendedTimeout",
1326
 
        type_func = lambda td: td.total_seconds() * 1000)
1327
 
    interval = notifychangeproperty(
1328
 
        dbus.UInt64, "Interval",
1329
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1318
        type_func = timedelta_to_milliseconds)
 
1319
    interval = notifychangeproperty(dbus.UInt64,
 
1320
                                    "Interval",
 
1321
                                    type_func =
 
1322
                                    timedelta_to_milliseconds)
1330
1323
    checker_command = notifychangeproperty(dbus.String, "Checker")
1331
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1332
 
                                  invalidate_only=True)
1333
1324
    
1334
1325
    del notifychangeproperty
1335
1326
    
1342
1333
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1343
1334
        Client.__del__(self, *args, **kwargs)
1344
1335
    
1345
 
    def checker_callback(self, source, condition,
1346
 
                         (connection, command), *args, **kwargs):
1347
 
        ret = Client.checker_callback(self, source, condition,
1348
 
                                      (connection, command), *args,
1349
 
                                      **kwargs)
1350
 
        exitstatus = self.last_checker_status
1351
 
        if exitstatus >= 0:
 
1336
    def checker_callback(self, pid, condition, command,
 
1337
                         *args, **kwargs):
 
1338
        self.checker_callback_tag = None
 
1339
        self.checker = None
 
1340
        if os.WIFEXITED(condition):
 
1341
            exitstatus = os.WEXITSTATUS(condition)
1352
1342
            # Emit D-Bus signal
1353
1343
            self.CheckerCompleted(dbus.Int16(exitstatus),
1354
 
                                  dbus.Int64(0),
 
1344
                                  dbus.Int64(condition),
1355
1345
                                  dbus.String(command))
1356
1346
        else:
1357
1347
            # Emit D-Bus signal
1358
1348
            self.CheckerCompleted(dbus.Int16(-1),
1359
 
                                  dbus.Int64(
1360
 
                                      self.last_checker_signal),
 
1349
                                  dbus.Int64(condition),
1361
1350
                                  dbus.String(command))
1362
 
        return ret
 
1351
        
 
1352
        return Client.checker_callback(self, pid, condition, command,
 
1353
                                       *args, **kwargs)
1363
1354
    
1364
1355
    def start_checker(self, *args, **kwargs):
1365
1356
        old_checker_pid = getattr(self.checker, "pid", None)
1377
1368
    
1378
1369
    def approve(self, value=True):
1379
1370
        self.approved = value
1380
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1381
 
                                * 1000), self._reset_approved)
 
1371
        gobject.timeout_add(timedelta_to_milliseconds
 
1372
                            (self.approval_duration),
 
1373
                            self._reset_approved)
1382
1374
        self.send_changedstate()
1383
1375
    
1384
1376
    ## D-Bus methods, signals & properties
 
1377
    _interface = "se.recompile.Mandos.Client"
1385
1378
    
1386
1379
    ## Interfaces
1387
1380
    
 
1381
    @dbus_interface_annotations(_interface)
 
1382
    def _foo(self):
 
1383
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1384
                     "false"}
 
1385
    
1388
1386
    ## Signals
1389
1387
    
1390
1388
    # CheckerCompleted - signal
1400
1398
        pass
1401
1399
    
1402
1400
    # PropertyChanged - signal
1403
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1404
1401
    @dbus.service.signal(_interface, signature="sv")
1405
1402
    def PropertyChanged(self, property, value):
1406
1403
        "D-Bus signal"
1470
1467
        return dbus.Boolean(bool(self.approvals_pending))
1471
1468
    
1472
1469
    # ApprovedByDefault - property
1473
 
    @dbus_service_property(_interface,
1474
 
                           signature="b",
 
1470
    @dbus_service_property(_interface, signature="b",
1475
1471
                           access="readwrite")
1476
1472
    def ApprovedByDefault_dbus_property(self, value=None):
1477
1473
        if value is None:       # get
1479
1475
        self.approved_by_default = bool(value)
1480
1476
    
1481
1477
    # ApprovalDelay - property
1482
 
    @dbus_service_property(_interface,
1483
 
                           signature="t",
 
1478
    @dbus_service_property(_interface, signature="t",
1484
1479
                           access="readwrite")
1485
1480
    def ApprovalDelay_dbus_property(self, value=None):
1486
1481
        if value is None:       # get
1487
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1488
 
                               * 1000)
 
1482
            return dbus.UInt64(self.approval_delay_milliseconds())
1489
1483
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1490
1484
    
1491
1485
    # ApprovalDuration - property
1492
 
    @dbus_service_property(_interface,
1493
 
                           signature="t",
 
1486
    @dbus_service_property(_interface, signature="t",
1494
1487
                           access="readwrite")
1495
1488
    def ApprovalDuration_dbus_property(self, value=None):
1496
1489
        if value is None:       # get
1497
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1498
 
                               * 1000)
 
1490
            return dbus.UInt64(timedelta_to_milliseconds(
 
1491
                    self.approval_duration))
1499
1492
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1500
1493
    
1501
1494
    # Name - property
1509
1502
        return dbus.String(self.fingerprint)
1510
1503
    
1511
1504
    # Host - property
1512
 
    @dbus_service_property(_interface,
1513
 
                           signature="s",
 
1505
    @dbus_service_property(_interface, signature="s",
1514
1506
                           access="readwrite")
1515
1507
    def Host_dbus_property(self, value=None):
1516
1508
        if value is None:       # get
1517
1509
            return dbus.String(self.host)
1518
 
        self.host = str(value)
 
1510
        self.host = unicode(value)
1519
1511
    
1520
1512
    # Created - property
1521
1513
    @dbus_service_property(_interface, signature="s", access="read")
1528
1520
        return datetime_to_dbus(self.last_enabled)
1529
1521
    
1530
1522
    # Enabled - property
1531
 
    @dbus_service_property(_interface,
1532
 
                           signature="b",
 
1523
    @dbus_service_property(_interface, signature="b",
1533
1524
                           access="readwrite")
1534
1525
    def Enabled_dbus_property(self, value=None):
1535
1526
        if value is None:       # get
1540
1531
            self.disable()
1541
1532
    
1542
1533
    # LastCheckedOK - property
1543
 
    @dbus_service_property(_interface,
1544
 
                           signature="s",
 
1534
    @dbus_service_property(_interface, signature="s",
1545
1535
                           access="readwrite")
1546
1536
    def LastCheckedOK_dbus_property(self, value=None):
1547
1537
        if value is not None:
1550
1540
        return datetime_to_dbus(self.last_checked_ok)
1551
1541
    
1552
1542
    # LastCheckerStatus - property
1553
 
    @dbus_service_property(_interface, signature="n", access="read")
 
1543
    @dbus_service_property(_interface, signature="n",
 
1544
                           access="read")
1554
1545
    def LastCheckerStatus_dbus_property(self):
1555
1546
        return dbus.Int16(self.last_checker_status)
1556
1547
    
1565
1556
        return datetime_to_dbus(self.last_approval_request)
1566
1557
    
1567
1558
    # Timeout - property
1568
 
    @dbus_service_property(_interface,
1569
 
                           signature="t",
 
1559
    @dbus_service_property(_interface, signature="t",
1570
1560
                           access="readwrite")
1571
1561
    def Timeout_dbus_property(self, value=None):
1572
1562
        if value is None:       # get
1573
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1563
            return dbus.UInt64(self.timeout_milliseconds())
1574
1564
        old_timeout = self.timeout
1575
1565
        self.timeout = datetime.timedelta(0, 0, 0, value)
1576
1566
        # Reschedule disabling
1585
1575
                    is None):
1586
1576
                    return
1587
1577
                gobject.source_remove(self.disable_initiator_tag)
1588
 
                self.disable_initiator_tag = gobject.timeout_add(
1589
 
                    int((self.expires - now).total_seconds() * 1000),
1590
 
                    self.disable)
 
1578
                self.disable_initiator_tag = (
 
1579
                    gobject.timeout_add(
 
1580
                        timedelta_to_milliseconds(self.expires - now),
 
1581
                        self.disable))
1591
1582
    
1592
1583
    # ExtendedTimeout - property
1593
 
    @dbus_service_property(_interface,
1594
 
                           signature="t",
 
1584
    @dbus_service_property(_interface, signature="t",
1595
1585
                           access="readwrite")
1596
1586
    def ExtendedTimeout_dbus_property(self, value=None):
1597
1587
        if value is None:       # get
1598
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1599
 
                               * 1000)
 
1588
            return dbus.UInt64(self.extended_timeout_milliseconds())
1600
1589
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1601
1590
    
1602
1591
    # Interval - property
1603
 
    @dbus_service_property(_interface,
1604
 
                           signature="t",
 
1592
    @dbus_service_property(_interface, signature="t",
1605
1593
                           access="readwrite")
1606
1594
    def Interval_dbus_property(self, value=None):
1607
1595
        if value is None:       # get
1608
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1596
            return dbus.UInt64(self.interval_milliseconds())
1609
1597
        self.interval = datetime.timedelta(0, 0, 0, value)
1610
1598
        if getattr(self, "checker_initiator_tag", None) is None:
1611
1599
            return
1612
1600
        if self.enabled:
1613
1601
            # Reschedule checker run
1614
1602
            gobject.source_remove(self.checker_initiator_tag)
1615
 
            self.checker_initiator_tag = gobject.timeout_add(
1616
 
                value, self.start_checker)
1617
 
            self.start_checker() # Start one now, too
 
1603
            self.checker_initiator_tag = (gobject.timeout_add
 
1604
                                          (value, self.start_checker))
 
1605
            self.start_checker()    # Start one now, too
1618
1606
    
1619
1607
    # Checker - property
1620
 
    @dbus_service_property(_interface,
1621
 
                           signature="s",
 
1608
    @dbus_service_property(_interface, signature="s",
1622
1609
                           access="readwrite")
1623
1610
    def Checker_dbus_property(self, value=None):
1624
1611
        if value is None:       # get
1625
1612
            return dbus.String(self.checker_command)
1626
 
        self.checker_command = str(value)
 
1613
        self.checker_command = unicode(value)
1627
1614
    
1628
1615
    # CheckerRunning - property
1629
 
    @dbus_service_property(_interface,
1630
 
                           signature="b",
 
1616
    @dbus_service_property(_interface, signature="b",
1631
1617
                           access="readwrite")
1632
1618
    def CheckerRunning_dbus_property(self, value=None):
1633
1619
        if value is None:       # get
1643
1629
        return self.dbus_object_path # is already a dbus.ObjectPath
1644
1630
    
1645
1631
    # Secret = property
1646
 
    @dbus_service_property(_interface,
1647
 
                           signature="ay",
1648
 
                           access="write",
1649
 
                           byte_arrays=True)
 
1632
    @dbus_service_property(_interface, signature="ay",
 
1633
                           access="write", byte_arrays=True)
1650
1634
    def Secret_dbus_property(self, value):
1651
 
        self.secret = bytes(value)
 
1635
        self.secret = str(value)
1652
1636
    
1653
1637
    del _interface
1654
1638
 
1668
1652
        if data[0] == 'data':
1669
1653
            return data[1]
1670
1654
        if data[0] == 'function':
1671
 
            
1672
1655
            def func(*args, **kwargs):
1673
1656
                self._pipe.send(('funcall', name, args, kwargs))
1674
1657
                return self._pipe.recv()[1]
1675
 
            
1676
1658
            return func
1677
1659
    
1678
1660
    def __setattr__(self, name, value):
1690
1672
    def handle(self):
1691
1673
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1692
1674
            logger.info("TCP connection from: %s",
1693
 
                        str(self.client_address))
 
1675
                        unicode(self.client_address))
1694
1676
            logger.debug("Pipe FD: %d",
1695
1677
                         self.server.child_pipe.fileno())
1696
1678
            
1697
 
            session = gnutls.connection.ClientSession(
1698
 
                self.request, gnutls.connection .X509Credentials())
 
1679
            session = (gnutls.connection
 
1680
                       .ClientSession(self.request,
 
1681
                                      gnutls.connection
 
1682
                                      .X509Credentials()))
1699
1683
            
1700
1684
            # Note: gnutls.connection.X509Credentials is really a
1701
1685
            # generic GnuTLS certificate credentials object so long as
1710
1694
            priority = self.server.gnutls_priority
1711
1695
            if priority is None:
1712
1696
                priority = "NORMAL"
1713
 
            gnutls.library.functions.gnutls_priority_set_direct(
1714
 
                session._c_object, priority, None)
 
1697
            (gnutls.library.functions
 
1698
             .gnutls_priority_set_direct(session._c_object,
 
1699
                                         priority, None))
1715
1700
            
1716
1701
            # Start communication using the Mandos protocol
1717
1702
            # Get protocol number
1737
1722
            approval_required = False
1738
1723
            try:
1739
1724
                try:
1740
 
                    fpr = self.fingerprint(
1741
 
                        self.peer_certificate(session))
 
1725
                    fpr = self.fingerprint(self.peer_certificate
 
1726
                                           (session))
1742
1727
                except (TypeError,
1743
1728
                        gnutls.errors.GNUTLSError) as error:
1744
1729
                    logger.warning("Bad certificate: %s", error)
1759
1744
                while True:
1760
1745
                    if not client.enabled:
1761
1746
                        logger.info("Client %s is disabled",
1762
 
                                    client.name)
 
1747
                                       client.name)
1763
1748
                        if self.server.use_dbus:
1764
1749
                            # Emit D-Bus signal
1765
1750
                            client.Rejected("Disabled")
1774
1759
                        if self.server.use_dbus:
1775
1760
                            # Emit D-Bus signal
1776
1761
                            client.NeedApproval(
1777
 
                                client.approval_delay.total_seconds()
1778
 
                                * 1000, client.approved_by_default)
 
1762
                                client.approval_delay_milliseconds(),
 
1763
                                client.approved_by_default)
1779
1764
                    else:
1780
1765
                        logger.warning("Client %s was not approved",
1781
1766
                                       client.name)
1787
1772
                    #wait until timeout or approved
1788
1773
                    time = datetime.datetime.now()
1789
1774
                    client.changedstate.acquire()
1790
 
                    client.changedstate.wait(delay.total_seconds())
 
1775
                    client.changedstate.wait(
 
1776
                        float(timedelta_to_milliseconds(delay)
 
1777
                              / 1000))
1791
1778
                    client.changedstate.release()
1792
1779
                    time2 = datetime.datetime.now()
1793
1780
                    if (time2 - time) >= delay:
1812
1799
                        logger.warning("gnutls send failed",
1813
1800
                                       exc_info=error)
1814
1801
                        return
1815
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1816
 
                                 len(client.secret) - (sent_size
1817
 
                                                       + sent))
 
1802
                    logger.debug("Sent: %d, remaining: %d",
 
1803
                                 sent, len(client.secret)
 
1804
                                 - (sent_size + sent))
1818
1805
                    sent_size += sent
1819
1806
                
1820
1807
                logger.info("Sending secret to %s", client.name)
1837
1824
    def peer_certificate(session):
1838
1825
        "Return the peer's OpenPGP certificate as a bytestring"
1839
1826
        # If not an OpenPGP certificate...
1840
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1841
 
                session._c_object)
 
1827
        if (gnutls.library.functions
 
1828
            .gnutls_certificate_type_get(session._c_object)
1842
1829
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1843
1830
            # ...do the normal thing
1844
1831
            return session.peer_certificate
1858
1845
    def fingerprint(openpgp):
1859
1846
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1860
1847
        # New GnuTLS "datum" with the OpenPGP public key
1861
 
        datum = gnutls.library.types.gnutls_datum_t(
1862
 
            ctypes.cast(ctypes.c_char_p(openpgp),
1863
 
                        ctypes.POINTER(ctypes.c_ubyte)),
1864
 
            ctypes.c_uint(len(openpgp)))
 
1848
        datum = (gnutls.library.types
 
1849
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1850
                                             ctypes.POINTER
 
1851
                                             (ctypes.c_ubyte)),
 
1852
                                 ctypes.c_uint(len(openpgp))))
1865
1853
        # New empty GnuTLS certificate
1866
1854
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1867
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1868
 
            ctypes.byref(crt))
 
1855
        (gnutls.library.functions
 
1856
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1869
1857
        # Import the OpenPGP public key into the certificate
1870
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
1871
 
            crt, ctypes.byref(datum),
1872
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
1858
        (gnutls.library.functions
 
1859
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1860
                                    gnutls.library.constants
 
1861
                                    .GNUTLS_OPENPGP_FMT_RAW))
1873
1862
        # Verify the self signature in the key
1874
1863
        crtverify = ctypes.c_uint()
1875
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1876
 
            crt, 0, ctypes.byref(crtverify))
 
1864
        (gnutls.library.functions
 
1865
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1866
                                         ctypes.byref(crtverify)))
1877
1867
        if crtverify.value != 0:
1878
1868
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1879
 
            raise gnutls.errors.CertificateSecurityError(
1880
 
                "Verify failed")
 
1869
            raise (gnutls.errors.CertificateSecurityError
 
1870
                   ("Verify failed"))
1881
1871
        # New buffer for the fingerprint
1882
1872
        buf = ctypes.create_string_buffer(20)
1883
1873
        buf_len = ctypes.c_size_t()
1884
1874
        # Get the fingerprint from the certificate into the buffer
1885
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1886
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
1875
        (gnutls.library.functions
 
1876
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1877
                                             ctypes.byref(buf_len)))
1887
1878
        # Deinit the certificate
1888
1879
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1889
1880
        # Convert the buffer to a Python bytestring
1895
1886
 
1896
1887
class MultiprocessingMixIn(object):
1897
1888
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1898
 
    
1899
1889
    def sub_process_main(self, request, address):
1900
1890
        try:
1901
1891
            self.finish_request(request, address)
1913
1903
 
1914
1904
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1915
1905
    """ adds a pipe to the MixIn """
1916
 
    
1917
1906
    def process_request(self, request, client_address):
1918
1907
        """Overrides and wraps the original process_request().
1919
1908
        
1940
1929
        interface:      None or a network interface name (string)
1941
1930
        use_ipv6:       Boolean; to use IPv6 or not
1942
1931
    """
1943
 
    
1944
1932
    def __init__(self, server_address, RequestHandlerClass,
1945
 
                 interface=None,
1946
 
                 use_ipv6=True,
1947
 
                 socketfd=None):
 
1933
                 interface=None, use_ipv6=True, socketfd=None):
1948
1934
        """If socketfd is set, use that file descriptor instead of
1949
1935
        creating a new one with socket.socket().
1950
1936
        """
1991
1977
                             self.interface)
1992
1978
            else:
1993
1979
                try:
1994
 
                    self.socket.setsockopt(
1995
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
1996
 
                        (self.interface + "\0").encode("utf-8"))
 
1980
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1981
                                           SO_BINDTODEVICE,
 
1982
                                           str(self.interface + '\0'))
1997
1983
                except socket.error as error:
1998
1984
                    if error.errno == errno.EPERM:
1999
1985
                        logger.error("No permission to bind to"
2017
2003
                self.server_address = (any_address,
2018
2004
                                       self.server_address[1])
2019
2005
            elif not self.server_address[1]:
2020
 
                self.server_address = (self.server_address[0], 0)
 
2006
                self.server_address = (self.server_address[0],
 
2007
                                       0)
2021
2008
#                 if self.interface:
2022
2009
#                     self.server_address = (self.server_address[0],
2023
2010
#                                            0, # port
2037
2024
    
2038
2025
    Assumes a gobject.MainLoop event loop.
2039
2026
    """
2040
 
    
2041
2027
    def __init__(self, server_address, RequestHandlerClass,
2042
 
                 interface=None,
2043
 
                 use_ipv6=True,
2044
 
                 clients=None,
2045
 
                 gnutls_priority=None,
2046
 
                 use_dbus=True,
2047
 
                 socketfd=None):
 
2028
                 interface=None, use_ipv6=True, clients=None,
 
2029
                 gnutls_priority=None, use_dbus=True, socketfd=None):
2048
2030
        self.enabled = False
2049
2031
        self.clients = clients
2050
2032
        if self.clients is None:
2056
2038
                                interface = interface,
2057
2039
                                use_ipv6 = use_ipv6,
2058
2040
                                socketfd = socketfd)
2059
 
    
2060
2041
    def server_activate(self):
2061
2042
        if self.enabled:
2062
2043
            return socketserver.TCPServer.server_activate(self)
2066
2047
    
2067
2048
    def add_pipe(self, parent_pipe, proc):
2068
2049
        # Call "handle_ipc" for both data and EOF events
2069
 
        gobject.io_add_watch(
2070
 
            parent_pipe.fileno(),
2071
 
            gobject.IO_IN | gobject.IO_HUP,
2072
 
            functools.partial(self.handle_ipc,
2073
 
                              parent_pipe = parent_pipe,
2074
 
                              proc = proc))
 
2050
        gobject.io_add_watch(parent_pipe.fileno(),
 
2051
                             gobject.IO_IN | gobject.IO_HUP,
 
2052
                             functools.partial(self.handle_ipc,
 
2053
                                               parent_pipe =
 
2054
                                               parent_pipe,
 
2055
                                               proc = proc))
2075
2056
    
2076
 
    def handle_ipc(self, source, condition,
2077
 
                   parent_pipe=None,
2078
 
                   proc = None,
2079
 
                   client_object=None):
 
2057
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2058
                   proc = None, client_object=None):
2080
2059
        # error, or the other end of multiprocessing.Pipe has closed
2081
2060
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2082
2061
            # Wait for other process to exit
2105
2084
                parent_pipe.send(False)
2106
2085
                return False
2107
2086
            
2108
 
            gobject.io_add_watch(
2109
 
                parent_pipe.fileno(),
2110
 
                gobject.IO_IN | gobject.IO_HUP,
2111
 
                functools.partial(self.handle_ipc,
2112
 
                                  parent_pipe = parent_pipe,
2113
 
                                  proc = proc,
2114
 
                                  client_object = client))
 
2087
            gobject.io_add_watch(parent_pipe.fileno(),
 
2088
                                 gobject.IO_IN | gobject.IO_HUP,
 
2089
                                 functools.partial(self.handle_ipc,
 
2090
                                                   parent_pipe =
 
2091
                                                   parent_pipe,
 
2092
                                                   proc = proc,
 
2093
                                                   client_object =
 
2094
                                                   client))
2115
2095
            parent_pipe.send(True)
2116
2096
            # remove the old hook in favor of the new above hook on
2117
2097
            # same fileno
2123
2103
            
2124
2104
            parent_pipe.send(('data', getattr(client_object,
2125
2105
                                              funcname)(*args,
2126
 
                                                        **kwargs)))
 
2106
                                                         **kwargs)))
2127
2107
        
2128
2108
        if command == 'getattr':
2129
2109
            attrname = request[1]
2130
2110
            if callable(client_object.__getattribute__(attrname)):
2131
 
                parent_pipe.send(('function', ))
 
2111
                parent_pipe.send(('function',))
2132
2112
            else:
2133
 
                parent_pipe.send((
2134
 
                    'data', client_object.__getattribute__(attrname)))
 
2113
                parent_pipe.send(('data', client_object
 
2114
                                  .__getattribute__(attrname)))
2135
2115
        
2136
2116
        if command == 'setattr':
2137
2117
            attrname = request[1]
2177
2157
                                              # None
2178
2158
                                    "followers")) # Tokens valid after
2179
2159
                                                  # this token
2180
 
    Token = collections.namedtuple("Token", (
2181
 
        "regexp",  # To match token; if "value" is not None, must have
2182
 
                   # a "group" containing digits
2183
 
        "value",   # datetime.timedelta or None
2184
 
        "followers"))           # Tokens valid after this token
2185
2160
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2186
2161
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2187
2162
    token_end = Token(re.compile(r"$"), None, frozenset())
2188
2163
    token_second = Token(re.compile(r"(\d+)S"),
2189
2164
                         datetime.timedelta(seconds=1),
2190
 
                         frozenset((token_end, )))
 
2165
                         frozenset((token_end,)))
2191
2166
    token_minute = Token(re.compile(r"(\d+)M"),
2192
2167
                         datetime.timedelta(minutes=1),
2193
2168
                         frozenset((token_second, token_end)))
2209
2184
                       frozenset((token_month, token_end)))
2210
2185
    token_week = Token(re.compile(r"(\d+)W"),
2211
2186
                       datetime.timedelta(weeks=1),
2212
 
                       frozenset((token_end, )))
 
2187
                       frozenset((token_end,)))
2213
2188
    token_duration = Token(re.compile(r"P"), None,
2214
2189
                           frozenset((token_year, token_month,
2215
2190
                                      token_day, token_time,
2216
 
                                      token_week)))
 
2191
                                      token_week))),
2217
2192
    # Define starting values
2218
2193
    value = datetime.timedelta() # Value so far
2219
2194
    found_token = None
2220
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2195
    followers = frozenset(token_duration,) # Following valid tokens
2221
2196
    s = duration                # String left to parse
2222
2197
    # Loop until end token is found
2223
2198
    while found_token is not token_end:
2270
2245
    timevalue = datetime.timedelta(0)
2271
2246
    for s in interval.split():
2272
2247
        try:
2273
 
            suffix = s[-1]
 
2248
            suffix = unicode(s[-1])
2274
2249
            value = int(s[:-1])
2275
2250
            if suffix == "d":
2276
2251
                delta = datetime.timedelta(value)
2283
2258
            elif suffix == "w":
2284
2259
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2285
2260
            else:
2286
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2261
                raise ValueError("Unknown suffix {0!r}"
 
2262
                                 .format(suffix))
2287
2263
        except IndexError as e:
2288
2264
            raise ValueError(*(e.args))
2289
2265
        timevalue += delta
2306
2282
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2307
2283
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2308
2284
            raise OSError(errno.ENODEV,
2309
 
                          "{} not a character device"
 
2285
                          "{0} not a character device"
2310
2286
                          .format(os.devnull))
2311
2287
        os.dup2(null, sys.stdin.fileno())
2312
2288
        os.dup2(null, sys.stdout.fileno())
2322
2298
    
2323
2299
    parser = argparse.ArgumentParser()
2324
2300
    parser.add_argument("-v", "--version", action="version",
2325
 
                        version = "%(prog)s {}".format(version),
 
2301
                        version = "%(prog)s {0}".format(version),
2326
2302
                        help="show version number and exit")
2327
2303
    parser.add_argument("-i", "--interface", metavar="IF",
2328
2304
                        help="Bind to interface IF")
2378
2354
                        "port": "",
2379
2355
                        "debug": "False",
2380
2356
                        "priority":
2381
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2382
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2357
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2383
2358
                        "servicename": "Mandos",
2384
2359
                        "use_dbus": "True",
2385
2360
                        "use_ipv6": "True",
2389
2364
                        "statedir": "/var/lib/mandos",
2390
2365
                        "foreground": "False",
2391
2366
                        "zeroconf": "True",
2392
 
                    }
 
2367
                        }
2393
2368
    
2394
2369
    # Parse config file for server-global settings
2395
2370
    server_config = configparser.SafeConfigParser(server_defaults)
2396
2371
    del server_defaults
2397
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2372
    server_config.read(os.path.join(options.configdir,
 
2373
                                    "mandos.conf"))
2398
2374
    # Convert the SafeConfigParser object to a dict
2399
2375
    server_settings = server_config.defaults()
2400
2376
    # Use the appropriate methods on the non-string config options
2418
2394
    # Override the settings from the config file with command line
2419
2395
    # options, if set.
2420
2396
    for option in ("interface", "address", "port", "debug",
2421
 
                   "priority", "servicename", "configdir", "use_dbus",
2422
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2423
 
                   "socket", "foreground", "zeroconf"):
 
2397
                   "priority", "servicename", "configdir",
 
2398
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2399
                   "statedir", "socket", "foreground", "zeroconf"):
2424
2400
        value = getattr(options, option)
2425
2401
        if value is not None:
2426
2402
            server_settings[option] = value
2427
2403
    del options
2428
2404
    # Force all strings to be unicode
2429
2405
    for option in server_settings.keys():
2430
 
        if isinstance(server_settings[option], bytes):
2431
 
            server_settings[option] = (server_settings[option]
2432
 
                                       .decode("utf-8"))
 
2406
        if type(server_settings[option]) is str:
 
2407
            server_settings[option] = unicode(server_settings[option])
2433
2408
    # Force all boolean options to be boolean
2434
2409
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2435
2410
                   "foreground", "zeroconf"):
2441
2416
    
2442
2417
    ##################################################################
2443
2418
    
2444
 
    if (not server_settings["zeroconf"]
2445
 
        and not (server_settings["port"]
2446
 
                 or server_settings["socket"] != "")):
2447
 
        parser.error("Needs port or socket to work without Zeroconf")
 
2419
    if (not server_settings["zeroconf"] and
 
2420
        not (server_settings["port"]
 
2421
             or server_settings["socket"] != "")):
 
2422
            parser.error("Needs port or socket to work without"
 
2423
                         " Zeroconf")
2448
2424
    
2449
2425
    # For convenience
2450
2426
    debug = server_settings["debug"]
2466
2442
            initlogger(debug, level)
2467
2443
    
2468
2444
    if server_settings["servicename"] != "Mandos":
2469
 
        syslogger.setFormatter(
2470
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2471
 
                              ' %(levelname)s: %(message)s'.format(
2472
 
                                  server_settings["servicename"])))
 
2445
        syslogger.setFormatter(logging.Formatter
 
2446
                               ('Mandos ({0}) [%(process)d]:'
 
2447
                                ' %(levelname)s: %(message)s'
 
2448
                                .format(server_settings
 
2449
                                        ["servicename"])))
2473
2450
    
2474
2451
    # Parse config file with clients
2475
2452
    client_config = configparser.SafeConfigParser(Client
2483
2460
    socketfd = None
2484
2461
    if server_settings["socket"] != "":
2485
2462
        socketfd = server_settings["socket"]
2486
 
    tcp_server = MandosServer(
2487
 
        (server_settings["address"], server_settings["port"]),
2488
 
        ClientHandler,
2489
 
        interface=(server_settings["interface"] or None),
2490
 
        use_ipv6=use_ipv6,
2491
 
        gnutls_priority=server_settings["priority"],
2492
 
        use_dbus=use_dbus,
2493
 
        socketfd=socketfd)
 
2463
    tcp_server = MandosServer((server_settings["address"],
 
2464
                               server_settings["port"]),
 
2465
                              ClientHandler,
 
2466
                              interface=(server_settings["interface"]
 
2467
                                         or None),
 
2468
                              use_ipv6=use_ipv6,
 
2469
                              gnutls_priority=
 
2470
                              server_settings["priority"],
 
2471
                              use_dbus=use_dbus,
 
2472
                              socketfd=socketfd)
2494
2473
    if not foreground:
2495
2474
        pidfilename = "/run/mandos.pid"
2496
2475
        if not os.path.isdir("/run/."):
2530
2509
        def debug_gnutls(level, string):
2531
2510
            logger.debug("GnuTLS: %s", string[:-1])
2532
2511
        
2533
 
        gnutls.library.functions.gnutls_global_set_log_function(
2534
 
            debug_gnutls)
 
2512
        (gnutls.library.functions
 
2513
         .gnutls_global_set_log_function(debug_gnutls))
2535
2514
        
2536
2515
        # Redirect stdin so all checkers get /dev/null
2537
2516
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2557
2536
    if use_dbus:
2558
2537
        try:
2559
2538
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2560
 
                                            bus,
2561
 
                                            do_not_queue=True)
2562
 
            old_bus_name = dbus.service.BusName(
2563
 
                "se.bsnet.fukt.Mandos", bus,
2564
 
                do_not_queue=True)
 
2539
                                            bus, do_not_queue=True)
 
2540
            old_bus_name = (dbus.service.BusName
 
2541
                            ("se.bsnet.fukt.Mandos", bus,
 
2542
                             do_not_queue=True))
2565
2543
        except dbus.exceptions.NameExistsException as e:
2566
2544
            logger.error("Disabling D-Bus:", exc_info=e)
2567
2545
            use_dbus = False
2569
2547
            tcp_server.use_dbus = False
2570
2548
    if zeroconf:
2571
2549
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2572
 
        service = AvahiServiceToSyslog(
2573
 
            name = server_settings["servicename"],
2574
 
            servicetype = "_mandos._tcp",
2575
 
            protocol = protocol,
2576
 
            bus = bus)
 
2550
        service = AvahiServiceToSyslog(name =
 
2551
                                       server_settings["servicename"],
 
2552
                                       servicetype = "_mandos._tcp",
 
2553
                                       protocol = protocol, bus = bus)
2577
2554
        if server_settings["interface"]:
2578
 
            service.interface = if_nametoindex(
2579
 
                server_settings["interface"].encode("utf-8"))
 
2555
            service.interface = (if_nametoindex
 
2556
                                 (str(server_settings["interface"])))
2580
2557
    
2581
2558
    global multiprocessing_manager
2582
2559
    multiprocessing_manager = multiprocessing.Manager()
2601
2578
    if server_settings["restore"]:
2602
2579
        try:
2603
2580
            with open(stored_state_path, "rb") as stored_state:
2604
 
                clients_data, old_client_settings = pickle.load(
2605
 
                    stored_state)
 
2581
                clients_data, old_client_settings = (pickle.load
 
2582
                                                     (stored_state))
2606
2583
            os.remove(stored_state_path)
2607
2584
        except IOError as e:
2608
2585
            if e.errno == errno.ENOENT:
2609
 
                logger.warning("Could not load persistent state:"
2610
 
                               " {}".format(os.strerror(e.errno)))
 
2586
                logger.warning("Could not load persistent state: {0}"
 
2587
                                .format(os.strerror(e.errno)))
2611
2588
            else:
2612
2589
                logger.critical("Could not load persistent state:",
2613
2590
                                exc_info=e)
2614
2591
                raise
2615
2592
        except EOFError as e:
2616
2593
            logger.warning("Could not load persistent state: "
2617
 
                           "EOFError:",
2618
 
                           exc_info=e)
 
2594
                           "EOFError:", exc_info=e)
2619
2595
    
2620
2596
    with PGPEngine() as pgp:
2621
 
        for client_name, client in clients_data.items():
 
2597
        for client_name, client in clients_data.iteritems():
2622
2598
            # Skip removed clients
2623
2599
            if client_name not in client_settings:
2624
2600
                continue
2633
2609
                    # For each value in new config, check if it
2634
2610
                    # differs from the old config value (Except for
2635
2611
                    # the "secret" attribute)
2636
 
                    if (name != "secret"
2637
 
                        and (value !=
2638
 
                             old_client_settings[client_name][name])):
 
2612
                    if (name != "secret" and
 
2613
                        value != old_client_settings[client_name]
 
2614
                        [name]):
2639
2615
                        client[name] = value
2640
2616
                except KeyError:
2641
2617
                    pass
2642
2618
            
2643
2619
            # Clients who has passed its expire date can still be
2644
 
            # enabled if its last checker was successful.  A Client
 
2620
            # enabled if its last checker was successful.  Clients
2645
2621
            # whose checker succeeded before we stored its state is
2646
2622
            # assumed to have successfully run all checkers during
2647
2623
            # downtime.
2649
2625
                if datetime.datetime.utcnow() >= client["expires"]:
2650
2626
                    if not client["last_checked_ok"]:
2651
2627
                        logger.warning(
2652
 
                            "disabling client {} - Client never "
2653
 
                            "performed a successful checker".format(
2654
 
                                client_name))
 
2628
                            "disabling client {0} - Client never "
 
2629
                            "performed a successful checker"
 
2630
                            .format(client_name))
2655
2631
                        client["enabled"] = False
2656
2632
                    elif client["last_checker_status"] != 0:
2657
2633
                        logger.warning(
2658
 
                            "disabling client {} - Client last"
2659
 
                            " checker failed with error code"
2660
 
                            " {}".format(
2661
 
                                client_name,
2662
 
                                client["last_checker_status"]))
 
2634
                            "disabling client {0} - Client "
 
2635
                            "last checker failed with error code {1}"
 
2636
                            .format(client_name,
 
2637
                                    client["last_checker_status"]))
2663
2638
                        client["enabled"] = False
2664
2639
                    else:
2665
 
                        client["expires"] = (
2666
 
                            datetime.datetime.utcnow()
2667
 
                            + client["timeout"])
 
2640
                        client["expires"] = (datetime.datetime
 
2641
                                             .utcnow()
 
2642
                                             + client["timeout"])
2668
2643
                        logger.debug("Last checker succeeded,"
2669
 
                                     " keeping {} enabled".format(
2670
 
                                         client_name))
 
2644
                                     " keeping {0} enabled"
 
2645
                                     .format(client_name))
2671
2646
            try:
2672
 
                client["secret"] = pgp.decrypt(
2673
 
                    client["encrypted_secret"],
2674
 
                    client_settings[client_name]["secret"])
 
2647
                client["secret"] = (
 
2648
                    pgp.decrypt(client["encrypted_secret"],
 
2649
                                client_settings[client_name]
 
2650
                                ["secret"]))
2675
2651
            except PGPError:
2676
2652
                # If decryption fails, we use secret from new settings
2677
 
                logger.debug("Failed to decrypt {} old secret".format(
2678
 
                    client_name))
2679
 
                client["secret"] = (client_settings[client_name]
2680
 
                                    ["secret"])
 
2653
                logger.debug("Failed to decrypt {0} old secret"
 
2654
                             .format(client_name))
 
2655
                client["secret"] = (
 
2656
                    client_settings[client_name]["secret"])
2681
2657
    
2682
2658
    # Add/remove clients based on new changes made to config
2683
2659
    for client_name in (set(old_client_settings)
2688
2664
        clients_data[client_name] = client_settings[client_name]
2689
2665
    
2690
2666
    # Create all client objects
2691
 
    for client_name, client in clients_data.items():
 
2667
    for client_name, client in clients_data.iteritems():
2692
2668
        tcp_server.clients[client_name] = client_class(
2693
 
            name = client_name,
2694
 
            settings = client,
 
2669
            name = client_name, settings = client,
2695
2670
            server_settings = server_settings)
2696
2671
    
2697
2672
    if not tcp_server.clients:
2702
2677
            try:
2703
2678
                with pidfile:
2704
2679
                    pid = os.getpid()
2705
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2680
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2706
2681
            except IOError:
2707
2682
                logger.error("Could not write to file %r with PID %d",
2708
2683
                             pidfilename, pid)
2713
2688
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2714
2689
    
2715
2690
    if use_dbus:
2716
 
        
2717
 
        @alternate_dbus_interfaces(
2718
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
2691
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2692
                                        "se.bsnet.fukt.Mandos"})
2719
2693
        class MandosDBusService(DBusObjectWithProperties):
2720
2694
            """A D-Bus proxy object"""
2721
 
            
2722
2695
            def __init__(self):
2723
2696
                dbus.service.Object.__init__(self, bus, "/")
2724
 
            
2725
2697
            _interface = "se.recompile.Mandos"
2726
2698
            
2727
2699
            @dbus_interface_annotations(_interface)
2728
2700
            def _foo(self):
2729
 
                return {
2730
 
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
2731
 
                    "false" }
 
2701
                return { "org.freedesktop.DBus.Property"
 
2702
                         ".EmitsChangedSignal":
 
2703
                             "false"}
2732
2704
            
2733
2705
            @dbus.service.signal(_interface, signature="o")
2734
2706
            def ClientAdded(self, objpath):
2748
2720
            @dbus.service.method(_interface, out_signature="ao")
2749
2721
            def GetAllClients(self):
2750
2722
                "D-Bus method"
2751
 
                return dbus.Array(c.dbus_object_path for c in
 
2723
                return dbus.Array(c.dbus_object_path
 
2724
                                  for c in
2752
2725
                                  tcp_server.clients.itervalues())
2753
2726
            
2754
2727
            @dbus.service.method(_interface,
2756
2729
            def GetAllClientsWithProperties(self):
2757
2730
                "D-Bus method"
2758
2731
                return dbus.Dictionary(
2759
 
                    { c.dbus_object_path: c.GetAll("")
2760
 
                      for c in tcp_server.clients.itervalues() },
 
2732
                    ((c.dbus_object_path, c.GetAll(""))
 
2733
                     for c in tcp_server.clients.itervalues()),
2761
2734
                    signature="oa{sv}")
2762
2735
            
2763
2736
            @dbus.service.method(_interface, in_signature="o")
2801
2774
                
2802
2775
                # A list of attributes that can not be pickled
2803
2776
                # + secret.
2804
 
                exclude = { "bus", "changedstate", "secret",
2805
 
                            "checker", "server_settings" }
2806
 
                for name, typ in inspect.getmembers(dbus.service
2807
 
                                                    .Object):
 
2777
                exclude = set(("bus", "changedstate", "secret",
 
2778
                               "checker", "server_settings"))
 
2779
                for name, typ in (inspect.getmembers
 
2780
                                  (dbus.service.Object)):
2808
2781
                    exclude.add(name)
2809
2782
                
2810
2783
                client_dict["encrypted_secret"] = (client
2817
2790
                del client_settings[client.name]["secret"]
2818
2791
        
2819
2792
        try:
2820
 
            with tempfile.NamedTemporaryFile(
2821
 
                    mode='wb',
2822
 
                    suffix=".pickle",
2823
 
                    prefix='clients-',
2824
 
                    dir=os.path.dirname(stored_state_path),
2825
 
                    delete=False) as stored_state:
 
2793
            with (tempfile.NamedTemporaryFile
 
2794
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2795
                   dir=os.path.dirname(stored_state_path),
 
2796
                   delete=False)) as stored_state:
2826
2797
                pickle.dump((clients, client_settings), stored_state)
2827
 
                tempname = stored_state.name
 
2798
                tempname=stored_state.name
2828
2799
            os.rename(tempname, stored_state_path)
2829
2800
        except (IOError, OSError) as e:
2830
2801
            if not debug:
2833
2804
                except NameError:
2834
2805
                    pass
2835
2806
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2836
 
                logger.warning("Could not save persistent state: {}"
 
2807
                logger.warning("Could not save persistent state: {0}"
2837
2808
                               .format(os.strerror(e.errno)))
2838
2809
            else:
2839
2810
                logger.warning("Could not save persistent state:",
2849
2820
            client.disable(quiet=True)
2850
2821
            if use_dbus:
2851
2822
                # Emit D-Bus signal
2852
 
                mandos_dbus_service.ClientRemoved(
2853
 
                    client.dbus_object_path, client.name)
 
2823
                mandos_dbus_service.ClientRemoved(client
 
2824
                                                  .dbus_object_path,
 
2825
                                                  client.name)
2854
2826
        client_settings.clear()
2855
2827
    
2856
2828
    atexit.register(cleanup)
2909
2881
    # Must run before the D-Bus bus name gets deregistered
2910
2882
    cleanup()
2911
2883
 
2912
 
 
2913
2884
if __name__ == '__main__':
2914
2885
    main()