/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 at recompile
  • Date: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
79
75
import ctypes.util
80
76
import xml.dom.minidom
81
77
import inspect
 
78
import GnuPGInterface
82
79
 
83
80
try:
84
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.6.8"
 
88
version = "1.5.0"
92
89
stored_state_file = "clients.pickle"
93
90
 
94
91
logger = logging.getLogger()
95
 
syslogger = None
 
92
syslogger = (logging.handlers.SysLogHandler
 
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
94
              address = str("/dev/log")))
96
95
 
97
96
try:
98
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
104
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
104
        with contextlib.closing(socket.socket()) as s:
106
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(b"16s16x", interface))
108
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
109
110
        return interface_index
110
111
 
111
112
 
112
113
def initlogger(debug, level=logging.WARNING):
113
114
    """init logger and add loglevel"""
114
115
    
115
 
    global syslogger
116
 
    syslogger = (logging.handlers.SysLogHandler
117
 
                 (facility =
118
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
119
 
                  address = "/dev/log"))
120
116
    syslogger.setFormatter(logging.Formatter
121
117
                           ('Mandos [%(process)d]: %(levelname)s:'
122
118
                            ' %(message)s'))
140
136
class PGPEngine(object):
141
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
142
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
143
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
 
        self.gnupgargs = ['--batch',
145
 
                          '--home', self.tempdir,
146
 
                          '--force-mdc',
147
 
                          '--quiet',
148
 
                          '--no-use-agent']
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
149
147
    
150
148
    def __enter__(self):
151
149
        return self
152
150
    
153
 
    def __exit__(self, exc_type, exc_value, traceback):
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
154
152
        self._cleanup()
155
153
        return False
156
154
    
173
171
    def password_encode(self, password):
174
172
        # Passphrase can not be empty and can not contain newlines or
175
173
        # NUL bytes.  So we prefix it and hex encode it.
176
 
        encoded = b"mandos" + binascii.hexlify(password)
177
 
        if len(encoded) > 2048:
178
 
            # GnuPG can't handle long passwords, so encode differently
179
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
180
 
                       .replace(b"\n", b"\\n")
181
 
                       .replace(b"\0", b"\\x00"))
182
 
        return encoded
 
174
        return b"mandos" + binascii.hexlify(password)
183
175
    
184
176
    def encrypt(self, data, password):
185
 
        passphrase = self.password_encode(password)
186
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
187
 
                                         ) as passfile:
188
 
            passfile.write(passphrase)
189
 
            passfile.flush()
190
 
            proc = subprocess.Popen(['gpg', '--symmetric',
191
 
                                     '--passphrase-file',
192
 
                                     passfile.name]
193
 
                                    + self.gnupgargs,
194
 
                                    stdin = subprocess.PIPE,
195
 
                                    stdout = subprocess.PIPE,
196
 
                                    stderr = subprocess.PIPE)
197
 
            ciphertext, err = proc.communicate(input = data)
198
 
        if proc.returncode != 0:
199
 
            raise PGPError(err)
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
200
191
        return ciphertext
201
192
    
202
193
    def decrypt(self, data, password):
203
 
        passphrase = self.password_encode(password)
204
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
205
 
                                         ) as passfile:
206
 
            passfile.write(passphrase)
207
 
            passfile.flush()
208
 
            proc = subprocess.Popen(['gpg', '--decrypt',
209
 
                                     '--passphrase-file',
210
 
                                     passfile.name]
211
 
                                    + self.gnupgargs,
212
 
                                    stdin = subprocess.PIPE,
213
 
                                    stdout = subprocess.PIPE,
214
 
                                    stderr = subprocess.PIPE)
215
 
            decrypted_plaintext, err = proc.communicate(input
216
 
                                                        = data)
217
 
        if proc.returncode != 0:
218
 
            raise PGPError(err)
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
219
208
        return decrypted_plaintext
220
209
 
221
210
 
 
211
 
222
212
class AvahiError(Exception):
223
213
    def __init__(self, value, *args, **kwargs):
224
214
        self.value = value
225
 
        return super(AvahiError, self).__init__(value, *args,
226
 
                                                **kwargs)
 
215
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
216
    def __unicode__(self):
 
217
        return unicode(repr(self.value))
227
218
 
228
219
class AvahiServiceError(AvahiError):
229
220
    pass
240
231
               Used to optionally bind to the specified interface.
241
232
    name: string; Example: 'Mandos'
242
233
    type: string; Example: '_mandos._tcp'.
243
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
244
235
    port: integer; what port to announce
245
236
    TXT: list of strings; TXT record for the service
246
237
    domain: string; Domain to publish on, default to .local if empty.
252
243
    server: D-Bus Server
253
244
    bus: dbus.SystemBus()
254
245
    """
255
 
    
256
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
247
                 servicetype = None, port = None, TXT = None,
258
248
                 domain = "", host = "", max_renames = 32768,
271
261
        self.server = None
272
262
        self.bus = bus
273
263
        self.entry_group_state_changed_match = None
274
 
    
275
264
    def rename(self):
276
265
        """Derived from the Avahi example code"""
277
266
        if self.rename_count >= self.max_renames:
287
276
        try:
288
277
            self.add()
289
278
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
 
279
            logger.critical("DBusException: %s", error)
291
280
            self.cleanup()
292
281
            os._exit(1)
293
282
        self.rename_count += 1
294
 
    
295
283
    def remove(self):
296
284
        """Derived from the Avahi example code"""
297
285
        if self.entry_group_state_changed_match is not None:
299
287
            self.entry_group_state_changed_match = None
300
288
        if self.group is not None:
301
289
            self.group.Reset()
302
 
    
303
290
    def add(self):
304
291
        """Derived from the Avahi example code"""
305
292
        self.remove()
322
309
            dbus.UInt16(self.port),
323
310
            avahi.string_array_to_txt_array(self.TXT))
324
311
        self.group.Commit()
325
 
    
326
312
    def entry_group_state_changed(self, state, error):
327
313
        """Derived from the Avahi example code"""
328
314
        logger.debug("Avahi entry group state change: %i", state)
335
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
322
            logger.critical("Avahi: Error in group state changed %s",
337
323
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {!s}"
339
 
                                  .format(error))
340
 
    
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
341
326
    def cleanup(self):
342
327
        """Derived from the Avahi example code"""
343
328
        if self.group is not None:
348
333
                pass
349
334
            self.group = None
350
335
        self.remove()
351
 
    
352
336
    def server_state_changed(self, state, error=None):
353
337
        """Derived from the Avahi example code"""
354
338
        logger.debug("Avahi server state change: %i", state)
373
357
                logger.debug("Unknown state: %r", state)
374
358
            else:
375
359
                logger.debug("Unknown state: %r: %r", state, error)
376
 
    
377
360
    def activate(self):
378
361
        """Derived from the Avahi example code"""
379
362
        if self.server is None:
386
369
                                 self.server_state_changed)
387
370
        self.server_state_changed(self.server.GetState())
388
371
 
389
 
 
390
372
class AvahiServiceToSyslog(AvahiService):
391
373
    def rename(self):
392
374
        """Add the new name to the syslog messages"""
393
375
        ret = AvahiService.rename(self)
394
376
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
398
380
        return ret
399
381
 
400
 
 
 
382
def timedelta_to_milliseconds(td):
 
383
    "Convert a datetime.timedelta() to milliseconds"
 
384
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
            + (td.seconds * 1000)
 
386
            + (td.microseconds // 1000))
 
387
        
401
388
class Client(object):
402
389
    """A representation of a client host served by this server.
403
390
    
428
415
    last_checked_ok: datetime.datetime(); (UTC) or None
429
416
    last_checker_status: integer between 0 and 255 reflecting exit
430
417
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
432
419
    last_enabled: datetime.datetime(); (UTC) or None
433
420
    name:       string; from the config file, used in log messages and
434
421
                        D-Bus identifiers
435
422
    secret:     bytestring; sent verbatim (over TLS) to client
436
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
424
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
425
    extended_timeout:   extra long timeout when password has been sent
439
426
    runtime_expansions: Allowed attributes for runtime expansion.
440
427
    expires:    datetime.datetime(); time (UTC) when a client will be
441
428
                disabled, or None
442
 
    server_settings: The server_settings dict from main()
443
429
    """
444
430
    
445
431
    runtime_expansions = ("approval_delay", "approval_duration",
446
 
                          "created", "enabled", "expires",
447
 
                          "fingerprint", "host", "interval",
448
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
449
434
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
453
438
                        "checker": "fping -q -- %%(host)s",
454
439
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
457
442
                        "approved_by_default": "True",
458
443
                        "enabled": "True",
459
444
                        }
460
445
    
 
446
    def timeout_milliseconds(self):
 
447
        "Return the 'timeout' attribute in milliseconds"
 
448
        return timedelta_to_milliseconds(self.timeout)
 
449
    
 
450
    def extended_timeout_milliseconds(self):
 
451
        "Return the 'extended_timeout' attribute in milliseconds"
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
 
453
    
 
454
    def interval_milliseconds(self):
 
455
        "Return the 'interval' attribute in milliseconds"
 
456
        return timedelta_to_milliseconds(self.interval)
 
457
    
 
458
    def approval_delay_milliseconds(self):
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
460
 
461
461
    @staticmethod
462
462
    def config_parser(config):
463
463
        """Construct a new dict of client settings of this form:
488
488
                          "rb") as secfile:
489
489
                    client["secret"] = secfile.read()
490
490
            else:
