/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-12-30 17:57:46 UTC
  • mto: (237.7.89 trunk)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111230175746-qz41pq522ljm0vw9
* network-hooks.d/wireless (start): Bug fixes: Don't shadow "$DELAY".
                                    Supress unwanted error messages.
  (modules): Bug fix: Parse new config file syntax.

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