/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-16 20:30:35 UTC
  • Revision ID: teddy@recompile.se-20150716203035-z7qjwm270o2vrjah
Assume the C11 language (ISO 9899:2011), when compiling C code.

* Makefile (LANGUAGE): Changed to "-std=gnu11".

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
import SocketServer as socketserver
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
69
78
import tempfile
70
79
import itertools
71
80
import collections
 
81
import codecs
72
82
 
73
83
import dbus
74
84
import dbus.service
75
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
76
89
import avahi
77
90
from dbus.mainloop.glib import DBusGMainLoop
78
91
import ctypes
88
101
    except ImportError:
89
102
        SO_BINDTODEVICE = None
90
103
 
91
 
version = "1.6.7"
 
104
if sys.version_info.major == 2:
 
105
    str = unicode
 
106
 
 
107
version = "1.6.9"
92
108
stored_state_file = "clients.pickle"
93
109
 
94
110
logger = logging.getLogger()
95
111
syslogger = None
96
112
 
97
113
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
 
117
    
102
118
    def if_nametoindex(interface):
103
119
        "Get an interface index the hard way, i.e. using fcntl()"
104
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
121
        with contextlib.closing(socket.socket()) as s:
106
122
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
 
123
                                struct.pack(b"16s16x", interface))
 
124
        interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
        return interface_index
112
126
 
113
127
 
115
129
    """init logger and add loglevel"""
116
130
    
117
131
    global syslogger
118
 
    syslogger = (logging.handlers.SysLogHandler
119
 
                 (facility =
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
121
 
                  address = str("/dev/log")))
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
122
135
    syslogger.setFormatter(logging.Formatter
123
136
                           ('Mandos [%(process)d]: %(levelname)s:'
124
137
                            ' %(message)s'))
141
154
 
142
155
class PGPEngine(object):
143
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
144
158
    def __init__(self):
145
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
146
160
        self.gnupgargs = ['--batch',
185
199
    
186
200
    def encrypt(self, data, password):
187
201
        passphrase = self.password_encode(password)
188
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
189
 
                                         ) as passfile:
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
190
204
            passfile.write(passphrase)
191
205
            passfile.flush()
192
206
            proc = subprocess.Popen(['gpg', '--symmetric',
203
217
    
204
218
    def decrypt(self, data, password):
205
219
        passphrase = self.password_encode(password)
206
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
207
 
                                         ) as passfile:
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
208
222
            passfile.write(passphrase)
209
223
            passfile.flush()
210
224
            proc = subprocess.Popen(['gpg', '--decrypt',
214
228
                                    stdin = subprocess.PIPE,
215
229
                                    stdout = subprocess.PIPE,
216
230
                                    stderr = subprocess.PIPE)
217
 
            decrypted_plaintext, err = proc.communicate(input
218
 
                                                        = data)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
219
232
        if proc.returncode != 0:
220
233
            raise PGPError(err)
221
234
        return decrypted_plaintext
224
237
class AvahiError(Exception):
225
238
    def __init__(self, value, *args, **kwargs):
226
239
        self.value = value
227
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
228
 
    def __unicode__(self):
229
 
        return unicode(repr(self.value))
 
240
        return super(AvahiError, self).__init__(value, *args,
 
241
                                                **kwargs)
 
242
 
230
243
 
231
244
class AvahiServiceError(AvahiError):
232
245
    pass
233
246
 
 
247
 
234
248
class AvahiGroupError(AvahiError):
235
249
    pass
236
250
 
256
270
    bus: dbus.SystemBus()
257
271
    """
258
272
    
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):
 
273
    def __init__(self,
 
274
                 interface = avahi.IF_UNSPEC,
 
275
                 name = None,
 
276
                 servicetype = None,
 
277
                 port = None,
 
278
                 TXT = None,
 
279
                 domain = "",
 
280
                 host = "",
 
281
                 max_renames = 32768,
 
282
                 protocol = avahi.PROTO_UNSPEC,
 
283
                 bus = None):
263
284
        self.interface = interface
264
285
        self.name = name
265
286
        self.type = servicetype
275
296
        self.bus = bus
276
297
        self.entry_group_state_changed_match = None
277
298
    
278
 
    def rename(self):
 
299
    def rename(self, remove=True):
279
300
        """Derived from the Avahi example code"""
280
301
        if self.rename_count >= self.max_renames:
281
302
            logger.critical("No suitable Zeroconf service name found"
282
303
                            " after %i retries, exiting.",
283
304
                            self.rename_count)
284
305
            raise AvahiServiceError("Too many renames")
285
 
        self.name = unicode(self.server
286
 
                            .GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
 
308
        self.rename_count += 1
287
309
        logger.info("Changing Zeroconf service name to %r ...",
288
310
                    self.name)
289
 
        self.remove()
 
311
        if remove:
 
312
            self.remove()
290
313
        try:
291
314
            self.add()
292
315
        except dbus.exceptions.DBusException as error:
293
 
            logger.critical("D-Bus Exception", exc_info=error)
294
 
            self.cleanup()
295
 
            os._exit(1)
296
 
        self.rename_count += 1
 
316
            if (error.get_dbus_name()
 
317
                == "org.freedesktop.Avahi.CollisionError"):
 
318
                logger.info("Local Zeroconf service name collision.")
 
319
                return self.rename(remove=False)
 
320
            else:
 
321
                logger.critical("D-Bus Exception", exc_info=error)
 
322
                self.cleanup()
 
323
                os._exit(1)
297
324
    
298
325
    def remove(self):
299
326
        """Derived from the Avahi example code"""
337
364
            self.rename()
338
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
366
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            unicode(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
342
 
                                  .format(error))
 
367
                            str(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
343
369
    
344
370
    def cleanup(self):
345
371
        """Derived from the Avahi example code"""
355
381
    def server_state_changed(self, state, error=None):
356
382
        """Derived from the Avahi example code"""
357
383
        logger.debug("Avahi server state change: %i", state)
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" }
 
384
        bad_states = {
 
385
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
386
            avahi.SERVER_REGISTERING: None,
 
387
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
388
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
389
        }
365
390
        if state in bad_states:
366
391
            if bad_states[state] is not None:
367
392
                if error is None:
370
395
                    logger.error(bad_states[state] + ": %r", error)
371
396
            self.cleanup()
372
397
        elif state == avahi.SERVER_RUNNING:
373
 
            self.add()
 
398
            try:
 
399
                self.add()
 
400
            except dbus.exceptions.DBusException as error:
 
401
                if (error.get_dbus_name()
 
402
                    == "org.freedesktop.Avahi.CollisionError"):
 
403
                    logger.info("Local Zeroconf service name"
 
404
                                " collision.")
 
405
                    return self.rename(remove=False)
 
406
                else:
 
407
                    logger.critical("D-Bus Exception", exc_info=error)
 
408
                    self.cleanup()
 
409
                    os._exit(1)
374
410
        else:
375
411
            if error is None:
376
412
                logger.debug("Unknown state: %r", state)
386
422
                                    follow_name_owner_changes=True),
387
423
                avahi.DBUS_INTERFACE_SERVER)
388
424
        self.server.connect_to_signal("StateChanged",
389
 
                                 self.server_state_changed)
 
425
                                      self.server_state_changed)
390
426
        self.server_state_changed(self.server.GetState())
391
427
 
392
428
 
393
429
class AvahiServiceToSyslog(AvahiService):
394
 
    def rename(self):
 
430
    def rename(self, *args, **kwargs):
395
431
        """Add the new name to the syslog messages"""
396
 
        ret = AvahiService.rename(self)
397
 
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
399
 
                                ' %(levelname)s: %(message)s'
400
 
                                .format(self.name)))
 
432
        ret = AvahiService.rename(self, *args, **kwargs)
 
433
        syslogger.setFormatter(logging.Formatter(
 
434
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
435
            .format(self.name)))
401
436
        return ret
402
437
 
 
438
def call_pipe(connection,       # : multiprocessing.Connection
 
439
              func, *args, **kwargs):
 
440
    """This function is meant to be called by multiprocessing.Process
 
441
    
 
442
    This function runs func(*args, **kwargs), and writes the resulting
 
443
    return value on the provided multiprocessing.Connection.
 
444
    """
 
445
    connection.send(func(*args, **kwargs))
 
446
    connection.close()
403
447
 
404
448
class Client(object):
405
449
    """A representation of a client host served by this server.
432
476
    last_checker_status: integer between 0 and 255 reflecting exit
433
477
                         status of last checker. -1 reflects crashed
434
478
                         checker, -2 means no checker completed yet.
 
479
    last_checker_signal: The signal which killed the last checker, if
 
480
                         last_checker_status is -1
435
481
    last_enabled: datetime.datetime(); (UTC) or None
436
482
    name:       string; from the config file, used in log messages and
437
483
                        D-Bus identifiers
450
496
                          "fingerprint", "host", "interval",
451
497
                          "last_approval_request", "last_checked_ok",
452
498
                          "last_enabled", "name", "timeout")
453
 
    client_defaults = { "timeout": "PT5M",
454
 
                        "extended_timeout": "PT15M",
455
 
                        "interval": "PT2M",
456
 
                        "checker": "fping -q -- %%(host)s",
457
 
                        "host": "",
458
 
                        "approval_delay": "PT0S",
459
 
                        "approval_duration": "PT1S",
460
 
                        "approved_by_default": "True",
461
 
                        "enabled": "True",
462
 
                        }
 
499
    client_defaults = {
 
500
        "timeout": "PT5M",
 
501
        "extended_timeout": "PT15M",
 
502
        "interval": "PT2M",
 
503
        "checker": "fping -q -- %%(host)s",
 
504
        "host": "",
 
505
        "approval_delay": "PT0S",
 
506
        "approval_duration": "PT1S",
 
507
        "approved_by_default": "True",
 
508
        "enabled": "True",
 
509
    }
463
510
    
464
511
    @staticmethod
465
512
    def config_parser(config):
481
528
            client["enabled"] = config.getboolean(client_name,
482
529
                                                  "enabled")
483
530
            
 
531
            # Uppercase and remove spaces from fingerprint for later
 
532
            # comparison purposes with return value from the
 
533
            # fingerprint() function
484
534
            client["fingerprint"] = (section["fingerprint"].upper()
485
535
                                     .replace(" ", ""))
486
536
            if "secret" in section:
528
578
            self.expires = None
529
579
        
530
580
        logger.debug("Creating client %r", self.name)
531
 
        # Uppercase and remove spaces from fingerprint for later
532
 
        # comparison purposes with return value from the fingerprint()
533
 
        # function
534
581
        logger.debug("  Fingerprint: %s", self.fingerprint)
535
582
        self.created = settings.get("created",
536
583
                                    datetime.datetime.utcnow())
543
590
        self.current_checker_command = None
544
591
        self.approved = None
545
592
        self.approvals_pending = 0
546
 
        self.changedstate = (multiprocessing_manager
547
 
                             .Condition(multiprocessing_manager
548
 
                                        .Lock()))
549
 
        self.client_structure = [attr for attr in
550
 
                                 self.__dict__.iterkeys()
 
593
        self.changedstate = multiprocessing_manager.Condition(
 
594
            multiprocessing_manager.Lock())
 
595
        self.client_structure = [attr
 
596
                                 for attr in self.__dict__.iterkeys()
551
597
                                 if not attr.startswith("_")]
552
598
        self.client_structure.append("client_structure")
553
599
        
554
 
        for name, t in inspect.getmembers(type(self),
555
 
                                          lambda obj:
556
 
                                              isinstance(obj,
557
 
                                                         property)):
 
600
        for name, t in inspect.getmembers(
 
601
                type(self), lambda obj: isinstance(obj, property)):
558
602
            if not name.startswith("_"):
559
603
                self.client_structure.append(name)
560
604
    
602
646
        # and every interval from then on.
603
647
        if self.checker_initiator_tag is not None:
604
648
            gobject.source_remove(self.checker_initiator_tag)
605
 
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
608
 
                                       self.start_checker))
 