491
 
                raise TypeError("No secret or secfile for section {}"
492
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
493
493
            client["timeout"] = string_to_delta(section["timeout"])
494
494
            client["extended_timeout"] = string_to_delta(
495
495
                section["extended_timeout"])
501
501
            client["checker_command"] = section["checker"]
502
502
            client["last_approval_request"] = None
503
503
            client["last_checked_ok"] = None
504
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
505
505
        
506
506
        return settings
507
 
    
508
 
    def __init__(self, settings, name = None, server_settings=None):
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
 
510
        """Note: the 'checker' key in 'config' sets the
 
511
        'checker_command' attribute and *not* the 'checker'
 
512
        attribute."""
509
513
        self.name = name
510
 
        if server_settings is None:
511
 
            server_settings = {}
512
 
        self.server_settings = server_settings
513
514
        # adding all client settings
514
 
        for setting, value in settings.items():
 
515
        for setting, value in settings.iteritems():
515
516
            setattr(self, setting, value)
516
517
        
517
518
        if self.enabled:
523
524
        else:
524
525
            self.last_enabled = None
525
526
            self.expires = None
526
 
        
 
527
       
527
528
        logger.debug("Creating client %r", self.name)
528
529
        # Uppercase and remove spaces from fingerprint for later
529
530
        # comparison purposes with return value from the fingerprint()
531
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
532
533
        self.created = settings.get("created",
533
534
                                    datetime.datetime.utcnow())
534
 
        
 
535
 
535
536
        # attributes specific for this server instance
536
537
        self.checker = None
537
538
        self.checker_initiator_tag = None
565
566
        if getattr(self, "enabled", False):
566
567
            # Already enabled
567
568
            return
 
569
        self.send_changedstate()
568
570
        self.expires = datetime.datetime.utcnow() + self.timeout
569
571
        self.enabled = True
570
572
        self.last_enabled = datetime.datetime.utcnow()
571
573
        self.init_checker()
572
 
        self.send_changedstate()
573
574
    
574
575
    def disable(self, quiet=True):
575
576
        """Disable this client."""
576
577
        if not getattr(self, "enabled", False):
577
578
            return False
578
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
579
582
            logger.info("Disabling client %s", self.name)
580
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
581
584
            gobject.source_remove(self.disable_initiator_tag)
582
585
            self.disable_initiator_tag = None
583
586
        self.expires = None
584
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
585
588
            gobject.source_remove(self.checker_initiator_tag)
586
589
            self.checker_initiator_tag = None
587
590
        self.stop_checker()
588
591
        self.enabled = False
589
 
        if not quiet:
590
 
            self.send_changedstate()
591
592
        # Do not run this again if called by a gobject.timeout_add
592
593
        return False
593
594
    
597
598
    def init_checker(self):
598
599
        # Schedule a new checker to be started an 'interval' from now,
599
600
        # and every interval from then on.
600
 
        if self.checker_initiator_tag is not None:
601
 
            gobject.source_remove(self.checker_initiator_tag)
602
601
        self.checker_initiator_tag = (gobject.timeout_add
603
 
                                      (int(self.interval
604
 
                                           .total_seconds() * 1000),
 
602
                                      (self.interval_milliseconds(),
605
603
                                       self.start_checker))
606
604
        # Schedule a disable() when 'timeout' has passed
607
 
        if self.disable_initiator_tag is not None:
608
 
            gobject.source_remove(self.disable_initiator_tag)
609
605
        self.disable_initiator_tag = (gobject.timeout_add
610
 
                                      (int(self.timeout
611
 
                                           .total_seconds() * 1000),
612
 
                                       self.disable))
 
606
                                   (self.timeout_milliseconds(),
 
607
                                    self.disable))
613
608
        # Also start a new checker *right now*.
614
609
        self.start_checker()
615
610
    
631
626
            logger.warning("Checker for %(name)s crashed?",
632
627
                           vars(self))
633
628
    
634
 
    def checked_ok(self):
635
 
        """Assert that the client has been seen, alive and well."""
636
 
        self.last_checked_ok = datetime.datetime.utcnow()
637
 
        self.last_checker_status = 0
638
 
        self.bump_timeout()
639
 
    
640
 
    def bump_timeout(self, timeout=None):
641
 
        """Bump up the timeout for this client."""
 
629
    def checked_ok(self, timeout=None):
 
630
        """Bump up the timeout for this client.
 
631
        
 
632
        This should only be called when the client has been seen,
 
633
        alive and well.
 
634
        """
642
635
        if timeout is None:
643
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
644
638
        if self.disable_initiator_tag is not None:
645
639
            gobject.source_remove(self.disable_initiator_tag)
646
 
            self.disable_initiator_tag = None
647
640
        if getattr(self, "enabled", False):
648
641
            self.disable_initiator_tag = (gobject.timeout_add
649
 
                                          (int(timeout.total_seconds()
650
 
                                               * 1000), self.disable))
 
642
                                          (timedelta_to_milliseconds
 
643
                                           (timeout), self.disable))
651
644
            self.expires = datetime.datetime.utcnow() + timeout
652
645
    
653
646
    def need_approval(self):
659
652
        If a checker already exists, leave it running and do
660
653
        nothing."""
661
654
        # The reason for not killing a running checker is that if we
662
 
        # did that, and if a checker (for some reason) started running
663
 
        # slowly and taking more than 'interval' time, then the client
664
 
        # would inevitably timeout, since no checker would get a
665
 
        # chance to run to completion.  If we instead leave running
 
655
        # did that, then if a checker (for some reason) started
 
656
        # running slowly and taking more than 'interval' time, the
 
657
        # client would inevitably timeout, since no checker would get
 
658
        # a chance to run to completion.  If we instead leave running
666
659
        # checkers alone, the checker would have to take more time
667
660
        # than 'timeout' for the client to be disabled, which is as it
668
661
        # should be.
670
663
        # If a checker exists, make sure it is not a zombie
671
664
        try:
672
665
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
673
 
        except AttributeError:
674
 
            pass
675
 
        except OSError as error:
676
 
            if error.errno != errno.ECHILD:
677
 
                raise
 
666
        except (AttributeError, OSError) as error:
 
667
            if (isinstance(error, OSError)
 
668
                and error.errno != errno.ECHILD):
 
669
                raise error
678
670
        else:
679
671
            if pid:
680
672
                logger.warning("Checker was a zombie")
683
675
                                      self.current_checker_command)
684
676
        # Start a new checker if needed
685
677
        if self.checker is None:
686
 
            # Escape attributes for the shell
687
 
            escaped_attrs = { attr:
688
 
                                  re.escape(unicode(getattr(self,
689
 
                                                            attr)))
690
 
                              for attr in self.runtime_expansions }
691
678
            try:
692
 
                command = self.checker_command % escaped_attrs
693
 
            except TypeError as error:
694
 
                logger.error('Could not format string "%s"',
695
 
                             self.checker_command, exc_info=error)
696
 
                return True # Try again later
 
679
                # In case checker_command has exactly one % operator
 
680
                command = self.checker_command % self.host
 
681
            except TypeError:
 
682
                # Escape attributes for the shell
 
683
                escaped_attrs = dict(
 
684
                    (attr,
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
 
686
                                       errors=
 
687
                                       'replace')))
 
688
                    for attr in
 
689
                    self.runtime_expansions)
 
690
                
 
691
                try:
 
692
                    command = self.checker_command % escaped_attrs
 
693
                except TypeError as error:
 
694
                    logger.error('Could not format string "%s":'
 
695
                                 ' %s', self.checker_command, error)
 
696
                    return True # Try again later
697
697
            self.current_checker_command = command
698
698
            try:
699
699
                logger.info("Starting checker %r for %s",
702
702
                # in normal mode, that is already done by daemon(),
703
703
                # and in debug mode we don't want to.  (Stdin is
704
704
                # always replaced by /dev/null.)
705
 
                # The exception is when not debugging but nevertheless
706
 
                # running in the foreground; use the previously
707
 
                # created wnull.
708
 
                popen_args = {}
709
 
                if (not self.server_settings["debug"]
710
 
                    and self.server_settings["foreground"]):
711
 
                    popen_args.update({"stdout": wnull,
712
 
                                       "stderr": wnull })
713
705
                self.checker = subprocess.Popen(command,
714
706
                                                close_fds=True,
715
 
                                                shell=True, cwd="/",
716
 
                                                **popen_args)
717
 
            except OSError as error:
718
 
                logger.error("Failed to start subprocess",
719
 
                             exc_info=error)
720
 
                return True
721
 
            self.checker_callback_tag = (gobject.child_watch_add
722
 
                                         (self.checker.pid,
723
 
                                          self.checker_callback,
724
 
                                          data=command))
725
 
            # The checker may have completed before the gobject
726
 
            # watch was added.  Check for this.
727
 
            try:
 
707
                                                shell=True, cwd="/")
 
708
                self.checker_callback_tag = (gobject.child_watch_add
 
709
                                             (self.checker.pid,
 
710
                                              self.checker_callback,
 
711
                                              data=command))
 
712
                # The checker may have completed before the gobject
 
713
                # watch was added.  Check for this.
728
714
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
715
                if pid:
 
716
                    gobject.source_remove(self.checker_callback_tag)
 
717
                    self.checker_callback(pid, status, command)
729
718
            except OSError as error:
730
 
                if error.errno == errno.ECHILD:
731
 
                    # This should never happen
732
 
                    logger.error("Child process vanished",
733
 
                                 exc_info=error)
734
 
                    return True
735
 
                raise
736
 
            if pid:
737
 
                gobject.source_remove(self.checker_callback_tag)
738
 
                self.checker_callback(pid, status, command)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
739
721
        # Re-run this periodically if run by gobject.timeout_add
740
722
        return True
741
723
    
748
730
            return
749
731
        logger.debug("Stopping checker for %(name)s", vars(self))
750
732
        try:
751
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
752
734
            #time.sleep(0.5)
753
735
            #if self.checker.poll() is None:
754
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
755
737
        except OSError as error:
756
738
            if error.errno != errno.ESRCH: # No such process
757
739
                raise
774
756
    # "Set" method, so we fail early here:
775
757
    if byte_arrays and signature != "ay":
776
758
        raise ValueError("Byte arrays not supported for non-'ay'"
777
 
                         " signature {!r}".format(signature))
 
759
                         " signature %r" % signature)
778
760
    def decorator(func):
779
761
        func._dbus_is_property = True
780
762
        func._dbus_interface = dbus_interface
788
770
    return decorator
789
771
 
790
772
 
791
 
def dbus_interface_annotations(dbus_interface):
792
 
    """Decorator for marking functions returning interface annotations