649
        self.checker_initiator_tag = gobject.timeout_add(
 
650
            int(self.interval.total_seconds() * 1000),
 
651
            self.start_checker)
609
652
        # Schedule a disable() when 'timeout' has passed
610
653
        if self.disable_initiator_tag is not None:
611
654
            gobject.source_remove(self.disable_initiator_tag)
612
 
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
655
        self.disable_initiator_tag = gobject.timeout_add(
 
656
            int(self.timeout.total_seconds() * 1000), self.disable)
616
657
        # Also start a new checker *right now*.
617
658
        self.start_checker()
618
659
    
619
 
    def checker_callback(self, pid, condition, command):
 
660
    def checker_callback(self, source, condition, connection,
 
661
                         command):
620
662
        """The checker has completed, so take appropriate actions."""
621
663
        self.checker_callback_tag = None
622
664
        self.checker = None
623
 
        if os.WIFEXITED(condition):
624
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
665
        # Read return code from connection (see call_pipe)
 
666
        returncode = connection.recv()
 
667
        connection.close()
 
668
        
 
669
        if returncode >= 0:
 
670
            self.last_checker_status = returncode
 
671
            self.last_checker_signal = None
625
672
            if self.last_checker_status == 0:
626
673
                logger.info("Checker for %(name)s succeeded",
627
674
                            vars(self))
628
675
                self.checked_ok()
629
676
            else:
630
 
                logger.info("Checker for %(name)s failed",
631
 
                            vars(self))
 
677
                logger.info("Checker for %(name)s failed", vars(self))
632
678
        else:
633
679
            self.last_checker_status = -1
 
680
            self.last_checker_signal = -returncode
634
681
            logger.warning("Checker for %(name)s crashed?",
635
682
                           vars(self))
 
683
        return False
636
684
    
637
685
    def checked_ok(self):
638
686
        """Assert that the client has been seen, alive and well."""
639
687
        self.last_checked_ok = datetime.datetime.utcnow()
640
688
        self.last_checker_status = 0
 
689
        self.last_checker_signal = None
641
690
        self.bump_timeout()
642
691
    
643
692
    def bump_timeout(self, timeout=None):
648
697
            gobject.source_remove(self.disable_initiator_tag)
649
698
            self.disable_initiator_tag = None
650
699
        if getattr(self, "enabled", False):
651
 
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
700
            self.disable_initiator_tag = gobject.timeout_add(
 
701
                int(timeout.total_seconds() * 1000), self.disable)
654
702
            self.expires = datetime.datetime.utcnow() + timeout
655
703
    
656
704
    def need_approval(self):
670
718
        # than 'timeout' for the client to be disabled, which is as it
671
719
        # should be.
672
720
        
673
 
        # If a checker exists, make sure it is not a zombie
674
 
        try:
675
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
 
        except AttributeError:
677
 
            pass
678
 
        except OSError as error:
679
 
            if error.errno != errno.ECHILD:
680
 
                raise
681
 
        else:
682
 
            if pid:
683
 
                logger.warning("Checker was a zombie")
684
 
                gobject.source_remove(self.checker_callback_tag)
685
 
                self.checker_callback(pid, status,
686
 
                                      self.current_checker_command)
 
721
        if self.checker is not None and not self.checker.is_alive():
 
722
            logger.warning("Checker was not alive; joining")
 
723
            self.checker.join()
 
724
            self.checker = None
687
725
        # Start a new checker if needed
688
726
        if self.checker is None:
689
727
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(unicode(getattr(self,
692
 
                                                            attr)))
693
 
                              for attr in self.runtime_expansions }
 
728
            escaped_attrs = {
 
729
                attr: re.escape(str(getattr(self, attr)))
 
730
                for attr in self.runtime_expansions }
694
731
            try:
695
732
                command = self.checker_command % escaped_attrs
696
733
            except TypeError as error:
697
734
                logger.error('Could not format string "%s"',
698
 
                             self.checker_command, exc_info=error)
699
 
                return True # Try again later
 
735
                             self.checker_command,
 
736
                             exc_info=error)
 
737
                return True     # Try again later
700
738
            self.current_checker_command = command
701
 
            try:
702
 
                logger.info("Starting checker %r for %s",
703
 
                            command, self.name)
704
 
                # We don't need to redirect stdout and stderr, since
705
 
                # in normal mode, that is already done by daemon(),
706
 
                # and in debug mode we don't want to.  (Stdin is
707
 
                # always replaced by /dev/null.)
708
 
                # The exception is when not debugging but nevertheless
709
 
                # running in the foreground; use the previously
710
 
                # created wnull.
711
 
                popen_args = {}
712
 
                if (not self.server_settings["debug"]
713
 
                    and self.server_settings["foreground"]):
714
 
                    popen_args.update({"stdout": wnull,
715
 
                                       "stderr": wnull })
716
 
                self.checker = subprocess.Popen(command,
717
 
                                                close_fds=True,
718
 
                                                shell=True, cwd="/",
719
 
                                                **popen_args)
720
 
            except OSError as error:
721
 
                logger.error("Failed to start subprocess",
722
 
                             exc_info=error)
723
 
                return True
724
 
            self.checker_callback_tag = (gobject.child_watch_add
725
 
                                         (self.checker.pid,
726
 
                                          self.checker_callback,
727
 
                                          data=command))
728
 
            # The checker may have completed before the gobject
729
 
            # watch was added.  Check for this.
730
 
            try:
731
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
732
 
            except OSError as error:
733
 
                if error.errno == errno.ECHILD:
734
 
                    # This should never happen
735
 
                    logger.error("Child process vanished",
736
 
                                 exc_info=error)
737
 
                    return True
738
 
                raise
739
 
            if pid:
740
 
                gobject.source_remove(self.checker_callback_tag)
741
 
                self.checker_callback(pid, status, command)
 
739
            logger.info("Starting checker %r for %s", command,
 
740
                        self.name)
 
741
            # We don't need to redirect stdout and stderr, since
 
742
            # in normal mode, that is already done by daemon(),
 
743
            # and in debug mode we don't want to.  (Stdin is
 
744
            # always replaced by /dev/null.)
 
745
            # The exception is when not debugging but nevertheless
 
746
            # running in the foreground; use the previously
 
747
            # created wnull.
 
748
            popen_args = { "close_fds": True,
 
749
                           "shell": True,
 
750
                           "cwd": "/" }
 
751
            if (not self.server_settings["debug"]
 
752
                and self.server_settings["foreground"]):
 
753
                popen_args.update({"stdout": wnull,
 
754
                                   "stderr": wnull })
 
755
            pipe = multiprocessing.Pipe(duplex = False)
 
756
            self.checker = multiprocessing.Process(
 
757
                target = call_pipe,
 
758
                args = (pipe[1], subprocess.call, command),
 
759
                kwargs = popen_args)
 
760
            self.checker.start()
 
761
            self.checker_callback_tag = gobject.io_add_watch(
 
762
                pipe[0].fileno(), gobject.IO_IN,
 
763
                self.checker_callback, pipe[0], command)
742
764
        # Re-run this periodically if run by gobject.timeout_add
743
765
        return True
744
766
    
750
772
        if getattr(self, "checker", None) is None:
751
773
            return
752
774
        logger.debug("Stopping checker for %(name)s", vars(self))
753
 
        try:
754
 
            self.checker.terminate()
755
 
            #time.sleep(0.5)
756
 
            #if self.checker.poll() is None:
757
 
            #    self.checker.kill()
758
 
        except OSError as error:
759
 
            if error.errno != errno.ESRCH: # No such process
760
 
                raise
 
775
        self.checker.terminate()
761
776
        self.checker = None
762
777
 
763
778
 
764
 
def dbus_service_property(dbus_interface, signature="v",
765
 
                          access="readwrite", byte_arrays=False):
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
766
783
    """Decorators for marking methods of a DBusObjectWithProperties to
767
784
    become properties on the D-Bus.
768
785
    
778
795
    if byte_arrays and signature != "ay":
779
796
        raise ValueError("Byte arrays not supported for non-'ay'"
780
797
                         " signature {!r}".format(signature))
 
798
    
781
799
    def decorator(func):
782
800
        func._dbus_is_property = True
783
801
        func._dbus_interface = dbus_interface
788
806
            func._dbus_name = func._dbus_name[:-14]
789
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
790
808
        return func
 
809
    
791
810
    return decorator
792
811
 
793
812
 
802
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
803
822
                    "false"}
804
823
    """
 
824
    
805
825
    def decorator(func):
806
826
        func._dbus_is_interface = True
807
827
        func._dbus_interface = dbus_interface
808
828
        func._dbus_name = dbus_interface
809
829
        return func
 
830
    
810
831
    return decorator
811
832
 
812
833
 
814
835
    """Decorator to annotate D-Bus methods, signals or properties
815
836
    Usage:
816
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
817
841
    @dbus_service_property("org.example.Interface", signature="b",
818
842
                           access="r")
819
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
820
 
                        "org.freedesktop.DBus.Property."
821
 
                        "EmitsChangedSignal": "false"})
822
843
    def Property_dbus_property(self):
823
844
        return dbus.Boolean(False)
824
845
    """
 
846
    
825
847
    def decorator(func):
826
848
        func._dbus_annotations = annotations
827
849
        return func
 
850
    
828
851
    return decorator
829
852
 
830
853
 
831
854
class DBusPropertyException(dbus.exceptions.DBusException):
832
855
    """A base class for D-Bus property-related exceptions
833
856
    """
834
 
    def __unicode__(self):
835
 
        return unicode(str(self))
 
857
    pass
836
858
 
837
859
 
838
860
class DBusPropertyAccessException(DBusPropertyException):
868
890
    def _get_all_dbus_things(self, thing):
869
891
        """Returns a generator of (name, attribute) pairs
870
892
        """
871
 
        return ((getattr(athing.__get__(self), "_dbus_name",
872
 
                         name),
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
873
894
                 athing.__get__(self))
874
895
                for cls in self.__class__.__mro__
875
896
                for name, athing in
876
 
                inspect.getmembers(cls,
877
 
                                   self._is_dbus_thing(thing)))
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
878
898
    
879
899
    def _get_dbus_property(self, interface_name, property_name):
880
900
        """Returns a bound method if one exists which is a D-Bus
881
901
        property with the specified name and interface.
882
902
        """
883
 
        for cls in  self.__class__.__mro__:
884
 
            for name, value in (inspect.getmembers
885
 
                                (cls,
886
 
                                 self._is_dbus_thing("property"))):
 
903
        for cls in self.__class__.__mro__:
 
904
            for name, value in inspect.getmembers(
 
905
                    cls, self._is_dbus_thing("property")):
887
906
                if (value._dbus_name == property_name
888
907
                    and value._dbus_interface == interface_name):
889
908
                    return value.__get__(self)
890
909
        
891
910
        # No such property
892
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
893
 
                                   + interface_name + "."
894
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
895
913
    
896
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
897
916
                         out_signature="v")
898
917
    def Get(self, interface_name, property_name):
899
918
        """Standard D-Bus property Get() method, see D-Bus standard.
924
943
                                            for byte in value))
925
944
        prop(value)
926
945
    
927
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
928
948
                         out_signature="a{sv}")
929
949
    def GetAll(self, interface_name):
930
950
        """Standard D-Bus property GetAll() method, see D-Bus
945
965
            if not hasattr(value, "variant_level"):
946
966
                properties[name] = value
947
967
                continue
948
 
            properties[name] = type(value)(value, variant_level=
949
 
                                           value.variant_level+1)
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
950
970
        return dbus.Dictionary(properties, signature="sv")
951
971
    
 
972
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
973
    def PropertiesChanged(self, interface_name, changed_properties,
 
974
                          invalidated_properties):
 
975
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
976
        standard.
 
977
        """
 
978
        pass
 
979
    
952
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
953
981
                         out_signature="s",
954
982
                         path_keyword='object_path',
962
990
                                                   connection)
963
991
        try:
964
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
965
994
            def make_tag(document, name, prop):
966
995
                e = document.createElement("property")
967
996
                e.setAttribute("name", name)
968
997
                e.setAttribute("type", prop._dbus_signature)
969
998
                e.setAttribute("access", prop._dbus_access)
970
999
                return e
 
1000
            
971
1001
            for if_tag in document.getElementsByTagName("interface"):
972
1002
                # Add property tags
973
1003
                for tag in (make_tag(document, name, prop)
985
1015
                            if (name == tag.getAttribute("name")
986
1016
                                and prop._dbus_interface
987
1017
                                == if_tag.getAttribute("name")):
988
 
                                annots.update(getattr
989
 
                                              (prop,
990
 
                                               "_dbus_annotations",
991
 
                                               {}))
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
992
1020
                        for name, value in annots.items():
993
1021
                            ann_tag = document.createElement(
994
1022
                                "annotation")
999
1027
                for annotation, value in dict(
1000
1028
                    itertools.chain.from_iterable(
1001
1029
                        annotations().items()
1002
 
                        for name, annotations in
1003
 
                        self._get_all_dbus_things("interface")
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
1004
1032
                        if name == if_tag.getAttribute("name")
1005
1033
                        )).items():
1006
1034
                    ann_tag = document.createElement("annotation")
1035
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1036
1064
    if dt is None:
1037
1065
        return dbus.String("", variant_level = variant_level)
1038
 
    return dbus.String(dt.isoformat(),
1039
 
                       variant_level=variant_level)
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1040
1067
 
1041
1068
 
1042
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1062
1089
    (from DBusObjectWithProperties) and interfaces (from the
1063
1090
    dbus_interface_annotations decorator).
1064
1091
    """
 
1092
    
1065
1093
    def wrapper(cls):
1066
1094
        for orig_interface_name, alt_interface_name in (
1067
 
            alt_interface_names.items()):
 
1095
                alt_interface_names.items()):
1068
1096
            attr = {}
1069
1097
            interface_names = set()
1070
1098
            # Go though all attributes of the class
1072
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
1073
1101
                # with the wrong interface name
1074
1102
                if (not hasattr(attribute, "_dbus_interface")
1075
 
                    or not attribute._dbus_interface
1076
 
                    .startswith(orig_interface_name)):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
1077
1105
                    continue
1078
1106
                # Create an alternate D-Bus interface name based on
1079
1107
                # the current name
1080
 
                alt_interface = (attribute._dbus_interface
1081
 
                                 .replace(orig_interface_name,
1082
 
                                          alt_interface_name))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
1083
1110
                interface_names.add(alt_interface)
1084
1111
                # Is this a D-Bus signal?
1085
1112
                if getattr(attribute, "_dbus_is_signal", False):
1086
 
                    # Extract the original non-method undecorated
1087
 
                    # function by black magic
1088
 
                    nonmethod_func = (dict(
 
1113
                    if sys.version_info.major == 2:
 
1114
                        # Extract the original non-method undecorated
 
1115
                        # function by black magic
 
1116
                        nonmethod_func = (dict(
1089
1117
                            zip(attribute.func_code.co_freevars,
1090
 
                                attribute.__closure__))["func"]
1091
 
                                      .cell_contents)
 
1118
                                attribute.__closure__))
 
1119
                                          ["func"].cell_contents)
 
1120
                    else:
 
1121
                        nonmethod_func = attribute
1092
1122
                    # Create a new, but exactly alike, function
1093
1123
                    # object, and decorate it to be a new D-Bus signal
1094
1124
                    # with the alternate D-Bus interface name
1095
 
                    new_function = (dbus.service.signal
1096
 
                                    (alt_interface,
1097
 
                                     attribute._dbus_signature)
1098
 
                                    (types.FunctionType(
1099
 
                                nonmethod_func.func_code,
1100
 
                                nonmethod_func.func_globals,
1101
 
                                nonmethod_func.func_name,
1102
 
                                nonmethod_func.func_defaults,
1103
 
                                nonmethod_func.func_closure)))
 
1125
                    if sys.version_info.major == 2:
 
1126
                        new_function = types.FunctionType(
 
1127
                            nonmethod_func.func_code,
 
1128
                            nonmethod_func.func_globals,
 
1129
                            nonmethod_func.func_name,
 
1130
                            nonmethod_func.func_defaults,
 
1131
                            nonmethod_func.func_closure)
 
1132
                    else:
 
1133
                        new_function = types.FunctionType(
 
1134
                            nonmethod_func.__code__,
 
1135
                            nonmethod_func.__globals__,
 
1136
                            nonmethod_func.__name__,
 
1137
                            nonmethod_func.__defaults__,
 
1138
                            nonmethod_func.__closure__)
 
1139
                    new_function = (dbus.service.signal(
 
1140
                        alt_interface,
 
1141
                        attribute._dbus_signature)(new_function))
1104
1142
                    # Copy annotations, if any
1105
1143
                    try:
1106
 
                        new_function._dbus_annotations = (
1107
 
                            dict(attribute._dbus_annotations))
 
1144
                        new_function._dbus_annotations = dict(
 
1145
                            attribute._dbus_annotations)
1108
1146
                    except AttributeError:
1109
1147
                        pass
1110
1148
                    # Define a creator of a function to call both the
1115
1153
                        """This function is a scope container to pass
1116
1154
                        func1 and func2 to the "call_both" function
1117
1155
                        outside of its arguments"""
 
1156
                        
1118
1157
                        def call_both(*args, **kwargs):
1119
1158
                            """This function will emit two D-Bus
1120
1159
                            signals by calling func1 and func2"""
1121
1160
                            func1(*args, **kwargs)
1122
1161
                            func2(*args, **kwargs)
 
1162
                        
1123
1163
                        return call_both
1124
1164
                    # Create the "call_both" function and add it to
1125
1165
                    # the class
1130
1170
                    # object.  Decorate it to be a new D-Bus method
1131
1171
                    # with the alternate D-Bus interface name.  Add it
1132
1172
                    # to the class.
1133
 
                    attr[attrname] = (dbus.service.method
1134
 
                                      (alt_interface,
1135
 
                                       attribute._dbus_in_signature,
1136
 
                                       attribute._dbus_out_signature)
1137
 
                                      (types.FunctionType
1138
 
                                       (attribute.func_code,
1139
 
                                        attribute.func_globals,
1140
 
                                        attribute.func_name,
1141
 
                                        attribute.func_defaults,
1142
 
                                        attribute.func_closure)))
 