793
 
    
794
 
    Usage:
795
 
    
796
 
    @dbus_interface_annotations("org.example.Interface")
797
 
    def _foo(self):  # Function name does not matter
798
 
        return {"org.freedesktop.DBus.Deprecated": "true",
799
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
800
 
                    "false"}
801
 
    """
802
 
    def decorator(func):
803
 
        func._dbus_is_interface = True
804
 
        func._dbus_interface = dbus_interface
805
 
        func._dbus_name = dbus_interface
806
 
        return func
807
 
    return decorator
808
 
 
809
 
 
810
 
def dbus_annotations(annotations):
811
 
    """Decorator to annotate D-Bus methods, signals or properties
812
 
    Usage:
813
 
    
814
 
    @dbus_service_property("org.example.Interface", signature="b",
815
 
                           access="r")
816
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
 
                        "org.freedesktop.DBus.Property."
818
 
                        "EmitsChangedSignal": "false"})
819
 
    def Property_dbus_property(self):
820
 
        return dbus.Boolean(False)
821
 
    """
822
 
    def decorator(func):
823
 
        func._dbus_annotations = annotations
824
 
        return func
825
 
    return decorator
826
 
 
827
 
 
828
773
class DBusPropertyException(dbus.exceptions.DBusException):
829
774
    """A base class for D-Bus property-related exceptions
830
775
    """
831
 
    pass
 
776
    def __unicode__(self):
 
777
        return unicode(str(self))
 
778
 
832
779
 
833
780
class DBusPropertyAccessException(DBusPropertyException):
834
781
    """A property's access permissions disallows an operation.
851
798
    """
852
799
    
853
800
    @staticmethod
854
 
    def _is_dbus_thing(thing):
855
 
        """Returns a function testing if an attribute is a D-Bus thing
856
 
        
857
 
        If called like _is_dbus_thing("method") it returns a function
858
 
        suitable for use as predicate to inspect.getmembers().
859
 
        """
860
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
861
 
                                   False)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
862
803
    
863
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
864
805
        """Returns a generator of (name, attribute) pairs
865
806
        """
866
 
        return ((getattr(athing.__get__(self), "_dbus_name",
867
 
                         name),
868
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
869
808
                for cls in self.__class__.__mro__
870
 
                for name, athing in
871
 
                inspect.getmembers(cls,
872
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
873
811
    
874
812
    def _get_dbus_property(self, interface_name, property_name):
875
813
        """Returns a bound method if one exists which is a D-Bus
877
815
        """
878
816
        for cls in  self.__class__.__mro__:
879
817
            for name, value in (inspect.getmembers
880
 
                                (cls,
881
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
882
819
                if (value._dbus_name == property_name
883
820
                    and value._dbus_interface == interface_name):
884
821
                    return value.__get__(self)
912
849
            # The byte_arrays option is not supported yet on
913
850
            # signatures other than "ay".
914
851
            if prop._dbus_signature != "ay":
915
 
                raise ValueError("Byte arrays not supported for non-"
916
 
                                 "'ay' signature {!r}"
917
 
                                 .format(prop._dbus_signature))
 
852
                raise ValueError
918
853
            value = dbus.ByteArray(b''.join(chr(byte)
919
854
                                            for byte in value))
920
855
        prop(value)
928
863
        Note: Will not include properties with access="write".
929
864
        """
930
865
        properties = {}
931
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
932
867
            if (interface_name
933
868
                and interface_name != prop._dbus_interface):
934
869
                # Interface non-empty but did not match
949
884
                         path_keyword='object_path',
950
885
                         connection_keyword='connection')
951
886
    def Introspect(self, object_path, connection):
952
 
        """Overloading of standard D-Bus method.
953
 
        
954
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
955
888
        """
956
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
957
890
                                                   connection)
964
897
                e.setAttribute("access", prop._dbus_access)
965
898
                return e
966
899
            for if_tag in document.getElementsByTagName("interface"):
967
 
                # Add property tags
968
900
                for tag in (make_tag(document, name, prop)
969
901
                            for name, prop
970
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
971
903
                            if prop._dbus_interface
972
904
                            == if_tag.getAttribute("name")):
973
905
                    if_tag.appendChild(tag)
974
 
                # Add annotation tags
975
 
                for typ in ("method", "signal", "property"):
976
 
                    for tag in if_tag.getElementsByTagName(typ):
977
 
                        annots = dict()
978
 
                        for name, prop in (self.
979
 
                                           _get_all_dbus_things(typ)):
980
 
                            if (name == tag.getAttribute("name")
981
 
                                and prop._dbus_interface
982
 
                                == if_tag.getAttribute("name")):
983
 
                                annots.update(getattr
984
 
                                              (prop,
985
 
                                               "_dbus_annotations",
986
 
                                               {}))
987
 
                        for name, value in annots.items():
988
 
                            ann_tag = document.createElement(
989
 
                                "annotation")
990
 
                            ann_tag.setAttribute("name", name)
991
 
                            ann_tag.setAttribute("value", value)
992
 
                            tag.appendChild(ann_tag)
993
 
                # Add interface annotation tags
994
 
                for annotation, value in dict(
995
 
                    itertools.chain.from_iterable(
996
 
                        annotations().items()
997
 
                        for name, annotations in
998
 
                        self._get_all_dbus_things("interface")
999
 
                        if name == if_tag.getAttribute("name")
1000
 
                        )).items():
1001
 
                    ann_tag = document.createElement("annotation")
1002
 
                    ann_tag.setAttribute("name", annotation)
1003
 
                    ann_tag.setAttribute("value", value)
1004
 
                    if_tag.appendChild(ann_tag)
1005
906
                # Add the names to the return values for the
1006
907
                # "org.freedesktop.DBus.Properties" methods
1007
908
                if (if_tag.getAttribute("name")
1022
923
        except (AttributeError, xml.dom.DOMException,
1023
924
                xml.parsers.expat.ExpatError) as error:
1024
925
            logger.error("Failed to override Introspection method",
1025
 
                         exc_info=error)
 
926
                         error)
1026
927
        return xmlstring
1027
928
 
1028
929
 
1029
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1030
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1031
932
    if dt is None:
1032
933
        return dbus.String("", variant_level = variant_level)
1034
935
                       variant_level=variant_level)
1035
936
 
1036
937
 
1037
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1038
 
    """A class decorator; applied to a subclass of
1039
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1040
 
    interface names according to the "alt_interface_names" mapping.
1041
 
    Usage:
1042
 
    
1043
 
    @alternate_dbus_interfaces({"org.example.Interface":
1044
 
                                    "net.example.AlternateInterface"})
1045
 
    class SampleDBusObject(dbus.service.Object):
1046
 
        @dbus.service.method("org.example.Interface")
1047
 
        def SampleDBusMethod():
1048
 
            pass
1049
 
    
1050
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1051
 
    reachable via two interfaces: "org.example.Interface" and
1052
 
    "net.example.AlternateInterface", the latter of which will have
1053
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1054
 
    "true", unless "deprecate" is passed with a False value.
1055
 
    
1056
 
    This works for methods and signals, and also for D-Bus properties
1057
 
    (from DBusObjectWithProperties) and interfaces (from the
1058
 
    dbus_interface_annotations decorator).
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
1059
942
    """
1060
 
    def wrapper(cls):
1061
 
        for orig_interface_name, alt_interface_name in (
1062
 
            alt_interface_names.items()):
1063
 
            attr = {}
1064
 
            interface_names = set()
1065
 
            # Go though all attributes of the class
1066
 
            for attrname, attribute in inspect.getmembers(cls):
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
1067
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1068
951
                # with the wrong interface name
1069
952
                if (not hasattr(attribute, "_dbus_interface")
1070
953
                    or not attribute._dbus_interface
1071
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1072
955
                    continue
1073
956
                # Create an alternate D-Bus interface name based on
1074
957
                # the current name
1075
958
                alt_interface = (attribute._dbus_interface
1076
 
                                 .replace(orig_interface_name,
1077
 
                                          alt_interface_name))
1078
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1079
961
                # Is this a D-Bus signal?
1080
962
                if getattr(attribute, "_dbus_is_signal", False):
1081
 
                    # Extract the original non-method undecorated
1082
 
                    # function by black magic
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
1083
965
                    nonmethod_func = (dict(
1084
966
                            zip(attribute.func_code.co_freevars,
1085
967
                                attribute.__closure__))["func"]
1096
978
                                nonmethod_func.func_name,
1097
979
                                nonmethod_func.func_defaults,
1098
980
                                nonmethod_func.func_closure)))
1099
 
                    # Copy annotations, if any
1100
 
                    try:
1101
 
                        new_function._dbus_annotations = (
1102
 
                            dict(attribute._dbus_annotations))
1103
 
                    except AttributeError:
1104
 
                        pass
1105
981
                    # Define a creator of a function to call both the
1106
 
                    # original and alternate functions, so both the
1107
 
                    # original and alternate signals gets sent when
1108
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1109
984
                    def fixscope(func1, func2):
1110
985
                        """This function is a scope container to pass
1111
986
                        func1 and func2 to the "call_both" function
1118
993
                        return call_both
1119
994
                    # Create the "call_both" function and add it to
1120
995
                    # the class
1121
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1122
998
                # Is this a D-Bus method?
1123
999
                elif getattr(attribute, "_dbus_is_method", False):
1124
1000
                    # Create a new, but exactly alike, function
1135
1011
                                        attribute.func_name,
1136
1012
                                        attribute.func_defaults,
1137
1013
                                        attribute.func_closure)))
1138
 
                    # Copy annotations, if any
1139
 
                    try:
1140
 
                        attr[attrname]._dbus_annotations = (
1141
 
                            dict(attribute._dbus_annotations))
1142
 
                    except AttributeError:
1143
 
                        pass
1144
1014
                # Is this a D-Bus property?
1145
1015
                elif getattr(attribute, "_dbus_is_property", False):
1146
1016
                    # Create a new, but exactly alike, function
1160
1030
                                        attribute.func_name,
1161
1031
                                        attribute.func_defaults,
1162
1032
                                        attribute.func_closure)))
1163
 
                    # Copy annotations, if any
1164
 
                    try:
1165
 
                        attr[attrname]._dbus_annotations = (
1166
 
                            dict(attribute._dbus_annotations))
1167
 
                    except AttributeError:
1168
 
                        pass
1169
 
                # Is this a D-Bus interface?
1170
 
                elif getattr(attribute, "_dbus_is_interface", False):
1171
 
                    # Create a new, but exactly alike, function
1172
 
                    # object.  Decorate it to be a new D-Bus interface
1173
 
                    # with the alternate D-Bus interface name.  Add it
1174
 
                    # to the class.
1175
 
                    attr[attrname] = (dbus_interface_annotations
1176
 
                                      (alt_interface)
1177
 
                                      (types.FunctionType
1178
 
                                       (attribute.func_code,
1179
 
                                        attribute.func_globals,
1180
 
                                        attribute.func_name,
1181
 
                                        attribute.func_defaults,
1182
 
                                        attribute.func_closure)))
1183
 
            if deprecate:
1184
 
                # Deprecate all alternate interfaces
1185
 
                iname="_AlternateDBusNames_interface_annotation{}"
1186
 
                for interface_name in interface_names:
1187
 
                    @dbus_interface_annotations(interface_name)
1188
 
                    def func(self):
1189
 
                        return { "org.freedesktop.DBus.Deprecated":
1190
 
                                     "true" }
1191
 
                    # Find an unused name
1192
 
                    for aname in (iname.format(i)
1193
 
                                  for i in itertools.count()):
1194
 
                        if aname not in attr:
1195
 
                            attr[aname] = func
1196
 
                            break
1197
 
            if interface_names:
1198
 
                # Replace the class with a new subclass of it with
1199
 
                # methods, signals, etc. as created above.
1200
 
                cls = type(b"{}Alternate".format(cls.__name__),
1201
 
                           (cls,), attr)
1202
 
        return cls
1203
 
    return wrapper
1204
 
 
1205
 
 
1206
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
 
                                "se.bsnet.fukt.Mandos"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1208
1036
class ClientDBus(Client, DBusObjectWithProperties):
1209
1037
    """A Client class using D-Bus
1210
1038
    
1221
1049
    def __init__(self, bus = None, *args, **kwargs):
1222
1050
        self.bus = bus
1223
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
1224
1055
        # Only now, when this client is initialized, can it show up on
1225
1056
        # the D-Bus
1226
1057
        client_object_name = unicode(self.name).translate(
1230
1061
                                 ("/clients/" + client_object_name))
1231
1062
        DBusObjectWithProperties.__init__(self, self.bus,
1232
1063
                                          self.dbus_object_path)
1233
 
    
 
1064
        
1234
1065
    def notifychangeproperty(transform_func,
1235
1066
                             dbus_name, type_func=lambda x: x,
1236
1067
                             variant_level=1):
1244
1075
                   to the D-Bus.  Default: no transform
1245
1076
        variant_level: D-Bus variant level.  Default: 1
1246
1077
        """
1247
 
        attrname = "_{}".format(dbus_name)
 
1078
        attrname = "_{0}".format(dbus_name)
1248
1079
        def setter(self, value):
1249
1080
            if hasattr(self, "dbus_object_path"):
1250
1081
                if (not hasattr(self, attrname) or
1259
1090
        
1260
1091
        return property(lambda self: getattr(self, attrname), setter)
1261
1092
    
 
1093
    
1262
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1263
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
1264
1096
                                             "ApprovalPending",
1271
1103
                                       checker is not None)
1272
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1105
                                           "LastCheckedOK")
1274
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1275
 
                                               "LastCheckerStatus")
1276
1106
    last_approval_request = notifychangeproperty(
1277
1107
        datetime_to_dbus, "LastApprovalRequest")
1278
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
1280
1110
    approval_delay = notifychangeproperty(dbus.UInt64,
1281
1111
                                          "ApprovalDelay",
1282
1112
                                          type_func =
1283
 
                                          lambda td: td.total_seconds()
1284
 
                                          * 1000)
 
1113
                                          timedelta_to_milliseconds)
1285
1114
    approval_duration = notifychangeproperty(
1286
1115
        dbus.UInt64, "ApprovalDuration",
1287
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1116
        type_func = timedelta_to_milliseconds)
1288
1117
    host = notifychangeproperty(dbus.String, "Host")
1289
1118
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1290
 
                                   type_func = lambda td:
1291
 
                                       td.total_seconds() * 1000)
 
1119
                                   type_func =
 
1120
                                   timedelta_to_milliseconds)
1292
1121
    extended_timeout = notifychangeproperty(
1293
1122
        dbus.UInt64, "ExtendedTimeout",
1294
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1123
        type_func = timedelta_to_milliseconds)
1295
1124
    interval = notifychangeproperty(dbus.UInt64,
1296
1125
                                    "Interval",
1297
1126
                                    type_func =
1298
 
                                    lambda td: td.total_seconds()
1299
 
                                    * 1000)
 
1127
                                    timedelta_to_milliseconds)
1300
1128
    checker_command = notifychangeproperty(dbus.String, "Checker")
1301
1129
    
1302
1130
    del notifychangeproperty
1330
1158
                                       *args, **kwargs)
1331
1159
    
1332
1160
    def start_checker(self, *args, **kwargs):
1333
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1161
        old_checker = self.checker
 
1162
        if self.checker is not None:
 
1163
            old_checker_pid = self.checker.pid
 
1164
        else:
 
1165
            old_checker_pid = None
1334
1166
        r = Client.start_checker(self, *args, **kwargs)
1335
1167
        # Only if new checker process was started
1336
1168
        if (self.checker is not None
1344
1176
        return False
1345
1177
    
1346
1178
    def approve(self, value=True):
 
1179
        self.send_changedstate()
1347
1180
        self.approved = value
1348
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1349
 
                                * 1000), self._reset_approved)
1350
 
        self.send_changedstate()
 
1181
        gobject.timeout_add(timedelta_to_milliseconds
 
1182
                            (self.approval_duration),
 
1183
                            self._reset_approved)
 
1184
    
1351
1185
    
1352
1186
    ## D-Bus methods, signals & properties
1353
1187
    _interface = "se.recompile.Mandos.Client"
1354
1188
    
1355
 
    ## Interfaces
1356
 
    
1357
 
    @dbus_interface_annotations(_interface)
1358
 
    def _foo(self):
1359
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1360
 
                     "false"}
1361
 
    
1362
1189
    ## Signals
1363
1190
    
1364
1191
    # CheckerCompleted - signal
1400
1227
        "D-Bus signal"
1401
1228
        return self.need_approval()
1402
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
1403
1238
    ## Methods
1404
1239
    
1405
1240
    # Approve - method
1455
1290
                           access="readwrite")
1456
1291
    def ApprovalDelay_dbus_property(self, value=None):
1457
1292
        if value is None:       # get
1458
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1459
 
                               * 1000)
 
1293
            return dbus.UInt64(self.approval_delay_milliseconds())
1460
1294
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1461
1295
    
1462
1296
    # ApprovalDuration - property
1464
1298
                           access="readwrite")
1465
1299
    def ApprovalDuration_dbus_property(self, value=None):
1466
1300
        if value is None:       # get
1467
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1468
 
                               * 1000)
 
1301
            return dbus.UInt64(timedelta_to_milliseconds(
 
1302
                    self.approval_duration))
1469
1303
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1470
1304
    
1471
1305
    # Name - property
1516
1350
            return
1517
1351
        return datetime_to_dbus(self.last_checked_ok)
1518
1352
    
1519
 
    # LastCheckerStatus - property
1520
 
    @dbus_service_property(_interface, signature="n",
1521
 
                           access="read")
1522
 
    def LastCheckerStatus_dbus_property(self):
1523
 
        return dbus.Int16(self.last_checker_status)
1524
 
    
1525
1353
    # Expires - property
1526
1354
    @dbus_service_property(_interface, signature="s", access="read")
1527
1355
    def Expires_dbus_property(self):
1537
1365
                           access="readwrite")
1538
1366
    def Timeout_dbus_property(self, value=None):
1539
1367
        if value is None:       # get
1540
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1541
 
        old_timeout = self.timeout
 
1368
            return dbus.UInt64(self.timeout_milliseconds())
1542
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1543
 
        # Reschedule disabling
 
1370
        # Reschedule timeout
1544
1371
        if self.enabled:
1545
1372
            now = datetime.datetime.utcnow()
1546
 
            self.expires += self.timeout - old_timeout
1547
 
            if self.expires <= now:
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
1548
1376
                # The timeout has passed
1549
1377
                self.disable()
1550
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
1551
1382
                if (getattr(self, "disable_initiator_tag", None)
1552
1383
                    is None):
1553
1384
                    return
1554
1385
                gobject.source_remove(self.disable_initiator_tag)
1555
 
                self.disable_initiator_tag = (
1556
 
                    gobject.timeout_add(
1557
 
                        int((self.expires - now).total_seconds()
1558
 
                            * 1000), self.disable))
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
1559
1389
    
1560
1390
    # ExtendedTimeout - property
1561
1391
    @dbus_service_property(_interface, signature="t",
1562
1392
                           access="readwrite")
1563
1393
    def ExtendedTimeout_dbus_property(self, value=None):
1564
1394
        if value is None:       # get
1565
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1566
 
                               * 1000)
 
1395
            return dbus.UInt64(self.extended_timeout_milliseconds())
1567
1396
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1568
1397
    
1569
1398
    # Interval - property
1571
1400
                           access="readwrite")
1572
1401
    def Interval_dbus_property(self, value=None):
1573
1402
        if value is None:       # get
1574
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1403
            return dbus.UInt64(self.interval_milliseconds())
1575
1404
        self.interval = datetime.timedelta(0, 0, 0, value)
1576
1405
        if getattr(self, "checker_initiator_tag", None) is None:
1577
1406
            return
1610
1439
    @dbus_service_property(_interface, signature="ay",
1611
1440
                           access="write", byte_arrays=True)
1612
1441
    def Secret_dbus_property(self, value):
1613
 
        self.secret = bytes(value)
 
1442
        self.secret = str(value)
1614
1443
    
1615
1444
    del _interface
1616
1445
 
1641
1470
        self._pipe.send(('setattr', name, value))
1642
1471
 
1643
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1644
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1645
1478
    """A class to handle client connections.