1173
                    attr[attrname] = (
 
1174
                        dbus.service.method(
 
1175
                            alt_interface,
 
1176
                            attribute._dbus_in_signature,
 
1177
                            attribute._dbus_out_signature)
 
1178
                        (types.FunctionType(attribute.func_code,
 
1179
                                            attribute.func_globals,
 
1180
                                            attribute.func_name,
 
1181
                                            attribute.func_defaults,
 
1182
                                            attribute.func_closure)))
1143
1183
                    # Copy annotations, if any
1144
1184
                    try:
1145
 
                        attr[attrname]._dbus_annotations = (
1146
 
                            dict(attribute._dbus_annotations))
 
1185
                        attr[attrname]._dbus_annotations = dict(
 
1186
                            attribute._dbus_annotations)
1147
1187
                    except AttributeError:
1148
1188
                        pass
1149
1189
                # Is this a D-Bus property?
1152
1192
                    # object, and decorate it to be a new D-Bus
1153
1193
                    # property with the alternate D-Bus interface
1154
1194
                    # name.  Add it to the class.
1155
 
                    attr[attrname] = (dbus_service_property
1156
 
                                      (alt_interface,
1157
 
                                       attribute._dbus_signature,
1158
 
                                       attribute._dbus_access,
1159
 
                                       attribute
1160
 
                                       ._dbus_get_args_options
1161
 
                                       ["byte_arrays"])
1162
 
                                      (types.FunctionType
1163
 
                                       (attribute.func_code,
1164
 
                                        attribute.func_globals,
1165
 
                                        attribute.func_name,
1166
 
                                        attribute.func_defaults,
1167
 
                                        attribute.func_closure)))
 
1195
                    attr[attrname] = (dbus_service_property(
 
1196
                        alt_interface, attribute._dbus_signature,
 
1197
                        attribute._dbus_access,
 
1198
                        attribute._dbus_get_args_options
 
1199
                        ["byte_arrays"])
 
1200
                                      (types.FunctionType(
 
1201
                                          attribute.func_code,
 
1202
                                          attribute.func_globals,
 
1203
                                          attribute.func_name,
 
1204
                                          attribute.func_defaults,
 
1205
                                          attribute.func_closure)))
1168
1206
                    # Copy annotations, if any
1169
1207
                    try:
1170
 
                        attr[attrname]._dbus_annotations = (
1171
 
                            dict(attribute._dbus_annotations))
 
1208
                        attr[attrname]._dbus_annotations = dict(
 
1209
                            attribute._dbus_annotations)
1172
1210
                    except AttributeError:
1173
1211
                        pass
1174
1212
                # Is this a D-Bus interface?
1177
1215
                    # object.  Decorate it to be a new D-Bus interface
1178
1216
                    # with the alternate D-Bus interface name.  Add it
1179
1217
                    # to the class.
1180
 
                    attr[attrname] = (dbus_interface_annotations
1181
 
                                      (alt_interface)
1182
 
                                      (types.FunctionType
1183
 
                                       (attribute.func_code,
1184
 
                                        attribute.func_globals,
1185
 
                                        attribute.func_name,
1186
 
                                        attribute.func_defaults,
1187
 
                                        attribute.func_closure)))
 
1218
                    attr[attrname] = (
 
1219
                        dbus_interface_annotations(alt_interface)
 
1220
                        (types.FunctionType(attribute.func_code,
 
1221
                                            attribute.func_globals,
 
1222
                                            attribute.func_name,
 
1223
                                            attribute.func_defaults,
 
1224
                                            attribute.func_closure)))
1188
1225
            if deprecate:
1189
1226
                # Deprecate all alternate interfaces
1190
1227
                iname="_AlternateDBusNames_interface_annotation{}"
1191
1228
                for interface_name in interface_names:
 
1229
                    
1192
1230
                    @dbus_interface_annotations(interface_name)
1193
1231
                    def func(self):
1194
1232
                        return { "org.freedesktop.DBus.Deprecated":
1195
 
                                     "true" }
 
1233
                                 "true" }
1196
1234
                    # Find an unused name
1197
1235
                    for aname in (iname.format(i)
1198
1236
                                  for i in itertools.count()):
1203
1241
                # Replace the class with a new subclass of it with
1204
1242
                # methods, signals, etc. as created above.
1205
1243
                cls = type(b"{}Alternate".format(cls.__name__),
1206
 
                           (cls,), attr)
 
1244
                           (cls, ), attr)
1207
1245
        return cls
 
1246
    
1208
1247
    return wrapper
1209
1248
 
1210
1249
 
1211
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1212
 
                                "se.bsnet.fukt.Mandos"})
 
1251
                            "se.bsnet.fukt.Mandos"})
1213
1252
class ClientDBus(Client, DBusObjectWithProperties):
1214
1253
    """A Client class using D-Bus
1215
1254
    
1219
1258
    """
1220
1259
    
1221
1260
    runtime_expansions = (Client.runtime_expansions
1222
 
                          + ("dbus_object_path",))
 
1261
                          + ("dbus_object_path", ))
 
1262
    
 
1263
    _interface = "se.recompile.Mandos.Client"
1223
1264
    
1224
1265
    # dbus.service.Object doesn't use super(), so we can't either.
1225
1266
    
1228
1269
        Client.__init__(self, *args, **kwargs)
1229
1270
        # Only now, when this client is initialized, can it show up on
1230
1271
        # the D-Bus
1231
 
        client_object_name = unicode(self.name).translate(
 
1272
        client_object_name = str(self.name).translate(
1232
1273
            {ord("."): ord("_"),
1233
1274
             ord("-"): ord("_")})
1234
 
        self.dbus_object_path = (dbus.ObjectPath
1235
 
                                 ("/clients/" + client_object_name))
 
1275
        self.dbus_object_path = dbus.ObjectPath(
 
1276
            "/clients/" + client_object_name)
1236
1277
        DBusObjectWithProperties.__init__(self, self.bus,
1237
1278
                                          self.dbus_object_path)
1238
1279
    
1239
 
    def notifychangeproperty(transform_func,
1240
 
                             dbus_name, type_func=lambda x: x,
1241
 
                             variant_level=1):
 
1280
    def notifychangeproperty(transform_func, dbus_name,
 
1281
                             type_func=lambda x: x,
 
1282
                             variant_level=1,
 
1283
                             invalidate_only=False,
 
1284
                             _interface=_interface):
1242
1285
        """ Modify a variable so that it's a property which announces
1243
1286
        its changes to DBus.
1244
1287
        
1250
1293
        variant_level: D-Bus variant level.  Default: 1
1251
1294
        """
1252
1295
        attrname = "_{}".format(dbus_name)
 
1296
        
1253
1297
        def setter(self, value):
1254
1298
            if hasattr(self, "dbus_object_path"):
1255
1299
                if (not hasattr(self, attrname) or
1256
1300
                    type_func(getattr(self, attrname, None))
1257
1301
                    != type_func(value)):
1258
 
                    dbus_value = transform_func(type_func(value),
1259
 
                                                variant_level
1260
 
                                                =variant_level)
1261
 
                    self.PropertyChanged(dbus.String(dbus_name),
1262
 
                                         dbus_value)
 
1302
                    if invalidate_only:
 
1303
                        self.PropertiesChanged(
 
1304
                            _interface, dbus.Dictionary(),
 
1305
                            dbus.Array((dbus_name, )))
 
1306
                    else:
 
1307
                        dbus_value = transform_func(
 
1308
                            type_func(value),
 
1309
                            variant_level = variant_level)
 
1310
                        self.PropertyChanged(dbus.String(dbus_name),
 
1311
                                             dbus_value)
 
1312
                        self.PropertiesChanged(
 
1313
                            _interface,
 
1314
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1315
                                              dbus_value }),
 
1316
                            dbus.Array())
1263
1317
            setattr(self, attrname, value)
1264
1318
        
1265
1319
        return property(lambda self: getattr(self, attrname), setter)
1271
1325
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1272
1326
    last_enabled = notifychangeproperty(datetime_to_dbus,
1273
1327
                                        "LastEnabled")
1274
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1275
 
                                   type_func = lambda checker:
1276
 
                                       checker is not None)
 
1328
    checker = notifychangeproperty(
 
1329
        dbus.Boolean, "CheckerRunning",
 
1330
        type_func = lambda checker: checker is not None)
1277
1331
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1278
1332
                                           "LastCheckedOK")
1279
1333
    last_checker_status = notifychangeproperty(dbus.Int16,
1282
1336
        datetime_to_dbus, "LastApprovalRequest")
1283
1337
    approved_by_default = notifychangeproperty(dbus.Boolean,
1284
1338
                                               "ApprovedByDefault")
1285
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1286
 
                                          "ApprovalDelay",
1287
 
                                          type_func =
1288
 
                                          lambda td: td.total_seconds()
1289
 
                                          * 1000)
 
1339
    approval_delay = notifychangeproperty(
 
1340
        dbus.UInt64, "ApprovalDelay",
 
1341
        type_func = lambda td: td.total_seconds() * 1000)
1290
1342
    approval_duration = notifychangeproperty(
1291
1343
        dbus.UInt64, "ApprovalDuration",
1292
1344
        type_func = lambda td: td.total_seconds() * 1000)
1293
1345
    host = notifychangeproperty(dbus.String, "Host")
1294
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1295
 
                                   type_func = lambda td:
1296
 
                                       td.total_seconds() * 1000)
 
1346
    timeout = notifychangeproperty(
 
1347
        dbus.UInt64, "Timeout",
 
1348
        type_func = lambda td: td.total_seconds() * 1000)
1297
1349
    extended_timeout = notifychangeproperty(
1298
1350
        dbus.UInt64, "ExtendedTimeout",
1299
1351
        type_func = lambda td: td.total_seconds() * 1000)
1300
 
    interval = notifychangeproperty(dbus.UInt64,
1301
 
                                    "Interval",
1302
 
                                    type_func =
1303
 
                                    lambda td: td.total_seconds()
1304
 
                                    * 1000)
 
1352
    interval = notifychangeproperty(
 
1353
        dbus.UInt64, "Interval",
 
1354
        type_func = lambda td: td.total_seconds() * 1000)
1305
1355
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1356
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1357
                                  invalidate_only=True)
1306
1358
    
1307
1359
    del notifychangeproperty
1308
1360
    
1315
1367
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1316
1368
        Client.__del__(self, *args, **kwargs)
1317
1369
    
1318
 
    def checker_callback(self, pid, condition, command,
1319
 
                         *args, **kwargs):
1320
 
        self.checker_callback_tag = None
1321
 
        self.checker = None
1322
 
        if os.WIFEXITED(condition):
1323
 
            exitstatus = os.WEXITSTATUS(condition)
 
1370
    def checker_callback(self, source, condition,
 
1371
                         connection, command, *args, **kwargs):
 
1372
        ret = Client.checker_callback(self, source, condition,
 
1373
                                      connection, command, *args,
 
1374
                                      **kwargs)
 
1375
        exitstatus = self.last_checker_status
 
1376
        if exitstatus >= 0:
1324
1377
            # Emit D-Bus signal
1325
1378
            self.CheckerCompleted(dbus.Int16(exitstatus),
1326
 
                                  dbus.Int64(condition),
 
1379
                                  dbus.Int64(0),
1327
1380
                                  dbus.String(command))
1328
1381
        else:
1329
1382
            # Emit D-Bus signal
1330
1383
            self.CheckerCompleted(dbus.Int16(-1),
1331
 
                                  dbus.Int64(condition),
 
1384
                                  dbus.Int64(
 
1385
                                      self.last_checker_signal),
1332
1386
                                  dbus.String(command))
1333
 
        
1334
 
        return Client.checker_callback(self, pid, condition, command,
1335
 
                                       *args, **kwargs)
 
1387
        return ret
1336
1388
    
1337
1389
    def start_checker(self, *args, **kwargs):
1338
1390
        old_checker_pid = getattr(self.checker, "pid", None)
1355
1407
        self.send_changedstate()
1356
1408
    
1357
1409
    ## D-Bus methods, signals & properties
1358
 
    _interface = "se.recompile.Mandos.Client"
1359
1410
    
1360
1411
    ## Interfaces
1361
1412
    
1362
 
    @dbus_interface_annotations(_interface)
1363
 
    def _foo(self):
1364
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1365
 
                     "false"}
1366
 
    
1367
1413
    ## Signals
1368
1414
    
1369
1415
    # CheckerCompleted - signal
1379
1425
        pass
1380
1426
    
1381
1427
    # PropertyChanged - signal
 
1428
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1382
1429
    @dbus.service.signal(_interface, signature="sv")
1383
1430
    def PropertyChanged(self, property, value):
1384
1431
        "D-Bus signal"
1448
1495
        return dbus.Boolean(bool(self.approvals_pending))
1449
1496
    
1450
1497
    # ApprovedByDefault - property
1451
 
    @dbus_service_property(_interface, signature="b",
 
1498
    @dbus_service_property(_interface,
 
1499
                           signature="b",
1452
1500
                           access="readwrite")
1453
1501
    def ApprovedByDefault_dbus_property(self, value=None):
1454
1502
        if value is None:       # get
1456
1504
        self.approved_by_default = bool(value)
1457
1505
    
1458
1506
    # ApprovalDelay - property
1459
 
    @dbus_service_property(_interface, signature="t",
 
1507
    @dbus_service_property(_interface,
 
1508
                           signature="t",
1460
1509
                           access="readwrite")
1461
1510
    def ApprovalDelay_dbus_property(self, value=None):
1462
1511
        if value is None:       # get
1465
1514
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1466
1515
    
1467
1516
    # ApprovalDuration - property
1468
 
    @dbus_service_property(_interface, signature="t",
 
1517
    @dbus_service_property(_interface,
 
1518
                           signature="t",
1469
1519
                           access="readwrite")
1470
1520
    def ApprovalDuration_dbus_property(self, value=None):
1471
1521
        if value is None:       # get
1484
1534
        return dbus.String(self.fingerprint)
1485
1535
    
1486
1536
    # Host - property
1487
 
    @dbus_service_property(_interface, signature="s",
 
1537
    @dbus_service_property(_interface,
 
1538
                           signature="s",
1488
1539
                           access="readwrite")
1489
1540
    def Host_dbus_property(self, value=None):
1490
1541
        if value is None:       # get
1491
1542
            return dbus.String(self.host)
1492
 
        self.host = unicode(value)
 
1543
        self.host = str(value)
1493
1544
    
1494
1545
    # Created - property
1495
1546
    @dbus_service_property(_interface, signature="s", access="read")
1502
1553
        return datetime_to_dbus(self.last_enabled)
1503
1554
    
1504
1555
    # Enabled - property
1505
 
    @dbus_service_property(_interface, signature="b",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="b",
1506
1558
                           access="readwrite")
1507
1559
    def Enabled_dbus_property(self, value=None):
1508
1560
        if value is None:       # get
1513
1565
            self.disable()
1514
1566
    
1515
1567
    # LastCheckedOK - property
1516
 
    @dbus_service_property(_interface, signature="s",
 
1568
    @dbus_service_property(_interface,
 
1569
                           signature="s",
1517
1570
                           access="readwrite")
1518
1571
    def LastCheckedOK_dbus_property(self, value=None):
1519
1572
        if value is not None:
1522
1575
        return datetime_to_dbus(self.last_checked_ok)
1523
1576
    
1524
1577
    # LastCheckerStatus - property
1525
 
    @dbus_service_property(_interface, signature="n",
1526
 
                           access="read")
 
1578
    @dbus_service_property(_interface, signature="n", access="read")
1527
1579
    def LastCheckerStatus_dbus_property(self):
1528
1580
        return dbus.Int16(self.last_checker_status)
1529
1581
    
1538
1590
        return datetime_to_dbus(self.last_approval_request)
1539
1591
    
1540
1592
    # Timeout - property
1541
 
    @dbus_service_property(_interface, signature="t",
 
1593
    @dbus_service_property(_interface,
 
1594
                           signature="t",
1542
1595
                           access="readwrite")
1543
1596
    def Timeout_dbus_property(self, value=None):
1544
1597
        if value is None:       # get
1557
1610
                    is None):
1558
1611
                    return
1559
1612
                gobject.source_remove(self.disable_initiator_tag)
1560
 
                self.disable_initiator_tag = (
1561
 
                    gobject.timeout_add(
1562
 
                        int((self.expires - now).total_seconds()
1563
 
                            * 1000), self.disable))
 
1613
                self.disable_initiator_tag = gobject.timeout_add(
 
1614
                    int((self.expires - now).total_seconds() * 1000),
 
1615
                    self.disable)
1564
1616
    
1565
1617
    # ExtendedTimeout - property
1566
 
    @dbus_service_property(_interface, signature="t",
 
1618
    @dbus_service_property(_interface,
 
1619
                           signature="t",
1567
1620
                           access="readwrite")
1568
1621
    def ExtendedTimeout_dbus_property(self, value=None):
1569
1622
        if value is None:       # get
1572
1625
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1573
1626
    
1574
1627
    # Interval - property
1575
 
    @dbus_service_property(_interface, signature="t",
 
1628
    @dbus_service_property(_interface,
 
1629
                           signature="t",
1576
1630
                           access="readwrite")
1577
1631
    def Interval_dbus_property(self, value=None):
1578
1632
        if value is None:       # get
1583
1637
        if self.enabled:
1584
1638
            # Reschedule checker run
1585
1639
            gobject.source_remove(self.checker_initiator_tag)
1586
 
            self.checker_initiator_tag = (gobject.timeout_add
1587
 
                                          (value, self.start_checker))
1588
 
            self.start_checker()    # Start one now, too
 
1640
            self.checker_initiator_tag = gobject.timeout_add(
 
1641
                value, self.start_checker)
 
1642
            self.start_checker() # Start one now, too
1589
1643
    
1590
1644
    # Checker - property
1591
 
    @dbus_service_property(_interface, signature="s",
 
1645
    @dbus_service_property(_interface,
 
1646
                           signature="s",
1592
1647
                           access="readwrite")
1593
1648
    def Checker_dbus_property(self, value=None):
1594
1649
        if value is None:       # get
1595
1650
            return dbus.String(self.checker_command)
1596
 
        self.checker_command = unicode(value)
 
1651
        self.checker_command = str(value)
1597
1652
    
1598
1653
    # CheckerRunning - property
1599
 
    @dbus_service_property(_interface, signature="b",
 
1654
    @dbus_service_property(_interface,
 
1655
                           signature="b",
1600
1656
                           access="readwrite")
1601
1657
    def CheckerRunning_dbus_property(self, value=None):
1602
1658
        if value is None:       # get
1612
1668
        return self.dbus_object_path # is already a dbus.ObjectPath
1613
1669
    
1614
1670
    # Secret = property
1615
 
    @dbus_service_property(_interface, signature="ay",
1616
 
                           access="write", byte_arrays=True)
 
1671
    @dbus_service_property(_interface,
 
1672
                           signature="ay",
 
1673
                           access="write",
 
1674
                           byte_arrays=True)
1617
1675
    def Secret_dbus_property(self, value):
1618
 
        self.secret = str(value)
 
1676
        self.secret = bytes(value)
1619
1677
    
1620
1678
    del _interface
1621
1679
 
1625
1683
        self._pipe = child_pipe
1626
1684
        self._pipe.send(('init', fpr, address))
1627
1685
        if not self._pipe.recv():
1628
 
            raise KeyError()
 
1686
            raise KeyError(fpr)
1629
1687
    
1630
1688
    def __getattribute__(self, name):
1631
1689
        if name == '_pipe':
1635
1693
        if data[0] == 'data':
1636
1694
            return data[1]
1637
1695
        if data[0] == 'function':
 
1696
            
1638
1697
            def func(*args, **kwargs):
1639
1698
                self._pipe.send(('funcall', name, args, kwargs))
1640
1699
                return self._pipe.recv()[1]
 
1700
            
1641
1701
            return func
1642
1702
    
1643
1703
    def __setattr__(self, name, value):
1655
1715
    def handle(self):
1656
1716
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1657
1717
            logger.info("TCP connection from: %s",
1658
 
                        unicode(self.client_address))
 
1718
                        str(self.client_address))
1659
1719
            logger.debug("Pipe FD: %d",
1660
1720
                         self.server.child_pipe.fileno())
1661
1721
            
1662
 
            session = (gnutls.connection
1663
 
                       .ClientSession(self.request,
1664
 
                                      gnutls.connection
1665
 
                                      .X509Credentials()))
 
1722
            session = gnutls.connection.ClientSession(
 
1723
                self.request, gnutls.connection .X509Credentials())
1666
1724
            
1667
1725
            # Note: gnutls.connection.X509Credentials is really a
1668
1726
            # generic GnuTLS certificate credentials object so long as
1677
1735
            priority = self.server.gnutls_priority
1678
1736
            if priority is None:
1679
1737
                priority = "NORMAL"
1680
 
            (gnutls.library.functions
1681
 
             .gnutls_priority_set_direct(session._c_object,
1682
 
                                         priority, None))
 
1738
            gnutls.library.functions.gnutls_priority_set_direct(
 
1739
                session._c_object, priority, None)
1683
1740
            
1684
1741
            # Start communication using the Mandos protocol
1685
1742
            # Get protocol number
1705
1762
            approval_required = False
1706
1763
            try:
1707
1764
                try:
1708
 
                    fpr = self.fingerprint(self.peer_certificate
1709
 
                                           (session))
 
1765
                    fpr = self.fingerprint(
 
1766
                        self.peer_certificate(session))
1710
1767
                except (TypeError,
1711
1768
                        gnutls.errors.GNUTLSError) as error:
1712
1769
                    logger.warning("Bad certificate: %s", error)
1727
1784
                while True:
1728
1785
                    if not client.enabled:
1729
1786
                        logger.info("Client %s is disabled",
1730
 
                                       client.name)
 
1787
                                    client.name)
1731
1788
                        if self.server.use_dbus:
1732
1789
                            # Emit D-Bus signal
1733
1790
                            client.Rejected("Disabled")
1780
1837
                        logger.warning("gnutls send failed",
1781
1838
                                       exc_info=error)
1782
1839
                        return
1783
 
                    logger.debug("Sent: %d, remaining: %d",
1784
 
                                 sent, len(client.secret)
1785
 
                                 - (sent_size + sent))
 
1840
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1841
                                 len(client.secret) - (sent_size
 
1842
                                                       + sent))
1786
1843
                    sent_size += sent
1787
1844
                
1788
1845
                logger.info("Sending secret to %s", client.name)
1805
1862
    def peer_certificate(session):
1806
1863
        "Return the peer's OpenPGP certificate as a bytestring"
1807
1864
        # If not an OpenPGP certificate...
1808
 
        if (gnutls.library.functions
1809
 
            .gnutls_certificate_type_get(session._c_object)
 
1865
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1866
                session._c_object)
1810
1867
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1811
1868
            # ...do the normal thing
1812
1869
            return session.peer_certificate
1826
1883
    def fingerprint(openpgp):
1827
1884
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1828
1885
        # New GnuTLS "datum" with the OpenPGP public key
1829
 
        datum = (gnutls.library.types
1830
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1831
 
                                             ctypes.POINTER
1832
 
                                             (ctypes.c_ubyte)),
1833
 
                                 ctypes.c_uint(len(openpgp))))
 
1886
        datum = gnutls.library.types.gnutls_datum_t(
 
1887
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1888
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1889
            ctypes.c_uint(len(openpgp)))
1834
1890
        # New empty GnuTLS certificate
1835
1891
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1836
 
        (gnutls.library.functions
1837
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1892
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1893
            ctypes.byref(crt))
1838
1894
        # Import the OpenPGP public key into the certificate
1839
 
        (gnutls.library.functions
1840
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1841
 
                                    gnutls.library.constants
1842
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1895
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1896
            crt, ctypes.byref(datum),
 
1897
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1843
1898
        # Verify the self signature in the key
1844
1899
        crtverify = ctypes.c_uint()
1845
 
        (gnutls.library.functions
1846
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1847
 
                                         ctypes.byref(crtverify)))
 
1900
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1901
            crt, 0, ctypes.byref(crtverify))
1848
1902
        if crtverify.value != 0:
1849
1903
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1850
 
            raise (gnutls.errors.CertificateSecurityError
1851
 
                   ("Verify failed"))
 
1904
            raise gnutls.errors.CertificateSecurityError(
 
1905
                "Verify failed")
1852
1906
        # New buffer for the fingerprint
1853
1907
        buf = ctypes.create_string_buffer(20)
1854
1908
        buf_len = ctypes.c_size_t()
1855
1909
        # Get the fingerprint from the certificate into the buffer
1856
 
        (gnutls.library.functions
1857
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1858
 
                                             ctypes.byref(buf_len)))
 
1910
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1911
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1859
1912
        # Deinit the certificate
1860
1913
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
1914
        # Convert the buffer to a Python bytestring
1867
1920
 
1868
1921
class MultiprocessingMixIn(object):
1869
1922
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1923
    
1870
1924
    def sub_process_main(self, request, address):
1871
1925
        try:
1872
1926
            self.finish_request(request, address)
1884
1938
 
1885
1939
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1886
1940
    """ adds a pipe to the MixIn """
 
1941
    
1887
1942
    def process_request(self, request, client_address):
1888
1943
        """Overrides and wraps the original process_request().
1889
1944
        
1910
1965
        interface:      None or a network interface name (string)
1911
1966
        use_ipv6:       Boolean; to use IPv6 or not
1912
1967
    """
 
1968
    
1913
1969
    def __init__(self, server_address, RequestHandlerClass,
1914
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1970
                 interface=None,
 
1971
                 use_ipv6=True,
 
1972
                 socketfd=None):
1915
1973
        """If socketfd is set, use that file descriptor instead of
1916
1974
        creating a new one with socket.socket().
1917
1975
        """
1958
2016
                             self.interface)
1959
2017
            else:
1960
2018
                try:
1961
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1962
 
                                           SO_BINDTODEVICE,
1963
 
                                           str(self.interface + '\0'))
 