1646
1479
    
1682
1515
            logger.debug("Protocol version: %r", line)
1683
1516
            try:
1684
1517
                if int(line.strip().split()[0]) > 1:
1685
 
                    raise RuntimeError(line)
 
1518
                    raise RuntimeError
1686
1519
            except (ValueError, IndexError, RuntimeError) as error:
1687
1520
                logger.error("Unknown protocol version: %s", error)
1688
1521
                return
1714
1547
                except KeyError:
1715
1548
                    return
1716
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1717
1554
                if client.approval_delay:
1718
1555
                    delay = client.approval_delay
1719
1556
                    client.approvals_pending += 1
1737
1574
                        if self.server.use_dbus:
1738
1575
                            # Emit D-Bus signal
1739
1576
                            client.NeedApproval(
1740
 
                                client.approval_delay.total_seconds()
1741
 
                                * 1000, client.approved_by_default)
 
1577
                                client.approval_delay_milliseconds(),
 
1578
                                client.approved_by_default)
1742
1579
                    else:
1743
1580
                        logger.warning("Client %s was not approved",
1744
1581
                                       client.name)
1750
1587
                    #wait until timeout or approved
1751
1588
                    time = datetime.datetime.now()
1752
1589
                    client.changedstate.acquire()
1753
 
                    client.changedstate.wait(delay.total_seconds())
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1754
1593
                    client.changedstate.release()
1755
1594
                    time2 = datetime.datetime.now()
1756
1595
                    if (time2 - time) >= delay:
1772
1611
                    try:
1773
1612
                        sent = session.send(client.secret[sent_size:])
1774
1613
                    except gnutls.errors.GNUTLSError as error:
1775
 
                        logger.warning("gnutls send failed",
1776
 
                                       exc_info=error)
 
1614
                        logger.warning("gnutls send failed")
1777
1615
                        return
1778
1616
                    logger.debug("Sent: %d, remaining: %d",
1779
1617
                                 sent, len(client.secret)
1782
1620
                
1783
1621
                logger.info("Sending secret to %s", client.name)
1784
1622
                # bump the timeout using extended_timeout
1785
 
                client.bump_timeout(client.extended_timeout)
 
1623
                client.checked_ok(client.extended_timeout)
1786
1624
                if self.server.use_dbus:
1787
1625
                    # Emit D-Bus signal
1788
1626
                    client.GotSecret()
1793
1631
                try:
1794
1632
                    session.bye()
1795
1633
                except gnutls.errors.GNUTLSError as error:
1796
 
                    logger.warning("GnuTLS bye failed",
1797
 
                                   exc_info=error)
 
1634
                    logger.warning("GnuTLS bye failed")
1798
1635
    
1799
1636
    @staticmethod
1800
1637
    def peer_certificate(session):
1872
1709
    def process_request(self, request, address):
1873
1710
        """Start a new process to process the request."""
1874
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
1875
 
                                       args = (request, address))
 
1712
                                       args = (request,
 
1713
                                               address))
1876
1714
        proc.start()
1877
1715
        return proc
1878
1716
 
1893
1731
    
1894
1732
    def add_pipe(self, parent_pipe, proc):
1895
1733
        """Dummy function; override as necessary"""
1896
 
        raise NotImplementedError()
 
1734
        raise NotImplementedError
1897
1735
 
1898
1736
 
1899
1737
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1906
1744
        use_ipv6:       Boolean; to use IPv6 or not
1907
1745
    """
1908
1746
    def __init__(self, server_address, RequestHandlerClass,
1909
 
                 interface=None, use_ipv6=True, socketfd=None):
1910
 
        """If socketfd is set, use that file descriptor instead of
1911
 
        creating a new one with socket.socket().
1912
 
        """
 
1747
                 interface=None, use_ipv6=True):
1913
1748
        self.interface = interface
1914
1749
        if use_ipv6:
1915
1750
            self.address_family = socket.AF_INET6
1916
 
        if socketfd is not None:
1917
 
            # Save the file descriptor
1918
 
            self.socketfd = socketfd
1919
 
            # Save the original socket.socket() function
1920
 
            self.socket_socket = socket.socket
1921
 
            # To implement --socket, we monkey patch socket.socket.
1922
 
            # 
1923
 
            # (When socketserver.TCPServer is a new-style class, we
1924
 
            # could make self.socket into a property instead of monkey
1925
 
            # patching socket.socket.)
1926
 
            # 
1927
 
            # Create a one-time-only replacement for socket.socket()
1928
 
            @functools.wraps(socket.socket)
1929
 
            def socket_wrapper(*args, **kwargs):
1930
 
                # Restore original function so subsequent calls are
1931
 
                # not affected.
1932
 
                socket.socket = self.socket_socket
1933
 
                del self.socket_socket
1934
 
                # This time only, return a new socket object from the
1935
 
                # saved file descriptor.
1936
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1937
 
            # Replace socket.socket() function with wrapper
1938
 
            socket.socket = socket_wrapper
1939
 
        # The socketserver.TCPServer.__init__ will call
1940
 
        # socket.socket(), which might be our replacement,
1941
 
        # socket_wrapper(), if socketfd was set.
1942
1751
        socketserver.TCPServer.__init__(self, server_address,
1943
1752
                                        RequestHandlerClass)
1944
 
    
1945
1753
    def server_bind(self):
1946
1754
        """This overrides the normal server_bind() function
1947
1755
        to bind to an interface if one was specified, and also NOT to
1955
1763
                try:
1956
1764
                    self.socket.setsockopt(socket.SOL_SOCKET,
1957
1765
                                           SO_BINDTODEVICE,
1958
 
                                           (self.interface + "\0")
1959
 
                                           .encode("utf-8"))
 
1766
                                           str(self.interface
 
1767
                                               + '\0'))
1960
1768
                except socket.error as error:
1961
 
                    if error.errno == errno.EPERM:
1962
 
                        logger.error("No permission to bind to"
1963
 
                                     " interface %s", self.interface)
1964
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1769
                    if error[0] == errno.EPERM:
 
1770
                        logger.error("No permission to"
 
1771
                                     " bind to interface %s",
 
1772
                                     self.interface)
 
1773
                    elif error[0] == errno.ENOPROTOOPT:
1965
1774
                        logger.error("SO_BINDTODEVICE not available;"
1966
1775
                                     " cannot bind to interface %s",
1967
1776
                                     self.interface)
1968
 
                    elif error.errno == errno.ENODEV:
1969
 
                        logger.error("Interface %s does not exist,"
1970
 
                                     " cannot bind", self.interface)
1971
1777
                    else:
1972
1778
                        raise
1973
1779
        # Only bind(2) the socket if we really need to.
1976
1782
                if self.address_family == socket.AF_INET6:
1977
1783
                    any_address = "::" # in6addr_any
1978
1784
                else:
1979
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1785
                    any_address = socket.INADDR_ANY
1980
1786
                self.server_address = (any_address,
1981
1787
                                       self.server_address[1])
1982
1788
            elif not self.server_address[1]:
2003
1809
    """
2004
1810
    def __init__(self, server_address, RequestHandlerClass,
2005
1811
                 interface=None, use_ipv6=True, clients=None,
2006
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1812
                 gnutls_priority=None, use_dbus=True):
2007
1813
        self.enabled = False
2008
1814
        self.clients = clients
2009
1815
        if self.clients is None:
2013
1819
        IPv6_TCPServer.__init__(self, server_address,
2014
1820
                                RequestHandlerClass,
2015
1821
                                interface = interface,
2016
 
                                use_ipv6 = use_ipv6,
2017
 
                                socketfd = socketfd)
 
1822
                                use_ipv6 = use_ipv6)
2018
1823
    def server_activate(self):
2019
1824
        if self.enabled:
2020
1825
            return socketserver.TCPServer.server_activate(self)
2033
1838
    
2034
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
2035
1840
                   proc = None, client_object=None):
 
1841
        condition_names = {
 
1842
            gobject.IO_IN: "IN",   # There is data to read.
 
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1844
                                    # blocking).
 
1845
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1846
            gobject.IO_ERR: "ERR", # Error condition.
 
1847
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1848
                                    # broken, usually for pipes and
 
1849
                                    # sockets).
 
1850
            }
 
1851
        conditions_string = ' | '.join(name
 
1852
                                       for cond, name in
 
1853
                                       condition_names.iteritems()
 
1854
                                       if cond & condition)
2036
1855
        # error, or the other end of multiprocessing.Pipe has closed
2037
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2038
1857
            # Wait for other process to exit
2039
1858
            proc.join()
2040
1859
            return False
2098
1917
        return True
2099
1918
 
2100
1919
 
2101
 
def rfc3339_duration_to_delta(duration):
2102
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2103
 
    
2104
 
    >>> rfc3339_duration_to_delta("P7D")
2105
 
    datetime.timedelta(7)
2106
 
    >>> rfc3339_duration_to_delta("PT60S")
2107
 
    datetime.timedelta(0, 60)
2108
 
    >>> rfc3339_duration_to_delta("PT60M")
2109
 
    datetime.timedelta(0, 3600)
2110
 
    >>> rfc3339_duration_to_delta("PT24H")
2111
 
    datetime.timedelta(1)
2112
 
    >>> rfc3339_duration_to_delta("P1W")
2113
 
    datetime.timedelta(7)
2114
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2115
 
    datetime.timedelta(0, 330)
2116
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2117
 
    datetime.timedelta(1, 200)
2118
 
    """