2019
                    self.socket.setsockopt(
 
2020
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2021
                        (self.interface + "\0").encode("utf-8"))
1964
2022
                except socket.error as error:
1965
2023
                    if error.errno == errno.EPERM:
1966
2024
                        logger.error("No permission to bind to"
1984
2042
                self.server_address = (any_address,
1985
2043
                                       self.server_address[1])
1986
2044
            elif not self.server_address[1]:
1987
 
                self.server_address = (self.server_address[0],
1988
 
                                       0)
 
2045
                self.server_address = (self.server_address[0], 0)
1989
2046
#                 if self.interface:
1990
2047
#                     self.server_address = (self.server_address[0],
1991
2048
#                                            0, # port
2005
2062
    
2006
2063
    Assumes a gobject.MainLoop event loop.
2007
2064
    """
 
2065
    
2008
2066
    def __init__(self, server_address, RequestHandlerClass,
2009
 
                 interface=None, use_ipv6=True, clients=None,
2010
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2067
                 interface=None,
 
2068
                 use_ipv6=True,
 
2069
                 clients=None,
 
2070
                 gnutls_priority=None,
 
2071
                 use_dbus=True,
 
2072
                 socketfd=None):
2011
2073
        self.enabled = False
2012
2074
        self.clients = clients
2013
2075
        if self.clients is None:
2019
2081
                                interface = interface,
2020
2082
                                use_ipv6 = use_ipv6,
2021
2083
                                socketfd = socketfd)
 
2084
    
2022
2085
    def server_activate(self):
2023
2086
        if self.enabled:
2024
2087
            return socketserver.TCPServer.server_activate(self)
2028
2091
    
2029
2092
    def add_pipe(self, parent_pipe, proc):
2030
2093
        # Call "handle_ipc" for both data and EOF events
2031
 
        gobject.io_add_watch(parent_pipe.fileno(),
2032
 
                             gobject.IO_IN | gobject.IO_HUP,
2033
 
                             functools.partial(self.handle_ipc,
2034
 
                                               parent_pipe =
2035
 
                                               parent_pipe,
2036
 
                                               proc = proc))
 
2094
        gobject.io_add_watch(
 
2095
            parent_pipe.fileno(),
 
2096
            gobject.IO_IN | gobject.IO_HUP,
 
2097
            functools.partial(self.handle_ipc,
 
2098
                              parent_pipe = parent_pipe,
 
2099
                              proc = proc))
2037
2100
    
2038
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2039
 
                   proc = None, client_object=None):
 
2101
    def handle_ipc(self, source, condition,
 
2102
                   parent_pipe=None,
 
2103
                   proc = None,
 
2104
                   client_object=None):
2040
2105
        # error, or the other end of multiprocessing.Pipe has closed
2041
2106
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2042
2107
            # Wait for other process to exit
2065
2130
                parent_pipe.send(False)
2066
2131
                return False
2067
2132
            
2068
 
            gobject.io_add_watch(parent_pipe.fileno(),
2069
 
                                 gobject.IO_IN | gobject.IO_HUP,
2070
 
                                 functools.partial(self.handle_ipc,
2071
 
                                                   parent_pipe =
2072
 
                                                   parent_pipe,
2073
 
                                                   proc = proc,
2074
 
                                                   client_object =
2075
 
                                                   client))
 
2133
            gobject.io_add_watch(
 
2134
                parent_pipe.fileno(),
 
2135
                gobject.IO_IN | gobject.IO_HUP,
 
2136
                functools.partial(self.handle_ipc,
 
2137
                                  parent_pipe = parent_pipe,
 
2138
                                  proc = proc,
 
2139
                                  client_object = client))
2076
2140
            parent_pipe.send(True)
2077
2141
            # remove the old hook in favor of the new above hook on
2078
2142
            # same fileno
2084
2148
            
2085
2149
            parent_pipe.send(('data', getattr(client_object,
2086
2150
                                              funcname)(*args,
2087
 
                                                         **kwargs)))
 
2151
                                                        **kwargs)))
2088
2152
        
2089
2153
        if command == 'getattr':
2090
2154
            attrname = request[1]
2091
 
            if callable(client_object.__getattribute__(attrname)):
2092
 
                parent_pipe.send(('function',))
 
2155
            if isinstance(client_object.__getattribute__(attrname),
 
2156
                          collections.Callable):
 
2157
                parent_pipe.send(('function', ))
2093
2158
            else:
2094
 
                parent_pipe.send(('data', client_object
2095
 
                                  .__getattribute__(attrname)))
 
2159
                parent_pipe.send((
 
2160
                    'data', client_object.__getattribute__(attrname)))
2096
2161
        
2097
2162
        if command == 'setattr':
2098
2163
            attrname = request[1]
2129
2194
    # avoid excessive use of external libraries.
2130
2195
    
2131
2196
    # New type for defining tokens, syntax, and semantics all-in-one
2132
 
    Token = collections.namedtuple("Token",
2133
 
                                   ("regexp", # To match token; if
2134
 
                                              # "value" is not None,
2135
 
                                              # must have a "group"
2136
 
                                              # containing digits
2137
 
                                    "value",  # datetime.timedelta or
2138
 
                                              # None
2139
 
                                    "followers")) # Tokens valid after
2140
 
                                                  # this token
 
2197
    Token = collections.namedtuple("Token", (
 
2198
        "regexp",  # To match token; if "value" is not None, must have
 
2199
                   # a "group" containing digits
 
2200
        "value",   # datetime.timedelta or None
 
2201
        "followers"))           # Tokens valid after this token
2141
2202
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2142
2203
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2143
2204
    token_end = Token(re.compile(r"$"), None, frozenset())
2144
2205
    token_second = Token(re.compile(r"(\d+)S"),
2145
2206
                         datetime.timedelta(seconds=1),
2146
 
                         frozenset((token_end,)))
 
2207
                         frozenset((token_end, )))
2147
2208
    token_minute = Token(re.compile(r"(\d+)M"),
2148
2209
                         datetime.timedelta(minutes=1),
2149
2210
                         frozenset((token_second, token_end)))
2165
2226
                       frozenset((token_month, token_end)))
2166
2227
    token_week = Token(re.compile(r"(\d+)W"),
2167
2228
                       datetime.timedelta(weeks=1),
2168
 
                       frozenset((token_end,)))
 
2229
                       frozenset((token_end, )))
2169
2230
    token_duration = Token(re.compile(r"P"), None,
2170
2231
                           frozenset((token_year, token_month,
2171
2232
                                      token_day, token_time,
2173
2234
    # Define starting values
2174
2235
    value = datetime.timedelta() # Value so far
2175
2236
    found_token = None
2176
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2237
    followers = frozenset((token_duration, )) # Following valid tokens
2177
2238
    s = duration                # String left to parse
2178
2239
    # Loop until end token is found
2179
2240
    while found_token is not token_end:
2196
2257
                break
2197
2258
        else:
2198
2259
            # No currently valid tokens were found
2199
 
            raise ValueError("Invalid RFC 3339 duration")
 
2260
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2261
                             .format(duration))
2200
2262
    # End token found
2201
2263
    return value
2202
2264
 
2226
2288
    timevalue = datetime.timedelta(0)
2227
2289
    for s in interval.split():
2228
2290
        try:
2229
 
            suffix = unicode(s[-1])
 
2291
            suffix = s[-1]
2230
2292
            value = int(s[:-1])
2231
2293
            if suffix == "d":
2232
2294
                delta = datetime.timedelta(value)
2239
2301
            elif suffix == "w":
2240
2302
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2241
2303
            else:
2242
 
                raise ValueError("Unknown suffix {!r}"
2243
 
                                 .format(suffix))
 
2304
                raise ValueError("Unknown suffix {!r}".format(suffix))
2244
2305
        except IndexError as e:
2245
2306
            raise ValueError(*(e.args))
2246
2307
        timevalue += delta
2262
2323
        # Close all standard open file descriptors
2263
2324
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2264
2325
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2265
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2326
            raise OSError(errno.ENODEV,
 
2327
                          "{} not a character device"
2266
2328
                          .format(os.devnull))
2267
2329
        os.dup2(null, sys.stdin.fileno())
2268
2330
        os.dup2(null, sys.stdout.fileno())
2334
2396
                        "port": "",
2335
2397
                        "debug": "False",
2336
2398
                        "priority":
2337
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2399
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2400
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2338
2401
                        "servicename": "Mandos",
2339
2402
                        "use_dbus": "True",
2340
2403
                        "use_ipv6": "True",
2344
2407
                        "statedir": "/var/lib/mandos",
2345
2408
                        "foreground": "False",
2346
2409
                        "zeroconf": "True",
2347
 
                        }
 
2410
                    }
2348
2411
    
2349
2412
    # Parse config file for server-global settings
2350
2413
    server_config = configparser.SafeConfigParser(server_defaults)
2351
2414
    del server_defaults
2352
 
    server_config.read(os.path.join(options.configdir,
2353
 
                                    "mandos.conf"))
 
2415
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2354
2416
    # Convert the SafeConfigParser object to a dict
2355
2417
    server_settings = server_config.defaults()
2356
2418
    # Use the appropriate methods on the non-string config options
2374
2436
    # Override the settings from the config file with command line
2375
2437
    # options, if set.
2376
2438
    for option in ("interface", "address", "port", "debug",
2377
 
                   "priority", "servicename", "configdir",
2378
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2379
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2439
                   "priority", "servicename", "configdir", "use_dbus",
 
2440
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2441
                   "socket", "foreground", "zeroconf"):
2380
2442
        value = getattr(options, option)
2381
2443
        if value is not None:
2382
2444
            server_settings[option] = value
2383
2445
    del options
2384
2446
    # Force all strings to be unicode
2385
2447
    for option in server_settings.keys():
2386
 
        if type(server_settings[option]) is str:
2387
 
            server_settings[option] = unicode(server_settings[option])
 
2448
        if isinstance(server_settings[option], bytes):
 
2449
            server_settings[option] = (server_settings[option]
 
2450
                                       .decode("utf-8"))
2388
2451
    # Force all boolean options to be boolean
2389
2452
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2390
2453
                   "foreground", "zeroconf"):
2396
2459
    
2397
2460
    ##################################################################
2398
2461
    
2399
 
    if (not server_settings["zeroconf"] and
2400
 
        not (server_settings["port"]
2401
 
             or server_settings["socket"] != "")):
2402
 
            parser.error("Needs port or socket to work without"
2403
 
                         " Zeroconf")
 
2462
    if (not server_settings["zeroconf"]
 
2463
        and not (server_settings["port"]
 
2464
                 or server_settings["socket"] != "")):
 
2465
        parser.error("Needs port or socket to work without Zeroconf")
2404
2466
    
2405
2467
    # For convenience
2406
2468
    debug = server_settings["debug"]
2422
2484
            initlogger(debug, level)
2423
2485
    
2424
2486
    if server_settings["servicename"] != "Mandos":
2425
 
        syslogger.setFormatter(logging.Formatter
2426
 
                               ('Mandos ({}) [%(process)d]:'
2427
 
                                ' %(levelname)s: %(message)s'
2428
 
                                .format(server_settings
2429
 
                                        ["servicename"])))
 
2487
        syslogger.setFormatter(
 
2488
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2489
                              ' %(levelname)s: %(message)s'.format(
 
2490
                                  server_settings["servicename"])))
2430
2491
    
2431
2492
    # Parse config file with clients
2432
2493
    client_config = configparser.SafeConfigParser(Client
2440
2501
    socketfd = None
2441
2502
    if server_settings["socket"] != "":
2442
2503
        socketfd = server_settings["socket"]
2443
 
    tcp_server = MandosServer((server_settings["address"],
2444
 
                               server_settings["port"]),
2445
 
                              ClientHandler,
2446
 
                              interface=(server_settings["interface"]
2447
 
                                         or None),
2448
 
                              use_ipv6=use_ipv6,
2449
 
                              gnutls_priority=
2450
 
                              server_settings["priority"],
2451
 
                              use_dbus=use_dbus,
2452
 
                              socketfd=socketfd)
 
2504
    tcp_server = MandosServer(
 
2505
        (server_settings["address"], server_settings["port"]),
 
2506
        ClientHandler,
 
2507
        interface=(server_settings["interface"] or None),
 
2508
        use_ipv6=use_ipv6,
 
2509
        gnutls_priority=server_settings["priority"],
 
2510
        use_dbus=use_dbus,
 
2511
        socketfd=socketfd)
2453
2512
    if not foreground:
2454
2513
        pidfilename = "/run/mandos.pid"
2455
2514
        if not os.path.isdir("/run/."):
2456
2515
            pidfilename = "/var/run/mandos.pid"
2457
2516
        pidfile = None
2458
2517
        try:
2459
 
            pidfile = open(pidfilename, "w")
 
2518
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2460
2519
        except IOError as e:
2461
2520
            logger.error("Could not open file %r", pidfilename,
2462
2521
                         exc_info=e)
2489
2548
        def debug_gnutls(level, string):
2490
2549
            logger.debug("GnuTLS: %s", string[:-1])
2491
2550
        
2492
 
        (gnutls.library.functions
2493
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2551
        gnutls.library.functions.gnutls_global_set_log_function(
 
2552
            debug_gnutls)
2494
2553
        
2495
2554
        # Redirect stdin so all checkers get /dev/null
2496
2555
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2516
2575
    if use_dbus:
2517
2576
        try:
2518
2577
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2519
 
                                            bus, do_not_queue=True)
2520
 
            old_bus_name = (dbus.service.BusName
2521
 
                            ("se.bsnet.fukt.Mandos", bus,
2522
 
                             do_not_queue=True))
2523
 
        except dbus.exceptions.NameExistsException as e:
 
2578
                                            bus,
 
2579
                                            do_not_queue=True)
 
2580
            old_bus_name = dbus.service.BusName(
 
2581
                "se.bsnet.fukt.Mandos", bus,
 
2582
                do_not_queue=True)
 
2583
        except dbus.exceptions.DBusException as e:
2524
2584
            logger.error("Disabling D-Bus:", exc_info=e)
2525
2585
            use_dbus = False
2526
2586
            server_settings["use_dbus"] = False
2527
2587
            tcp_server.use_dbus = False
2528
2588
    if zeroconf:
2529
2589
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2530
 
        service = AvahiServiceToSyslog(name =
2531
 
                                       server_settings["servicename"],
2532
 
                                       servicetype = "_mandos._tcp",
2533
 
                                       protocol = protocol, bus = bus)
 
2590
        service = AvahiServiceToSyslog(
 
2591
            name = server_settings["servicename"],
 
2592
            servicetype = "_mandos._tcp",
 
2593
            protocol = protocol,
 
2594
            bus = bus)
2534
2595
        if server_settings["interface"]:
2535
 
            service.interface = (if_nametoindex
2536
 
                                 (str(server_settings["interface"])))
 
2596
            service.interface = if_nametoindex(
 
2597
                server_settings["interface"].encode("utf-8"))
2537
2598
    
2538
2599
    global multiprocessing_manager
2539
2600
    multiprocessing_manager = multiprocessing.Manager()
2558
2619
    if server_settings["restore"]:
2559
2620
        try:
2560
2621
            with open(stored_state_path, "rb") as stored_state:
2561
 
                clients_data, old_client_settings = (pickle.load
2562
 
                                                     (stored_state))
 
2622
                clients_data, old_client_settings = pickle.load(
 
2623
                    stored_state)
2563
2624
            os.remove(stored_state_path)
2564
2625
        except IOError as e:
2565
2626
            if e.errno == errno.ENOENT:
2566
 
                logger.warning("Could not load persistent state: {}"
2567
 
                                .format(os.strerror(e.errno)))
 
2627
                logger.warning("Could not load persistent state:"
 
2628
                               " {}".format(os.strerror(e.errno)))
2568
2629
            else:
2569
2630
                logger.critical("Could not load persistent state:",
2570
2631
                                exc_info=e)
2571
2632
                raise
2572
2633
        except EOFError as e:
2573
2634
            logger.warning("Could not load persistent state: "
2574
 
                           "EOFError:", exc_info=e)
 
2635
                           "EOFError:",
 
2636
                           exc_info=e)
2575
2637
    
2576
2638
    with PGPEngine() as pgp:
2577
2639
        for client_name, client in clients_data.items():
2589
2651
                    # For each value in new config, check if it
2590
2652
                    # differs from the old config value (Except for
2591
2653
                    # the "secret" attribute)
2592
 
                    if (name != "secret" and
2593
 
                        value != old_client_settings[client_name]
2594
 
                        [name]):
 
2654
                    if (name != "secret"
 
2655
                        and (value !=
 
2656
                             old_client_settings[client_name][name])):
2595
2657
                        client[name] = value
2596
2658
                except KeyError:
2597
2659
                    pass
2598
2660
            
2599
2661
            # Clients who has passed its expire date can still be
2600
 
            # enabled if its last checker was successful.  Clients
 
2662
            # enabled if its last checker was successful.  A Client
2601
2663
            # whose checker succeeded before we stored its state is
2602
2664
            # assumed to have successfully run all checkers during
2603
2665
            # downtime.
2606
2668
                    if not client["last_checked_ok"]:
2607
2669
                        logger.warning(
2608
2670
                            "disabling client {} - Client never "
2609
 
                            "performed a successful checker"
2610
 
                            .format(client_name))
 
2671
                            "performed a successful checker".format(
 
2672
                                client_name))
2611
2673
                        client["enabled"] = False
2612
2674
                    elif client["last_checker_status"] != 0:
2613
2675
                        logger.warning(
2614
2676
                            "disabling client {} - Client last"
2615
 
                            " checker failed with error code {}"
2616
 
                            .format(client_name,
2617
 
                                    client["last_checker_status"]))
 
2677
                            " checker failed with error code"
 
2678
                            " {}".format(
 
2679
                                client_name,
 
2680
                                client["last_checker_status"]))
2618
2681
                        client["enabled"] = False
2619
2682
                    else:
2620
 
                        client["expires"] = (datetime.datetime
2621
 
                                             .utcnow()
2622
 
                                             + client["timeout"])
 
2683
                        client["expires"] = (
 
2684
                            datetime.datetime.utcnow()
 
2685
                            + client["timeout"])
2623
2686
                        logger.debug("Last checker succeeded,"
2624
 
                                     " keeping {} enabled"
2625
 
                                     .format(client_name))
 
2687
                                     " keeping {} enabled".format(
 
2688
                                         client_name))
2626
2689
            try:
2627
 
                client["secret"] = (
2628
 
                    pgp.decrypt(client["encrypted_secret"],
2629
 
                                client_settings[client_name]
2630
 
                                ["secret"]))
 
2690
                client["secret"] = pgp.decrypt(
 
2691
                    client["encrypted_secret"],
 
2692
                    client_settings[client_name]["secret"])
2631
2693
            except PGPError:
2632
2694
                # If decryption fails, we use secret from new settings
2633
 
                logger.debug("Failed to decrypt {} old secret"
2634
 
                             .format(client_name))
2635
 
                client["secret"] = (
2636
 
                    client_settings[client_name]["secret"])
 
2695
                logger.debug("Failed to decrypt {} old secret".format(
 
2696
                    client_name))
 
2697
                client["secret"] = (client_settings[client_name]
 
2698
                                    ["secret"])
2637
2699
    
2638
2700
    # Add/remove clients based on new changes made to config
2639
2701
    for client_name in (set(old_client_settings)
2646
2708
    # Create all client objects
2647
2709
    for client_name, client in clients_data.items():
2648
2710
        tcp_server.clients[client_name] = client_class(
2649
 
            name = client_name, settings = client,
 
2711
            name = client_name,
 
2712
            settings = client,
2650
2713
            server_settings = server_settings)
2651
2714
    
2652
2715
    if not tcp_server.clients:
2654
2717
    
2655
2718
    if not foreground:
2656
2719
        if pidfile is not None:
 
2720
            pid = os.getpid()
2657
2721
            try:
2658
2722
                with pidfile:
2659
 
                    pid = os.getpid()
2660
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2723
                    print(pid, file=pidfile)
2661
2724
            except IOError:
2662
2725
                logger.error("Could not write to file %r with PID %d",
2663
2726
                             pidfilename, pid)
2668
2731
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2669
2732
    
2670
2733
    if use_dbus:
2671
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2672
 
                                        "se.bsnet.fukt.Mandos"})
 
2734
        
 
2735
        @alternate_dbus_interfaces(
 
2736
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2673
2737
        class MandosDBusService(DBusObjectWithProperties):
2674
2738
            """A D-Bus proxy object"""
 
2739
            
2675
2740
            def __init__(self):
2676
2741
                dbus.service.Object.__init__(self, bus, "/")
 
2742
            
2677
2743
            _interface = "se.recompile.Mandos"
2678
2744
            
2679
2745
            @dbus_interface_annotations(_interface)
2680
2746
            def _foo(self):
2681
 
                return { "org.freedesktop.DBus.Property"
2682
 
                         ".EmitsChangedSignal":
2683
 
                             "false"}
 
2747
                return {
 
2748
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2749
                    "false" }
2684
2750
            
2685
2751
            @dbus.service.signal(_interface, signature="o")
2686
2752
            def ClientAdded(self, objpath):
2700
2766
            @dbus.service.method(_interface, out_signature="ao")
2701
2767
            def GetAllClients(self):
2702
2768
                "D-Bus method"
2703
 
                return dbus.Array(c.dbus_object_path
2704
 
                                  for c in
 
2769
                return dbus.Array(c.dbus_object_path for c in
2705
2770
                                  tcp_server.clients.itervalues())
2706
2771
            
2707
2772
            @dbus.service.method(_interface,
2709
2774
            def GetAllClientsWithProperties(self):
2710
2775
                "D-Bus method"
2711
2776
                return dbus.Dictionary(
2712
 
                    ((c.dbus_object_path, c.GetAll(""))
2713
 
                     for c in tcp_server.clients.itervalues()),
 
2777
                    { c.dbus_object_path: c.GetAll("")
 
2778
                      for c in tcp_server.clients.itervalues() },
2714
2779
                    signature="oa{sv}")
2715
2780
            
2716
2781
            @dbus.service.method(_interface, in_signature="o")
2756
2821
                # + secret.
2757
2822
                exclude = { "bus", "changedstate", "secret",
2758
2823
                            "checker", "server_settings" }
2759
 
                for name, typ in (inspect.getmembers
2760
 
                                  (dbus.service.Object)):
 
2824
                for name, typ in inspect.getmembers(dbus.service
 
2825
                                                    .Object):
2761
2826
                    exclude.add(name)
2762
2827
                
2763
2828
                client_dict["encrypted_secret"] = (client
2770
2835
                del client_settings[client.name]["secret"]
2771
2836
        
2772
2837
        try:
2773
 
            with (tempfile.NamedTemporaryFile
2774
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2775
 
                   dir=os.path.dirname(stored_state_path),
2776
 
                   delete=False)) as stored_state:
 
2838
            with tempfile.NamedTemporaryFile(
 
2839
                    mode='wb',
 
2840
                    suffix=".pickle",
 
2841
                    prefix='clients-',
 
2842
                    dir=os.path.dirname(stored_state_path),
 
2843
                    delete=False) as stored_state:
2777
2844
                pickle.dump((clients, client_settings), stored_state)
2778
 
                tempname=stored_state.name
 
2845
                tempname = stored_state.name
2779
2846
            os.rename(tempname, stored_state_path)
2780
2847
        except (IOError, OSError) as e:
2781
2848
            if not debug:
2800
2867
            client.disable(quiet=True)
2801
2868
            if use_dbus:
2802
2869
                # Emit D-Bus signal
2803
 
                mandos_dbus_service.ClientRemoved(client
2804
 
                                                  .dbus_object_path,
2805
 
                                                  client.name)
 
2870
                mandos_dbus_service.ClientRemoved(
 
2871
                    client.dbus_object_path, client.name)
2806
2872
        client_settings.clear()
2807
2873
    
2808
2874
    atexit.register(cleanup)
2861
2927
    # Must run before the D-Bus bus name gets deregistered
2862
2928
    cleanup()
2863
2929
 
 
2930
 
2864
2931
if __name__ == '__main__':
2865
2932
    main()