2119
 
    
2120
 
    # Parsing an RFC 3339 duration with regular expressions is not
2121
 
    # possible - there would have to be multiple places for the same
2122
 
    # values, like seconds.  The current code, while more esoteric, is
2123
 
    # cleaner without depending on a parsing library.  If Python had a
2124
 
    # built-in library for parsing we would use it, but we'd like to
2125
 
    # avoid excessive use of external libraries.
2126
 
    
2127
 
    # New type for defining tokens, syntax, and semantics all-in-one
2128
 
    Token = collections.namedtuple("Token",
2129
 
                                   ("regexp", # To match token; if
2130
 
                                              # "value" is not None,
2131
 
                                              # must have a "group"
2132
 
                                              # containing digits
2133
 
                                    "value",  # datetime.timedelta or
2134
 
                                              # None
2135
 
                                    "followers")) # Tokens valid after
2136
 
                                                  # this token
2137
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2138
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2139
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2140
 
    token_second = Token(re.compile(r"(\d+)S"),
2141
 
                         datetime.timedelta(seconds=1),
2142
 
                         frozenset((token_end,)))
2143
 
    token_minute = Token(re.compile(r"(\d+)M"),
2144
 
                         datetime.timedelta(minutes=1),
2145
 
                         frozenset((token_second, token_end)))
2146
 
    token_hour = Token(re.compile(r"(\d+)H"),
2147
 
                       datetime.timedelta(hours=1),
2148
 
                       frozenset((token_minute, token_end)))
2149
 
    token_time = Token(re.compile(r"T"),
2150
 
                       None,
2151
 
                       frozenset((token_hour, token_minute,
2152
 
                                  token_second)))
2153
 
    token_day = Token(re.compile(r"(\d+)D"),
2154
 
                      datetime.timedelta(days=1),
2155
 
                      frozenset((token_time, token_end)))
2156
 
    token_month = Token(re.compile(r"(\d+)M"),
2157
 
                        datetime.timedelta(weeks=4),
2158
 
                        frozenset((token_day, token_end)))
2159
 
    token_year = Token(re.compile(r"(\d+)Y"),
2160
 
                       datetime.timedelta(weeks=52),
2161
 
                       frozenset((token_month, token_end)))
2162
 
    token_week = Token(re.compile(r"(\d+)W"),
2163
 
                       datetime.timedelta(weeks=1),
2164
 
                       frozenset((token_end,)))
2165
 
    token_duration = Token(re.compile(r"P"), None,
2166
 
                           frozenset((token_year, token_month,
2167
 
                                      token_day, token_time,
2168
 
                                      token_week)))
2169
 
    # Define starting values
2170
 
    value = datetime.timedelta() # Value so far
2171
 
    found_token = None
2172
 
    followers = frozenset((token_duration,)) # Following valid tokens
2173
 
    s = duration                # String left to parse
2174
 
    # Loop until end token is found
2175
 
    while found_token is not token_end:
2176
 
        # Search for any currently valid tokens
2177
 
        for token in followers:
2178
 
            match = token.regexp.match(s)
2179
 
            if match is not None:
2180
 
                # Token found
2181
 
                if token.value is not None:
2182
 
                    # Value found, parse digits
2183
 
                    factor = int(match.group(1), 10)
2184
 
                    # Add to value so far
2185
 
                    value += factor * token.value
2186
 
                # Strip token from string
2187
 
                s = token.regexp.sub("", s, 1)
2188
 
                # Go to found token
2189
 
                found_token = token
2190
 
                # Set valid next tokens
2191
 
                followers = found_token.followers
2192
 
                break
2193
 
        else:
2194
 
            # No currently valid tokens were found
2195
 
            raise ValueError("Invalid RFC 3339 duration")
2196
 
    # End token found
2197
 
    return value
2198
 
 
2199
 
 
2200
1920
def string_to_delta(interval):
2201
1921
    """Parse a string and return a datetime.timedelta
2202
1922
    
2213
1933
    >>> string_to_delta('5m 30s')
2214
1934
    datetime.timedelta(0, 330)
2215
1935
    """
2216
 
    
2217
 
    try:
2218
 
        return rfc3339_duration_to_delta(interval)
2219
 
    except ValueError:
2220
 
        pass
2221
 
    
2222
1936
    timevalue = datetime.timedelta(0)
2223
1937
    for s in interval.split():
2224
1938
        try:
2225
 
            suffix = s[-1]
 
1939
            suffix = unicode(s[-1])
2226
1940
            value = int(s[:-1])
2227
1941
            if suffix == "d":
2228
1942
                delta = datetime.timedelta(value)
2235
1949
            elif suffix == "w":
2236
1950
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2237
1951
            else:
2238
 
                raise ValueError("Unknown suffix {!r}"
2239
 
                                 .format(suffix))
2240
 
        except IndexError as e:
 
1952
                raise ValueError("Unknown suffix %r" % suffix)
 
1953
        except (ValueError, IndexError) as e:
2241
1954
            raise ValueError(*(e.args))
2242
1955
        timevalue += delta
2243
1956
    return timevalue
2256
1969
        sys.exit()
2257
1970
    if not noclose:
2258
1971
        # Close all standard open file descriptors
2259
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1972
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2260
1973
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2261
 
            raise OSError(errno.ENODEV, "{} not a character device"
2262
 
                          .format(os.devnull))
 
1974
            raise OSError(errno.ENODEV,
 
1975
                          "%s not a character device"
 
1976
                          % os.path.devnull)
2263
1977
        os.dup2(null, sys.stdin.fileno())
2264
1978
        os.dup2(null, sys.stdout.fileno())
2265
1979
        os.dup2(null, sys.stderr.fileno())
2274
1988
    
2275
1989
    parser = argparse.ArgumentParser()
2276
1990
    parser.add_argument("-v", "--version", action="version",
2277
 
                        version = "%(prog)s {}".format(version),
 
1991
                        version = "%%(prog)s %s" % version,
2278
1992
                        help="show version number and exit")
2279
1993
    parser.add_argument("-i", "--interface", metavar="IF",
2280
1994
                        help="Bind to interface IF")
2286
2000
                        help="Run self-test")
2287
2001
    parser.add_argument("--debug", action="store_true",
2288
2002
                        help="Debug mode; run in foreground and log"
2289
 
                        " to terminal", default=None)
 
2003
                        " to terminal")
2290
2004
    parser.add_argument("--debuglevel", metavar="LEVEL",
2291
2005
                        help="Debug level for stdout output")
2292
2006
    parser.add_argument("--priority", help="GnuTLS"
2299
2013
                        " files")
2300
2014
    parser.add_argument("--no-dbus", action="store_false",
2301
2015
                        dest="use_dbus", help="Do not provide D-Bus"
2302
 
                        " system bus interface", default=None)
 
2016
                        " system bus interface")
2303
2017
    parser.add_argument("--no-ipv6", action="store_false",
2304
 
                        dest="use_ipv6", help="Do not use IPv6",
2305
 
                        default=None)
 
2018
                        dest="use_ipv6", help="Do not use IPv6")
2306
2019
    parser.add_argument("--no-restore", action="store_false",
2307
2020
                        dest="restore", help="Do not restore stored"
2308
 
                        " state", default=None)
2309
 
    parser.add_argument("--socket", type=int,
2310
 
                        help="Specify a file descriptor to a network"
2311
 
                        " socket to use instead of creating one")
 
2021
                        " state")
2312
2022
    parser.add_argument("--statedir", metavar="DIR",
2313
2023
                        help="Directory to save/restore state in")
2314
 
    parser.add_argument("--foreground", action="store_true",
2315
 
                        help="Run in foreground", default=None)
2316
 
    parser.add_argument("--no-zeroconf", action="store_false",
2317
 
                        dest="zeroconf", help="Do not use Zeroconf",
2318
 
                        default=None)
2319
2024
    
2320
2025
    options = parser.parse_args()
2321
2026
    
2322
2027
    if options.check:
2323
2028
        import doctest
2324
 
        fail_count, test_count = doctest.testmod()
2325
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2029
        doctest.testmod()
 
2030
        sys.exit()
2326
2031
    
2327
2032
    # Default values for config file for server-global settings
2328
2033
    server_defaults = { "interface": "",
2330
2035
                        "port": "",
2331
2036
                        "debug": "False",
2332
2037
                        "priority":
2333
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2038
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2334
2039
                        "servicename": "Mandos",
2335
2040
                        "use_dbus": "True",
2336
2041
                        "use_ipv6": "True",
2337
2042
                        "debuglevel": "",
2338
2043
                        "restore": "True",
2339
 
                        "socket": "",
2340
 
                        "statedir": "/var/lib/mandos",
2341
 
                        "foreground": "False",
2342
 
                        "zeroconf": "True",
 
2044
                        "statedir": "/var/lib/mandos"
2343
2045
                        }
2344
2046
    
2345
2047
    # Parse config file for server-global settings
2350
2052
    # Convert the SafeConfigParser object to a dict
2351
2053
    server_settings = server_config.defaults()
2352
2054
    # Use the appropriate methods on the non-string config options
2353
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2055
    for option in ("debug", "use_dbus", "use_ipv6"):
2354
2056
        server_settings[option] = server_config.getboolean("DEFAULT",
2355
2057
                                                           option)
2356
2058
    if server_settings["port"]:
2357
2059
        server_settings["port"] = server_config.getint("DEFAULT",
2358
2060
                                                       "port")
2359
 
    if server_settings["socket"]:
2360
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2361
 
                                                         "socket")
2362
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2363
 
        # over with an opened os.devnull.  But we don't want this to
2364
 
        # happen with a supplied network socket.
2365
 
        if 0 <= server_settings["socket"] <= 2:
2366
 
            server_settings["socket"] = os.dup(server_settings
2367
 
                                               ["socket"])
2368
2061
    del server_config
2369
2062
    
2370
2063
    # Override the settings from the config file with command line
2372
2065
    for option in ("interface", "address", "port", "debug",
2373
2066
                   "priority", "servicename", "configdir",
2374
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2375
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2068
                   "statedir"):
2376
2069
        value = getattr(options, option)
2377
2070
        if value is not None:
2378
2071
            server_settings[option] = value
2379
2072
    del options
2380
2073
    # Force all strings to be unicode
2381
2074
    for option in server_settings.keys():
2382
 
        if isinstance(server_settings[option], bytes):
2383
 
            server_settings[option] = (server_settings[option]
2384
 
                                       .decode("utf-8"))
2385
 
    # Force all boolean options to be boolean
2386
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2387
 
                   "foreground", "zeroconf"):
2388
 
        server_settings[option] = bool(server_settings[option])
2389
 
    # Debug implies foreground
2390
 
    if server_settings["debug"]:
2391
 
        server_settings["foreground"] = True
 
2075
        if type(server_settings[option]) is str:
 
2076
            server_settings[option] = unicode(server_settings[option])
2392
2077
    # Now we have our good server settings in "server_settings"
2393
2078
    
2394
2079
    ##################################################################
2395
2080
    
2396
 
    if (not server_settings["zeroconf"] and
2397
 
        not (server_settings["port"]
2398
 
             or server_settings["socket"] != "")):
2399
 
            parser.error("Needs port or socket to work without"
2400
 
                         " Zeroconf")
2401
 
    
2402
2081
    # For convenience
2403
2082
    debug = server_settings["debug"]
2404
2083
    debuglevel = server_settings["debuglevel"]
2406
2085
    use_ipv6 = server_settings["use_ipv6"]
2407
2086
    stored_state_path = os.path.join(server_settings["statedir"],
2408
2087
                                     stored_state_file)
2409
 
    foreground = server_settings["foreground"]
2410
 
    zeroconf = server_settings["zeroconf"]
2411
2088
    
2412
2089
    if debug:
2413
2090
        initlogger(debug, logging.DEBUG)
2420
2097
    
2421
2098
    if server_settings["servicename"] != "Mandos":
2422
2099
        syslogger.setFormatter(logging.Formatter
2423
 
                               ('Mandos ({}) [%(process)d]:'
2424
 
                                ' %(levelname)s: %(message)s'
2425
 
                                .format(server_settings
2426
 
                                        ["servicename"])))
 
2100
                               ('Mandos (%s) [%%(process)d]:'
 
2101
                                ' %%(levelname)s: %%(message)s'
 
2102
                                % server_settings["servicename"]))
2427
2103
    
2428
2104
    # Parse config file with clients
2429
2105
    client_config = configparser.SafeConfigParser(Client
2434
2110
    global mandos_dbus_service
2435
2111
    mandos_dbus_service = None
2436
2112
    
2437
 
    socketfd = None
2438
 
    if server_settings["socket"] != "":
2439
 
        socketfd = server_settings["socket"]
2440
2113
    tcp_server = MandosServer((server_settings["address"],
2441
2114
                               server_settings["port"]),
2442
2115
                              ClientHandler,
2445
2118
                              use_ipv6=use_ipv6,
2446
2119
                              gnutls_priority=
2447
2120
                              server_settings["priority"],
2448
 
                              use_dbus=use_dbus,
2449
 
                              socketfd=socketfd)
2450
 
    if not foreground:
2451
 
        pidfilename = "/run/mandos.pid"
2452
 
        if not os.path.isdir("/run/."):
2453
 
            pidfilename = "/var/run/mandos.pid"
2454
 
        pidfile = None
 
2121
                              use_dbus=use_dbus)
 
2122
    if not debug:
 
2123
        pidfilename = "/var/run/mandos.pid"
2455
2124
        try:
2456
2125
            pidfile = open(pidfilename, "w")
2457
 
        except IOError as e:
2458
 
            logger.error("Could not open file %r", pidfilename,
2459
 
                         exc_info=e)
 
2126
        except IOError:
 
2127
            logger.error("Could not open file %r", pidfilename)
2460
2128
    
2461
 
    for name in ("_mandos", "mandos", "nobody"):
 
2129
    try:
 
2130
        uid = pwd.getpwnam("_mandos").pw_uid
 
2131
        gid = pwd.getpwnam("_mandos").pw_gid
 
2132
    except KeyError:
2462
2133
        try:
2463
 
            uid = pwd.getpwnam(name).pw_uid
2464
 
            gid = pwd.getpwnam(name).pw_gid
2465
 
            break
 
2134
            uid = pwd.getpwnam("mandos").pw_uid
 
2135
            gid = pwd.getpwnam("mandos").pw_gid
2466
2136
        except KeyError:
2467
 
            continue
2468
 
    else:
2469
 
        uid = 65534
2470
 
        gid = 65534
 
2137
            try:
 
2138
                uid = pwd.getpwnam("nobody").pw_uid
 
2139
                gid = pwd.getpwnam("nobody").pw_gid
 
2140
            except KeyError:
 
2141
                uid = 65534
 
2142
                gid = 65534
2471
2143
    try:
2472
2144
        os.setgid(gid)
2473
2145
        os.setuid(uid)
2474
2146
    except OSError as error:
2475
 
        if error.errno != errno.EPERM:
2476
 
            raise
 
2147
        if error[0] != errno.EPERM:
 
2148
            raise error
2477
2149
    
2478
2150
    if debug:
2479
2151
        # Enable all possible GnuTLS debugging
2490
2162
         .gnutls_global_set_log_function(debug_gnutls))
2491
2163
        
2492
2164
        # Redirect stdin so all checkers get /dev/null
2493
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2165
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2494
2166
        os.dup2(null, sys.stdin.fileno())
2495
2167
        if null > 2:
2496
2168
            os.close(null)
2497
2169
    
2498
2170
    # Need to fork before connecting to D-Bus
2499
 
    if not foreground:
 
2171
    if not debug:
2500
2172
        # Close all input and output, do double fork, etc.
2501
2173
        daemon()
2502
2174
    
2503
 
    # multiprocessing will use threads, so before we use gobject we
2504
 
    # need to inform gobject that threads will be used.
2505
2175
    gobject.threads_init()
2506
2176
    
2507
2177
    global main_loop
2508
2178
    # From the Avahi example code
2509
 
    DBusGMainLoop(set_as_default=True)
 
2179
    DBusGMainLoop(set_as_default=True )
2510
2180
    main_loop = gobject.MainLoop()
2511
2181
    bus = dbus.SystemBus()
2512
2182
    # End of Avahi example code
2518
2188
                            ("se.bsnet.fukt.Mandos", bus,
2519
2189
                             do_not_queue=True))
2520
2190
        except dbus.exceptions.NameExistsException as e:
2521
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2191
            logger.error(unicode(e) + ", disabling D-Bus")
2522
2192
            use_dbus = False
2523
2193
            server_settings["use_dbus"] = False
2524
2194
            tcp_server.use_dbus = False
2525
 
    if zeroconf:
2526
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2527
 
        service = AvahiServiceToSyslog(name =
2528
 
                                       server_settings["servicename"],
2529
 
                                       servicetype = "_mandos._tcp",
2530
 
                                       protocol = protocol, bus = bus)
2531
 
        if server_settings["interface"]:
2532
 
            service.interface = (if_nametoindex
2533
 
                                 (server_settings["interface"]
2534
 
                                  .encode("utf-8")))
 
2195
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2196
    service = AvahiServiceToSyslog(name =
 
2197
                                   server_settings["servicename"],
 
2198
                                   servicetype = "_mandos._tcp",
 
2199
                                   protocol = protocol, bus = bus)
 
2200
    if server_settings["interface"]:
 
2201
        service.interface = (if_nametoindex
 
2202
                             (str(server_settings["interface"])))
2535
2203
    
2536
2204
    global multiprocessing_manager
2537
2205
    multiprocessing_manager = multiprocessing.Manager()
2538
2206
    
2539
2207
    client_class = Client
2540
2208
    if use_dbus:
2541
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
2542
2211
    
2543
2212
    client_settings = Client.config_parser(client_config)
2544
2213
    old_client_settings = {}
2545
2214
    clients_data = {}
2546
2215
    
2547
 
    # This is used to redirect stdout and stderr for checker processes
2548
 
    global wnull
2549
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2550
 
    # Only used if server is running in foreground but not in debug
2551
 
    # mode
2552
 
    if debug or not foreground:
2553
 
        wnull.close()
2554
 
    
2555
2216
    # Get client data and settings from last running state.
2556
2217
    if server_settings["restore"]:
2557
2218
        try:
2560
2221
                                                     (stored_state))
2561
2222
            os.remove(stored_state_path)
2562
2223
        except IOError as e:
2563
 
            if e.errno == errno.ENOENT:
2564
 
                logger.warning("Could not load persistent state: {}"
2565
 
                                .format(os.strerror(e.errno)))
2566
 
            else:
2567
 
                logger.critical("Could not load persistent state:",
2568
 
                                exc_info=e)
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
2569
2227
                raise
2570
2228
        except EOFError as e:
2571
2229
            logger.warning("Could not load persistent state: "
2572
 
                           "EOFError:", exc_info=e)
 
2230
                           "EOFError: {0}".format(e))
2573
2231
    
2574
2232
    with PGPEngine() as pgp:
2575
 
        for client_name, client in clients_data.items():
2576
 
            # Skip removed clients
2577
 
            if client_name not in client_settings:
2578
 
                continue
2579
 
            
 
2233
        for client_name, client in clients_data.iteritems():
2580
2234
            # Decide which value to use after restoring saved state.
2581
2235
            # We have three different values: Old config file,
2582
2236
            # new config file, and saved state.
2596
2250
            
2597
2251
            # Clients who has passed its expire date can still be
2598
2252
            # enabled if its last checker was successful.  Clients
2599
 
            # whose checker succeeded before we stored its state is
2600
 
            # assumed to have successfully run all checkers during
2601
 
            # downtime.
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
2602
2255
            if client["enabled"]:
2603
2256
                if datetime.datetime.utcnow() >= client["expires"]:
2604
2257
                    if not client["last_checked_ok"]:
2605
2258
                        logger.warning(
2606
 
                            "disabling client {} - Client never "
2607
 
                            "performed a successful checker"
2608
 
                            .format(client_name))
 
2259
                            "disabling client {0} - Client never "
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
2609
2262
                        client["enabled"] = False
2610
2263
                    elif client["last_checker_status"] != 0:
2611
2264
                        logger.warning(
2612
 
                            "disabling client {} - Client last"
2613
 
                            " checker failed with error code {}"
2614
 
                            .format(client_name,
 
2265
                            "disabling client {0} - Client "
 
2266
                            "last checker failed with error code {1}"
 
2267
                            .format(client["name"],
2615
2268
                                    client["last_checker_status"]))
2616
2269
                        client["enabled"] = False
2617
2270
                    else:
2619
2272
                                             .utcnow()
2620
2273
                                             + client["timeout"])
2621
2274
                        logger.debug("Last checker succeeded,"
2622
 
                                     " keeping {} enabled"
2623
 
                                     .format(client_name))
 
2275
                                     " keeping {0} enabled"
 
2276
                                     .format(client["name"]))
2624
2277
            try:
2625
2278
                client["secret"] = (
2626
2279
                    pgp.decrypt(client["encrypted_secret"],
2628
2281
                                ["secret"]))
2629
2282
            except PGPError:
2630
2283
                # If decryption fails, we use secret from new settings
2631
 
                logger.debug("Failed to decrypt {} old secret"
 
2284
                logger.debug("Failed to decrypt {0} old secret"
2632
2285
                             .format(client_name))
2633
2286
                client["secret"] = (
2634
2287
                    client_settings[client_name]["secret"])
 
2288
 
2635
2289
    
2636
2290
    # Add/remove clients based on new changes made to config
2637
2291
    for client_name in (set(old_client_settings)
2640
2294
    for client_name in (set(client_settings)
2641
2295
                        - set(old_client_settings)):
2642
2296
        clients_data[client_name] = client_settings[client_name]
2643
 
    
2644
 
    # Create all client objects
2645
 
    for client_name, client in clients_data.items():
 
2297
 
 
2298
    # Create clients all clients
 
2299
    for client_name, client in clients_data.iteritems():
2646
2300
        tcp_server.clients[client_name] = client_class(
2647
 
            name = client_name, settings = client,
2648
 
            server_settings = server_settings)
 
2301
            name = client_name, settings = client)
2649
2302
    
2650
2303
    if not tcp_server.clients:
2651
2304
        logger.warning("No clients defined")
2652
 
    
2653
 
    if not foreground:
2654
 
        if pidfile is not None:
2655
 
            try:
2656
 
                with pidfile:
2657
 
                    pid = os.getpid()
2658
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2659
 
            except IOError:
2660
 
                logger.error("Could not write to file %r with PID %d",
2661
 
                             pidfilename, pid)
2662
 
        del pidfile
 
2305
        
 
2306
    if not debug:
 
2307
        try:
 
2308
            with pidfile:
 
2309
                pid = os.getpid()
 
2310
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2311
            del pidfile
 
2312
        except IOError:
 
2313
            logger.error("Could not write to file %r with PID %d",
 
2314
                         pidfilename, pid)
 
2315
        except NameError:
 
2316
            # "pidfile" was never created
 
2317
            pass
2663
2318
        del pidfilename
 
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2664
2320
    
2665
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2666
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2667
2323
    
2668
2324
    if use_dbus:
2669
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2670
 
                                        "se.bsnet.fukt.Mandos"})
2671
 
        class MandosDBusService(DBusObjectWithProperties):
 
2325
        class MandosDBusService(dbus.service.Object):
2672
2326
            """A D-Bus proxy object"""
2673
2327
            def __init__(self):
2674
2328
                dbus.service.Object.__init__(self, bus, "/")
2675
2329
            _interface = "se.recompile.Mandos"
2676
2330
            
2677
 
            @dbus_interface_annotations(_interface)
2678
 
            def _foo(self):
2679
 
                return { "org.freedesktop.DBus.Property"
2680
 
                         ".EmitsChangedSignal":
2681
 
                             "false"}
2682
 
            
2683
2331
            @dbus.service.signal(_interface, signature="o")
2684
2332
            def ClientAdded(self, objpath):
2685
2333
                "D-Bus signal"
2727
2375
            
2728
2376
            del _interface
2729
2377
        
2730
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2731
2381
    
2732
2382
    def cleanup():
2733
2383
        "Cleanup function; run on exit"
2734
 
        if zeroconf:
2735
 
            service.cleanup()
 
2384
        service.cleanup()
2736
2385
        
2737
2386
        multiprocessing.active_children()
2738
 
        wnull.close()
2739
2387
        if not (tcp_server.clients or client_settings):
2740
2388
            return
2741
2389
        
2752
2400
                
2753
2401
                # A list of attributes that can not be pickled
2754
2402
                # + secret.
2755
 
                exclude = { "bus", "changedstate", "secret",
2756
 
                            "checker", "server_settings" }
 
2403
                exclude = set(("bus", "changedstate", "secret",
 
2404
                               "checker"))
2757
2405
                for name, typ in (inspect.getmembers
2758
2406
                                  (dbus.service.Object)):
2759
2407
                    exclude.add(name)
2768
2416
                del client_settings[client.name]["secret"]
2769
2417
        
2770
2418
        try:
2771
 
            with (tempfile.NamedTemporaryFile
2772
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2773
 
                   dir=os.path.dirname(stored_state_path),
2774
 
                   delete=False)) as stored_state:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
2775
2424
                pickle.dump((clients, client_settings), stored_state)
2776
 
                tempname=stored_state.name
2777
2425
            os.rename(tempname, stored_state_path)
2778
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
2779
2429
            if not debug:
2780
2430
                try:
2781
2431
                    os.remove(tempname)
2782
2432
                except NameError:
2783
2433
                    pass
2784
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2785
 
                logger.warning("Could not save persistent state: {}"
2786
 
                               .format(os.strerror(e.errno)))
2787
 
            else:
2788
 
                logger.warning("Could not save persistent state:",
2789
 
                               exc_info=e)
2790
 
                raise
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
 
2436
                raise e
2791
2437
        
2792
2438
        # Delete all clients, and settings from config
2793
2439
        while tcp_server.clients:
2817
2463
    tcp_server.server_activate()
2818
2464
    
2819
2465
    # Find out what port we got
2820
 
    if zeroconf:
2821
 
        service.port = tcp_server.socket.getsockname()[1]
 
2466
    service.port = tcp_server.socket.getsockname()[1]
2822
2467
    if use_ipv6:
2823
2468
        logger.info("Now listening on address %r, port %d,"
2824
 
                    " flowinfo %d, scope_id %d",
2825
 
                    *tcp_server.socket.getsockname())
 
2469
                    " flowinfo %d, scope_id %d"
 
2470
                    % tcp_server.socket.getsockname())
2826
2471
    else:                       # IPv4
2827
 
        logger.info("Now listening on address %r, port %d",
2828
 
                    *tcp_server.socket.getsockname())
 
2472
        logger.info("Now listening on address %r, port %d"
 
2473
                    % tcp_server.socket.getsockname())
2829
2474
    
2830
2475
    #service.interface = tcp_server.socket.getsockname()[3]
2831
2476
    
2832
2477
    try:
2833
 
        if zeroconf:
2834
 
            # From the Avahi example code
2835
 
            try:
2836
 
                service.activate()
2837
 
            except dbus.exceptions.DBusException as error:
2838
 
                logger.critical("D-Bus Exception", exc_info=error)
2839
 
                cleanup()
2840
 
                sys.exit(1)
2841
 
            # End of Avahi example code
 
2478
        # From the Avahi example code
 
2479
        try:
 
2480
            service.activate()
 
2481
        except dbus.exceptions.DBusException as error:
 
2482
            logger.critical("DBusException: %s", error)
 
2483
            cleanup()
 
2484
            sys.exit(1)
 
2485
        # End of Avahi example code
2842
2486
        
2843
2487
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2844
2488
                             lambda *args, **kwargs:
2848
2492
        logger.debug("Starting main loop")
2849
2493
        main_loop.run()
2850
2494
    except AvahiError as error:
2851
 
        logger.critical("Avahi Error", exc_info=error)
 
2495
        logger.critical("AvahiError: %s", error)
2852
2496
        cleanup()
2853
2497
        sys.exit(1)
2854
2498
    except KeyboardInterrupt: