/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-11-27 19:37:54 UTC
  • mto: (237.12.11 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111127193754-4366e18gmi11kew0
* mandos (_timedelta_to_milliseconds): Renamed to
                                       "timedelta_to_milliseconds";
                                       all callers changed.
  (Client._approved): Bug fix; renamed to "approved" without
                      underscore.  All users changed.
  (ProxyClient): Removed superfluous parens in "if" statements.
  (ClientHandler.handle): Bug fix: Emit NewRequest signal *after*
                          client is found, not before.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2013 Teddy Hogeborn
15
 
# Copyright © 2008-2013 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.1"
 
88
 
 
89
version = "1.4.1"
92
90
stored_state_file = "clients.pickle"
93
91
 
94
92
logger = logging.getLogger()
113
111
        return interface_index
114
112
 
115
113
 
116
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
117
115
    """init logger and add loglevel"""
118
116
    
119
117
    syslogger.setFormatter(logging.Formatter
121
119
                            ' %(message)s'))
122
120
    logger.addHandler(syslogger)
123
121
    
124
 
    if debug:
125
 
        console = logging.StreamHandler()
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
 
                                               ' [%(process)d]:'
128
 
                                               ' %(levelname)s:'
129
 
                                               ' %(message)s'))
130
 
        logger.addHandler(console)
 
122
    console = logging.StreamHandler()
 
123
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                           ' [%(process)d]:'
 
125
                                           ' %(levelname)s:'
 
126
                                           ' %(message)s'))
 
127
    logger.addHandler(console)
131
128
    logger.setLevel(level)
132
129
 
133
130
 
134
 
class PGPError(Exception):
135
 
    """Exception if encryption/decryption fails"""
 
131
class CryptoError(Exception):
136
132
    pass
137
133
 
138
134
 
139
 
class PGPEngine(object):
 
135
class Crypto(object):
140
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
137
    def __init__(self):
 
138
        self.gnupg = GnuPGInterface.GnuPG()
142
139
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--force-mdc',
146
 
                          '--quiet',
147
 
                          '--no-use-agent']
 
140
        self.gnupg = GnuPGInterface.GnuPG()
 
141
        self.gnupg.options.meta_interactive = False
 
142
        self.gnupg.options.homedir = self.tempdir
 
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
144
                                              '--quiet'])
148
145
    
149
146
    def __enter__(self):
150
147
        return self
151
148
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
153
150
        self._cleanup()
154
151
        return False
155
152
    
175
172
        return b"mandos" + binascii.hexlify(password)
176
173
    
177
174
    def encrypt(self, data, password):
178
 
        passphrase = self.password_encode(password)
179
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
180
 
                                         ) as passfile:
181
 
            passfile.write(passphrase)
182
 
            passfile.flush()
183
 
            proc = subprocess.Popen(['gpg', '--symmetric',
184
 
                                     '--passphrase-file',
185
 
                                     passfile.name]
186
 
                                    + self.gnupgargs,
187
 
                                    stdin = subprocess.PIPE,
188
 
                                    stdout = subprocess.PIPE,
189
 
                                    stderr = subprocess.PIPE)
190
 
            ciphertext, err = proc.communicate(input = data)
191
 
        if proc.returncode != 0:
192
 
            raise PGPError(err)
 
175
        self.gnupg.passphrase = self.password_encode(password)
 
176
        with open(os.devnull) as devnull:
 
177
            try:
 
178
                proc = self.gnupg.run(['--symmetric'],
 
179
                                      create_fhs=['stdin', 'stdout'],
 
180
                                      attach_fhs={'stderr': devnull})
 
181
                with contextlib.closing(proc.handles['stdin']) as f:
 
182
                    f.write(data)
 
183
                with contextlib.closing(proc.handles['stdout']) as f:
 
184
                    ciphertext = f.read()
 
185
                proc.wait()
 
186
            except IOError as e:
 
187
                raise CryptoError(e)
 
188
        self.gnupg.passphrase = None
193
189
        return ciphertext
194
190
    
195
191
    def decrypt(self, data, password):
196
 
        passphrase = self.password_encode(password)
197
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
198
 
                                         ) as passfile:
199
 
            passfile.write(passphrase)
200
 
            passfile.flush()
201
 
            proc = subprocess.Popen(['gpg', '--decrypt',
202
 
                                     '--passphrase-file',
203
 
                                     passfile.name]
204
 
                                    + self.gnupgargs,
205
 
                                    stdin = subprocess.PIPE,
206
 
                                    stdout = subprocess.PIPE,
207
 
                                    stderr = subprocess.PIPE)
208
 
            decrypted_plaintext, err = proc.communicate(input
209
 
                                                        = data)
210
 
        if proc.returncode != 0:
211
 
            raise PGPError(err)
 
192
        self.gnupg.passphrase = self.password_encode(password)
 
193
        with open(os.devnull) as devnull:
 
194
            try:
 
195
                proc = self.gnupg.run(['--decrypt'],
 
196
                                      create_fhs=['stdin', 'stdout'],
 
197
                                      attach_fhs={'stderr': devnull})
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
199
                    f.write(data)
 
200
                with contextlib.closing(proc.handles['stdout']) as f:
 
201
                    decrypted_plaintext = f.read()
 
202
                proc.wait()
 
203
            except IOError as e:
 
204
                raise CryptoError(e)
 
205
        self.gnupg.passphrase = None
212
206
        return decrypted_plaintext
213
207
 
214
208
 
 
209
 
215
210
class AvahiError(Exception):
216
211
    def __init__(self, value, *args, **kwargs):
217
212
        self.value = value
234
229
               Used to optionally bind to the specified interface.
235
230
    name: string; Example: 'Mandos'
236
231
    type: string; Example: '_mandos._tcp'.
237
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
232
                  See <http://www.dns-sd.org/ServiceTypes.html>
238
233
    port: integer; what port to announce
239
234
    TXT: list of strings; TXT record for the service
240
235
    domain: string; Domain to publish on, default to .local if empty.
246
241
    server: D-Bus Server
247
242
    bus: dbus.SystemBus()
248
243
    """
249
 
    
250
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
245
                 servicetype = None, port = None, TXT = None,
252
246
                 domain = "", host = "", max_renames = 32768,
265
259
        self.server = None
266
260
        self.bus = bus
267
261
        self.entry_group_state_changed_match = None
268
 
    
269
262
    def rename(self):
270
263
        """Derived from the Avahi example code"""
271
264
        if self.rename_count >= self.max_renames:
281
274
        try:
282
275
            self.add()
283
276
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
285
278
            self.cleanup()
286
279
            os._exit(1)
287
280
        self.rename_count += 1
288
 
    
289
281
    def remove(self):
290
282
        """Derived from the Avahi example code"""
291
283
        if self.entry_group_state_changed_match is not None:
293
285
            self.entry_group_state_changed_match = None
294
286
        if self.group is not None:
295
287
            self.group.Reset()
296
 
    
297
288
    def add(self):
298
289
        """Derived from the Avahi example code"""
299
290
        self.remove()
316
307
            dbus.UInt16(self.port),
317
308
            avahi.string_array_to_txt_array(self.TXT))
318
309
        self.group.Commit()
319
 
    
320
310
    def entry_group_state_changed(self, state, error):
321
311
        """Derived from the Avahi example code"""
322
312
        logger.debug("Avahi entry group state change: %i", state)
329
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
320
            logger.critical("Avahi: Error in group state changed %s",
331
321
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
335
324
    def cleanup(self):
336
325
        """Derived from the Avahi example code"""
337
326
        if self.group is not None:
342
331
                pass
343
332
            self.group = None
344
333
        self.remove()
345
 
    
346
334
    def server_state_changed(self, state, error=None):
347
335
        """Derived from the Avahi example code"""
348
336
        logger.debug("Avahi server state change: %i", state)
367
355
                logger.debug("Unknown state: %r", state)
368
356
            else:
369
357
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
358
    def activate(self):
372
359
        """Derived from the Avahi example code"""
373
360
        if self.server is None:
380
367
                                 self.server_state_changed)
381
368
        self.server_state_changed(self.server.GetState())
382
369
 
383
 
 
384
370
class AvahiServiceToSyslog(AvahiService):
385
371
    def rename(self):
386
372
        """Add the new name to the syslog messages"""
387
373
        ret = AvahiService.rename(self)
388
374
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
392
378
        return ret
393
379
 
394
 
 
395
380
def timedelta_to_milliseconds(td):
396
381
    "Convert a datetime.timedelta() to milliseconds"
397
382
    return ((td.days * 24 * 60 * 60 * 1000)
398
383
            + (td.seconds * 1000)
399
384
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
385
        
402
386
class Client(object):
403
387
    """A representation of a client host served by this server.
404
388
    
427
411
    interval:   datetime.timedelta(); How often to start a new checker
428
412
    last_approval_request: datetime.datetime(); (UTC) or None
429
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
414
 
430
415
    last_checker_status: integer between 0 and 255 reflecting exit
431
416
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
433
418
    last_enabled: datetime.datetime(); (UTC) or None
434
419
    name:       string; from the config file, used in log messages and
435
420
                        D-Bus identifiers
436
421
    secret:     bytestring; sent verbatim (over TLS) to client
437
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
423
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
440
425
    runtime_expansions: Allowed attributes for runtime expansion.
441
426
    expires:    datetime.datetime(); time (UTC) when a client will be
442
427
                disabled, or None
443
 
    server_settings: The server_settings dict from main()
444
428
    """
445
429
    
446
430
    runtime_expansions = ("approval_delay", "approval_duration",
447
 
                          "created", "enabled", "expires",
448
 
                          "fingerprint", "host", "interval",
449
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
450
433
                          "last_enabled", "name", "timeout")
451
 
    client_defaults = { "timeout": "PT5M",
452
 
                        "extended_timeout": "PT15M",
453
 
                        "interval": "PT2M",
454
 
                        "checker": "fping -q -- %%(host)s",
455
 
                        "host": "",
456
 
                        "approval_delay": "PT0S",
457
 
                        "approval_duration": "PT1S",
458
 
                        "approved_by_default": "True",
459
 
                        "enabled": "True",
460
 
                        }
461
434
    
462
435
    def timeout_milliseconds(self):
463
436
        "Return the 'timeout' attribute in milliseconds"
474
447
    def approval_delay_milliseconds(self):
475
448
        return timedelta_to_milliseconds(self.approval_delay)
476
449
    
477
 
    @staticmethod
478
 
    def config_parser(config):
479
 
        """Construct a new dict of client settings of this form:
480
 
        { client_name: {setting_name: value, ...}, ...}
481
 
        with exceptions for any special settings as defined above.
482
 
        NOTE: Must be a pure function. Must return the same result
483
 
        value given the same arguments.
484
 
        """
485
 
        settings = {}
486
 
        for client_name in config.sections():
487
 
            section = dict(config.items(client_name))
488
 
            client = settings[client_name] = {}
489
 
            
490
 
            client["host"] = section["host"]
491
 
            # Reformat values from string types to Python types
492
 
            client["approved_by_default"] = config.getboolean(
493
 
                client_name, "approved_by_default")
494
 
            client["enabled"] = config.getboolean(client_name,
495
 
                                                  "enabled")
496
 
            
497
 
            client["fingerprint"] = (section["fingerprint"].upper()
498
 
                                     .replace(" ", ""))
499
 
            if "secret" in section:
500
 
                client["secret"] = section["secret"].decode("base64")
501
 
            elif "secfile" in section:
502
 
                with open(os.path.expanduser(os.path.expandvars
503
 
                                             (section["secfile"])),
504
 
                          "rb") as secfile:
505
 
                    client["secret"] = secfile.read()
506
 
            else:
507
 
                raise TypeError("No secret or secfile for section {0}"
508
 
                                .format(section))
509
 
            client["timeout"] = string_to_delta(section["timeout"])
510
 
            client["extended_timeout"] = string_to_delta(
511
 
                section["extended_timeout"])
512
 
            client["interval"] = string_to_delta(section["interval"])
513
 
            client["approval_delay"] = string_to_delta(
514
 
                section["approval_delay"])
515
 
            client["approval_duration"] = string_to_delta(
516
 
                section["approval_duration"])
517
 
            client["checker_command"] = section["checker"]
518
 
            client["last_approval_request"] = None
519
 
            client["last_checked_ok"] = None
520
 
            client["last_checker_status"] = -2
521
 
        
522
 
        return settings
523
 
    
524
 
    def __init__(self, settings, name = None, server_settings=None):
 
450
    def __init__(self, name = None, config=None):
 
451
        """Note: the 'checker' key in 'config' sets the
 
452
        'checker_command' attribute and *not* the 'checker'
 
453
        attribute."""
525
454
        self.name = name
526
 
        if server_settings is None:
527
 
            server_settings = {}
528
 
        self.server_settings = server_settings
529
 
        # adding all client settings
530
 
        for setting, value in settings.iteritems():
531
 
            setattr(self, setting, value)
532
 
        
533
 
        if self.enabled:
534
 
            if not hasattr(self, "last_enabled"):
535
 
                self.last_enabled = datetime.datetime.utcnow()
536
 
            if not hasattr(self, "expires"):
537
 
                self.expires = (datetime.datetime.utcnow()
538
 
                                + self.timeout)
539
 
        else:
540
 
            self.last_enabled = None
541
 
            self.expires = None
542
 
        
 
455
        if config is None:
 
456
            config = {}
543
457
        logger.debug("Creating client %r", self.name)
544
458
        # Uppercase and remove spaces from fingerprint for later
545
459
        # comparison purposes with return value from the fingerprint()
546
460
        # function
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
462
                            .replace(" ", ""))
547
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
548
 
        self.created = settings.get("created",
549
 
                                    datetime.datetime.utcnow())
550
 
        
551
 
        # attributes specific for this server instance
 
464
        if "secret" in config:
 
465
            self.secret = config["secret"].decode("base64")
 
466
        elif "secfile" in config:
 
467
            with open(os.path.expanduser(os.path.expandvars
 
468
                                         (config["secfile"])),
 
469
                      "rb") as secfile:
 
470
                self.secret = secfile.read()
 
471
        else:
 
472
            raise TypeError("No secret or secfile for client %s"
 
473
                            % self.name)
 
474
        self.host = config.get("host", "")
 
475
        self.created = datetime.datetime.utcnow()
 
476
        self.enabled = config.get("enabled", True)
 
477
        self.last_approval_request = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
 
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
 
484
        self.timeout = string_to_delta(config["timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
 
487
        self.interval = string_to_delta(config["interval"])
552
488
        self.checker = None
553
489
        self.checker_initiator_tag = None
554
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
555
495
        self.checker_callback_tag = None
 
496
        self.checker_command = config["checker"]
556
497
        self.current_checker_command = None
557
498
        self.approved = None
 
499
        self.approved_by_default = config.get("approved_by_default",
 
500
                                              True)
558
501
        self.approvals_pending = 0
 
502
        self.approval_delay = string_to_delta(
 
503
            config["approval_delay"])
 
504
        self.approval_duration = string_to_delta(
 
505
            config["approval_duration"])
559
506
        self.changedstate = (multiprocessing_manager
560
507
                             .Condition(multiprocessing_manager
561
508
                                        .Lock()))
581
528
        if getattr(self, "enabled", False):
582
529
            # Already enabled
583
530
            return
 
531
        self.send_changedstate()
584
532
        self.expires = datetime.datetime.utcnow() + self.timeout
585
533
        self.enabled = True
586
534
        self.last_enabled = datetime.datetime.utcnow()
587
535
        self.init_checker()
588
 
        self.send_changedstate()
589
536
    
590
537
    def disable(self, quiet=True):
591
538
        """Disable this client."""
592
539
        if not getattr(self, "enabled", False):
593
540
            return False
594
541
        if not quiet:
 
542
            self.send_changedstate()
 
543
        if not quiet:
595
544
            logger.info("Disabling client %s", self.name)
596
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
545
        if getattr(self, "disable_initiator_tag", False):
597
546
            gobject.source_remove(self.disable_initiator_tag)
598
547
            self.disable_initiator_tag = None
599
548
        self.expires = None
600
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
549
        if getattr(self, "checker_initiator_tag", False):
601
550
            gobject.source_remove(self.checker_initiator_tag)
602
551
            self.checker_initiator_tag = None
603
552
        self.stop_checker()
604
553
        self.enabled = False
605
 
        if not quiet:
606
 
            self.send_changedstate()
607
554
        # Do not run this again if called by a gobject.timeout_add
608
555
        return False
609
556
    
613
560
    def init_checker(self):
614
561
        # Schedule a new checker to be started an 'interval' from now,
615
562
        # and every interval from then on.
616
 
        if self.checker_initiator_tag is not None:
617
 
            gobject.source_remove(self.checker_initiator_tag)
618
563
        self.checker_initiator_tag = (gobject.timeout_add
619
564
                                      (self.interval_milliseconds(),
620
565
                                       self.start_checker))
621
566
        # Schedule a disable() when 'timeout' has passed
622
 
        if self.disable_initiator_tag is not None:
623
 
            gobject.source_remove(self.disable_initiator_tag)
624
567
        self.disable_initiator_tag = (gobject.timeout_add
625
568
                                   (self.timeout_milliseconds(),
626
569
                                    self.disable))
632
575
        self.checker_callback_tag = None
633
576
        self.checker = None
634
577
        if os.WIFEXITED(condition):
635
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
636
579
            if self.last_checker_status == 0:
637
580
                logger.info("Checker for %(name)s succeeded",
638
581
                            vars(self))
645
588
            logger.warning("Checker for %(name)s crashed?",
646
589
                           vars(self))
647
590
    
648
 
    def checked_ok(self):
649
 
        """Assert that the client has been seen, alive and well."""
650
 
        self.last_checked_ok = datetime.datetime.utcnow()
651
 
        self.last_checker_status = 0
652
 
        self.bump_timeout()
653
 
    
654
 
    def bump_timeout(self, timeout=None):
655
 
        """Bump up the timeout for this client."""
 
591
    def checked_ok(self, timeout=None):
 
592
        """Bump up the timeout for this client.
 
593
        
 
594
        This should only be called when the client has been seen,
 
595
        alive and well.
 
596
        """
656
597
        if timeout is None:
657
598
            timeout = self.timeout
 
599
        self.last_checked_ok = datetime.datetime.utcnow()
658
600
        if self.disable_initiator_tag is not None:
659
601
            gobject.source_remove(self.disable_initiator_tag)
660
 
            self.disable_initiator_tag = None
661
602
        if getattr(self, "enabled", False):
662
603
            self.disable_initiator_tag = (gobject.timeout_add
663
604
                                          (timedelta_to_milliseconds
673
614
        If a checker already exists, leave it running and do
674
615
        nothing."""
675
616
        # The reason for not killing a running checker is that if we
676
 
        # did that, and if a checker (for some reason) started running
677
 
        # slowly and taking more than 'interval' time, then the client
678
 
        # would inevitably timeout, since no checker would get a
679
 
        # chance to run to completion.  If we instead leave running
 
617
        # did that, then if a checker (for some reason) started
 
618
        # running slowly and taking more than 'interval' time, the
 
619
        # client would inevitably timeout, since no checker would get
 
620
        # a chance to run to completion.  If we instead leave running
680
621
        # checkers alone, the checker would have to take more time
681
622
        # than 'timeout' for the client to be disabled, which is as it
682
623
        # should be.
696
637
                                      self.current_checker_command)
697
638
        # Start a new checker if needed
698
639
        if self.checker is None:
699
 
            # Escape attributes for the shell
700
 
            escaped_attrs = dict(
701
 
                (attr, re.escape(unicode(getattr(self, attr))))
702
 
                for attr in
703
 
                self.runtime_expansions)
704
640
            try:
705
 
                command = self.checker_command % escaped_attrs
706
 
            except TypeError as error:
707
 
                logger.error('Could not format string "%s"',
708
 
                             self.checker_command, exc_info=error)
709
 
                return True # Try again later
 
641
                # In case checker_command has exactly one % operator
 
642
                command = self.checker_command % self.host
 
643
            except TypeError:
 
644
                # Escape attributes for the shell
 
645
                escaped_attrs = dict(
 
646
                    (attr,
 
647
                     re.escape(unicode(str(getattr(self, attr, "")),
 
648
                                       errors=
 
649
                                       'replace')))
 
650
                    for attr in
 
651
                    self.runtime_expansions)
 
652
                
 
653
                try:
 
654
                    command = self.checker_command % escaped_attrs
 
655
                except TypeError as error:
 
656
                    logger.error('Could not format string "%s":'
 
657
                                 ' %s', self.checker_command, error)
 
658
                    return True # Try again later
710
659
            self.current_checker_command = command
711
660
            try:
712
661
                logger.info("Starting checker %r for %s",
715
664
                # in normal mode, that is already done by daemon(),
716
665
                # and in debug mode we don't want to.  (Stdin is
717
666
                # always replaced by /dev/null.)
718
 
                # The exception is when not debugging but nevertheless
719
 
                # running in the foreground; use the previously
720
 
                # created wnull.
721
 
                popen_args = {}
722
 
                if (not self.server_settings["debug"]
723
 
                    and self.server_settings["foreground"]):
724
 
                    popen_args.update({"stdout": wnull,
725
 
                                       "stderr": wnull })
726
667
                self.checker = subprocess.Popen(command,
727
668
                                                close_fds=True,
728
 
                                                shell=True, cwd="/",
729
 
                                                **popen_args)
730
 
            except OSError as error:
731
 
                logger.error("Failed to start subprocess",
732
 
                             exc_info=error)
733
 
                return True
734
 
            self.checker_callback_tag = (gobject.child_watch_add
735
 
                                         (self.checker.pid,
736
 
                                          self.checker_callback,
737
 
                                          data=command))
738
 
            # The checker may have completed before the gobject
739
 
            # watch was added.  Check for this.
740
 
            try:
 
669
                                                shell=True, cwd="/")
 
670
                self.checker_callback_tag = (gobject.child_watch_add
 
671
                                             (self.checker.pid,
 
672
                                              self.checker_callback,
 
673
                                              data=command))
 
674
                # The checker may have completed before the gobject
 
675
                # watch was added.  Check for this.
741
676
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
677
                if pid:
 
678
                    gobject.source_remove(self.checker_callback_tag)
 
679
                    self.checker_callback(pid, status, command)
742
680
            except OSError as error:
743
 
                if error.errno == errno.ECHILD:
744
 
                    # This should never happen
745
 
                    logger.error("Child process vanished",
746
 
                                 exc_info=error)
747
 
                    return True
748
 
                raise
749
 
            if pid:
750
 
                gobject.source_remove(self.checker_callback_tag)
751
 
                self.checker_callback(pid, status, command)
 
681
                logger.error("Failed to start subprocess: %s",
 
682
                             error)
752
683
        # Re-run this periodically if run by gobject.timeout_add
753
684
        return True
754
685
    
761
692
            return
762
693
        logger.debug("Stopping checker for %(name)s", vars(self))
763
694
        try:
764
 
            self.checker.terminate()
 
695
            os.kill(self.checker.pid, signal.SIGTERM)
765
696
            #time.sleep(0.5)
766
697
            #if self.checker.poll() is None:
767
 
            #    self.checker.kill()
 
698
            #    os.kill(self.checker.pid, signal.SIGKILL)
768
699
        except OSError as error:
769
700
            if error.errno != errno.ESRCH: # No such process
770
701
                raise
787
718
    # "Set" method, so we fail early here:
788
719
    if byte_arrays and signature != "ay":
789
720
        raise ValueError("Byte arrays not supported for non-'ay'"
790
 
                         " signature {0!r}".format(signature))
 
721
                         " signature %r" % signature)
791
722
    def decorator(func):
792
723
        func._dbus_is_property = True
793
724
        func._dbus_interface = dbus_interface
801
732
    return decorator
802
733
 
803
734
 
804
 
def dbus_interface_annotations(dbus_interface):
805
 
    """Decorator for marking functions returning interface annotations
806
 
    
807
 
    Usage:
808
 
    
809
 
    @dbus_interface_annotations("org.example.Interface")
810
 
    def _foo(self):  # Function name does not matter
811
 
        return {"org.freedesktop.DBus.Deprecated": "true",
812
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
813
 
                    "false"}
814
 
    """
815
 
    def decorator(func):
816
 
        func._dbus_is_interface = True
817
 
        func._dbus_interface = dbus_interface
818
 
        func._dbus_name = dbus_interface
819
 
        return func
820
 
    return decorator
821
 
 
822
 
 
823
 
def dbus_annotations(annotations):
824
 
    """Decorator to annotate D-Bus methods, signals or properties
825
 
    Usage:
826
 
    
827
 
    @dbus_service_property("org.example.Interface", signature="b",
828
 
                           access="r")
829
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
 
                        "org.freedesktop.DBus.Property."
831
 
                        "EmitsChangedSignal": "false"})
832
 
    def Property_dbus_property(self):
833
 
        return dbus.Boolean(False)
834
 
    """
835
 
    def decorator(func):
836
 
        func._dbus_annotations = annotations
837
 
        return func
838
 
    return decorator
839
 
 
840
 
 
841
735
class DBusPropertyException(dbus.exceptions.DBusException):
842
736
    """A base class for D-Bus property-related exceptions
843
737
    """
866
760
    """
867
761
    
868
762
    @staticmethod
869
 
    def _is_dbus_thing(thing):
870
 
        """Returns a function testing if an attribute is a D-Bus thing
871
 
        
872
 
        If called like _is_dbus_thing("method") it returns a function
873
 
        suitable for use as predicate to inspect.getmembers().
874
 
        """
875
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
876
 
                                   False)
 
763
    def _is_dbus_property(obj):
 
764
        return getattr(obj, "_dbus_is_property", False)
877
765
    
878
 
    def _get_all_dbus_things(self, thing):
 
766
    def _get_all_dbus_properties(self):
879
767
        """Returns a generator of (name, attribute) pairs
880
768
        """
881
 
        return ((getattr(athing.__get__(self), "_dbus_name",
882
 
                         name),
883
 
                 athing.__get__(self))
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
884
770
                for cls in self.__class__.__mro__
885
 
                for name, athing in
886
 
                inspect.getmembers(cls,
887
 
                                   self._is_dbus_thing(thing)))
 
771
                for name, prop in
 
772
                inspect.getmembers(cls, self._is_dbus_property))
888
773
    
889
774
    def _get_dbus_property(self, interface_name, property_name):
890
775
        """Returns a bound method if one exists which is a D-Bus
892
777
        """
893
778
        for cls in  self.__class__.__mro__:
894
779
            for name, value in (inspect.getmembers
895
 
                                (cls,
896
 
                                 self._is_dbus_thing("property"))):
 
780
                                (cls, self._is_dbus_property)):
897
781
                if (value._dbus_name == property_name
898
782
                    and value._dbus_interface == interface_name):
899
783
                    return value.__get__(self)
928
812
            # signatures other than "ay".
929
813
            if prop._dbus_signature != "ay":
930
814
                raise ValueError
931
 
            value = dbus.ByteArray(b''.join(chr(byte)
932
 
                                            for byte in value))
 
815
            value = dbus.ByteArray(''.join(unichr(byte)
 
816
                                           for byte in value))
933
817
        prop(value)
934
818
    
935
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
941
825
        Note: Will not include properties with access="write".
942
826
        """
943
827
        properties = {}
944
 
        for name, prop in self._get_all_dbus_things("property"):
 
828
        for name, prop in self._get_all_dbus_properties():
945
829
            if (interface_name
946
830
                and interface_name != prop._dbus_interface):
947
831
                # Interface non-empty but did not match
962
846
                         path_keyword='object_path',
963
847
                         connection_keyword='connection')
964
848
    def Introspect(self, object_path, connection):
965
 
        """Overloading of standard D-Bus method.
966
 
        
967
 
        Inserts property tags and interface annotation tags.
 
849
        """Standard D-Bus method, overloaded to insert property tags.
968
850
        """
969
851
        xmlstring = dbus.service.Object.Introspect(self, object_path,
970
852
                                                   connection)
977
859
                e.setAttribute("access", prop._dbus_access)
978
860
                return e
979
861
            for if_tag in document.getElementsByTagName("interface"):
980
 
                # Add property tags
981
862
                for tag in (make_tag(document, name, prop)
982
863
                            for name, prop
983
 
                            in self._get_all_dbus_things("property")
 
864
                            in self._get_all_dbus_properties()
984
865
                            if prop._dbus_interface
985
866
                            == if_tag.getAttribute("name")):
986
867
                    if_tag.appendChild(tag)
987
 
                # Add annotation tags
988
 
                for typ in ("method", "signal", "property"):
989
 
                    for tag in if_tag.getElementsByTagName(typ):
990
 
                        annots = dict()
991
 
                        for name, prop in (self.
992
 
                                           _get_all_dbus_things(typ)):
993
 
                            if (name == tag.getAttribute("name")
994
 
                                and prop._dbus_interface
995
 
                                == if_tag.getAttribute("name")):
996
 
                                annots.update(getattr
997
 
                                              (prop,
998
 
                                               "_dbus_annotations",
999
 
                                               {}))
1000
 
                        for name, value in annots.iteritems():
1001
 
                            ann_tag = document.createElement(
1002
 
                                "annotation")
1003
 
                            ann_tag.setAttribute("name", name)
1004
 
                            ann_tag.setAttribute("value", value)
1005
 
                            tag.appendChild(ann_tag)
1006
 
                # Add interface annotation tags
1007
 
                for annotation, value in dict(
1008
 
                    itertools.chain.from_iterable(
1009
 
                        annotations().iteritems()
1010
 
                        for name, annotations in
1011
 
                        self._get_all_dbus_things("interface")
1012
 
                        if name == if_tag.getAttribute("name")
1013
 
                        )).iteritems():
1014
 
                    ann_tag = document.createElement("annotation")
1015
 
                    ann_tag.setAttribute("name", annotation)
1016
 
                    ann_tag.setAttribute("value", value)
1017
 
                    if_tag.appendChild(ann_tag)
1018
868
                # Add the names to the return values for the
1019
869
                # "org.freedesktop.DBus.Properties" methods
1020
870
                if (if_tag.getAttribute("name")
1035
885
        except (AttributeError, xml.dom.DOMException,
1036
886
                xml.parsers.expat.ExpatError) as error:
1037
887
            logger.error("Failed to override Introspection method",
1038
 
                         exc_info=error)
 
888
                         error)
1039
889
        return xmlstring
1040
890
 
1041
891
 
1042
 
def datetime_to_dbus(dt, variant_level=0):
 
892
def datetime_to_dbus (dt, variant_level=0):
1043
893
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1044
894
    if dt is None:
1045
895
        return dbus.String("", variant_level = variant_level)
1047
897
                       variant_level=variant_level)
1048
898
 
1049
899
 
1050
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1051
 
    """A class decorator; applied to a subclass of
1052
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1053
 
    interface names according to the "alt_interface_names" mapping.
1054
 
    Usage:
1055
 
    
1056
 
    @alternate_dbus_interfaces({"org.example.Interface":
1057
 
                                    "net.example.AlternateInterface"})
1058
 
    class SampleDBusObject(dbus.service.Object):
1059
 
        @dbus.service.method("org.example.Interface")
1060
 
        def SampleDBusMethod():
1061
 
            pass
1062
 
    
1063
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1064
 
    reachable via two interfaces: "org.example.Interface" and
1065
 
    "net.example.AlternateInterface", the latter of which will have
1066
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1067
 
    "true", unless "deprecate" is passed with a False value.
1068
 
    
1069
 
    This works for methods and signals, and also for D-Bus properties
1070
 
    (from DBusObjectWithProperties) and interfaces (from the
1071
 
    dbus_interface_annotations decorator).
 
900
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
901
                                  .__metaclass__):
 
902
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
903
    will add additional D-Bus attributes matching a certain pattern.
1072
904
    """
1073
 
    def wrapper(cls):
1074
 
        for orig_interface_name, alt_interface_name in (
1075
 
            alt_interface_names.iteritems()):
1076
 
            attr = {}
1077
 
            interface_names = set()
1078
 
            # Go though all attributes of the class
1079
 
            for attrname, attribute in inspect.getmembers(cls):
 
905
    def __new__(mcs, name, bases, attr):
 
906
        # Go through all the base classes which could have D-Bus
 
907
        # methods, signals, or properties in them
 
908
        for base in (b for b in bases
 
909
                     if issubclass(b, dbus.service.Object)):
 
910
            # Go though all attributes of the base class
 
911
            for attrname, attribute in inspect.getmembers(base):
1080
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
1081
913
                # with the wrong interface name
1082
914
                if (not hasattr(attribute, "_dbus_interface")
1083
915
                    or not attribute._dbus_interface
1084
 
                    .startswith(orig_interface_name)):
 
916
                    .startswith("se.recompile.Mandos")):
1085
917
                    continue
1086
918
                # Create an alternate D-Bus interface name based on
1087
919
                # the current name
1088
920
                alt_interface = (attribute._dbus_interface
1089
 
                                 .replace(orig_interface_name,
1090
 
                                          alt_interface_name))
1091
 
                interface_names.add(alt_interface)
 
921
                                 .replace("se.recompile.Mandos",
 
922
                                          "se.bsnet.fukt.Mandos"))
1092
923
                # Is this a D-Bus signal?
1093
924
                if getattr(attribute, "_dbus_is_signal", False):
1094
 
                    # Extract the original non-method undecorated
1095
 
                    # function by black magic
 
925
                    # Extract the original non-method function by
 
926
                    # black magic
1096
927
                    nonmethod_func = (dict(
1097
928
                            zip(attribute.func_code.co_freevars,
1098
929
                                attribute.__closure__))["func"]
1109
940
                                nonmethod_func.func_name,
1110
941
                                nonmethod_func.func_defaults,
1111
942
                                nonmethod_func.func_closure)))
1112
 
                    # Copy annotations, if any
1113
 
                    try:
1114
 
                        new_function._dbus_annotations = (
1115
 
                            dict(attribute._dbus_annotations))
1116
 
                    except AttributeError:
1117
 
                        pass
1118
943
                    # Define a creator of a function to call both the
1119
 
                    # original and alternate functions, so both the
1120
 
                    # original and alternate signals gets sent when
1121
 
                    # the function is called
 
944
                    # old and new functions, so both the old and new
 
945
                    # signals gets sent when the function is called
1122
946
                    def fixscope(func1, func2):
1123
947
                        """This function is a scope container to pass
1124
948
                        func1 and func2 to the "call_both" function
1131
955
                        return call_both
1132
956
                    # Create the "call_both" function and add it to
1133
957
                    # the class
1134
 
                    attr[attrname] = fixscope(attribute, new_function)
 
958
                    attr[attrname] = fixscope(attribute,
 
959
                                              new_function)
1135
960
                # Is this a D-Bus method?
1136
961
                elif getattr(attribute, "_dbus_is_method", False):
1137
962
                    # Create a new, but exactly alike, function
1148
973
                                        attribute.func_name,
1149
974
                                        attribute.func_defaults,
1150
975
                                        attribute.func_closure)))
1151
 
                    # Copy annotations, if any
1152
 
                    try:
1153
 
                        attr[attrname]._dbus_annotations = (
1154
 
                            dict(attribute._dbus_annotations))
1155
 
                    except AttributeError:
1156
 
                        pass
1157
976
                # Is this a D-Bus property?
1158
977
                elif getattr(attribute, "_dbus_is_property", False):
1159
978
                    # Create a new, but exactly alike, function
1173
992
                                        attribute.func_name,
1174
993
                                        attribute.func_defaults,
1175
994
                                        attribute.func_closure)))
1176
 
                    # Copy annotations, if any
1177
 
                    try:
1178
 
                        attr[attrname]._dbus_annotations = (
1179
 
                            dict(attribute._dbus_annotations))
1180
 
                    except AttributeError:
1181
 
                        pass
1182
 
                # Is this a D-Bus interface?
1183
 
                elif getattr(attribute, "_dbus_is_interface", False):
1184
 
                    # Create a new, but exactly alike, function
1185
 
                    # object.  Decorate it to be a new D-Bus interface
1186
 
                    # with the alternate D-Bus interface name.  Add it
1187
 
                    # to the class.
1188
 
                    attr[attrname] = (dbus_interface_annotations
1189
 
                                      (alt_interface)
1190
 
                                      (types.FunctionType
1191
 
                                       (attribute.func_code,
1192
 
                                        attribute.func_globals,
1193
 
                                        attribute.func_name,
1194
 
                                        attribute.func_defaults,
1195
 
                                        attribute.func_closure)))
1196
 
            if deprecate:
1197
 
                # Deprecate all alternate interfaces
1198
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1199
 
                for interface_name in interface_names:
1200
 
                    @dbus_interface_annotations(interface_name)
1201
 
                    def func(self):
1202
 
                        return { "org.freedesktop.DBus.Deprecated":
1203
 
                                     "true" }
1204
 
                    # Find an unused name
1205
 
                    for aname in (iname.format(i)
1206
 
                                  for i in itertools.count()):
1207
 
                        if aname not in attr:
1208
 
                            attr[aname] = func
1209
 
                            break
1210
 
            if interface_names:
1211
 
                # Replace the class with a new subclass of it with
1212
 
                # methods, signals, etc. as created above.
1213
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1214
 
                           (cls,), attr)
1215
 
        return cls
1216
 
    return wrapper
1217
 
 
1218
 
 
1219
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
 
                                "se.bsnet.fukt.Mandos"})
 
995
        return type.__new__(mcs, name, bases, attr)
 
996
 
 
997
 
1221
998
class ClientDBus(Client, DBusObjectWithProperties):
1222
999
    """A Client class using D-Bus
1223
1000
    
1234
1011
    def __init__(self, bus = None, *args, **kwargs):
1235
1012
        self.bus = bus
1236
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
 
1015
        self._approvals_pending = 0
1237
1016
        # Only now, when this client is initialized, can it show up on
1238
1017
        # the D-Bus
1239
1018
        client_object_name = unicode(self.name).translate(
1243
1022
                                 ("/clients/" + client_object_name))
1244
1023
        DBusObjectWithProperties.__init__(self, self.bus,
1245
1024
                                          self.dbus_object_path)
1246
 
    
 
1025
        
1247
1026
    def notifychangeproperty(transform_func,
1248
1027
                             dbus_name, type_func=lambda x: x,
1249
1028
                             variant_level=1):
1272
1051
        
1273
1052
        return property(lambda self: getattr(self, attrname), setter)
1274
1053
    
 
1054
    
1275
1055
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1276
1056
    approvals_pending = notifychangeproperty(dbus.Boolean,
1277
1057
                                             "ApprovalPending",
1284
1064
                                       checker is not None)
1285
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1286
1066
                                           "LastCheckedOK")
1287
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1288
 
                                               "LastCheckerStatus")
1289
1067
    last_approval_request = notifychangeproperty(
1290
1068
        datetime_to_dbus, "LastApprovalRequest")
1291
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
1292
1070
                                               "ApprovedByDefault")
1293
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
1294
1072
                                          "ApprovalDelay",
1295
1073
                                          type_func =
1296
1074
                                          timedelta_to_milliseconds)
1297
1075
    approval_duration = notifychangeproperty(
1298
 
        dbus.UInt64, "ApprovalDuration",
 
1076
        dbus.UInt16, "ApprovalDuration",
1299
1077
        type_func = timedelta_to_milliseconds)
1300
1078
    host = notifychangeproperty(dbus.String, "Host")
1301
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1302
1080
                                   type_func =
1303
1081
                                   timedelta_to_milliseconds)
1304
1082
    extended_timeout = notifychangeproperty(
1305
 
        dbus.UInt64, "ExtendedTimeout",
 
1083
        dbus.UInt16, "ExtendedTimeout",
1306
1084
        type_func = timedelta_to_milliseconds)
1307
 
    interval = notifychangeproperty(dbus.UInt64,
 
1085
    interval = notifychangeproperty(dbus.UInt16,
1308
1086
                                    "Interval",
1309
1087
                                    type_func =
1310
1088
                                    timedelta_to_milliseconds)
1359
1137
        return False
1360
1138
    
1361
1139
    def approve(self, value=True):
 
1140
        self.send_changedstate()
1362
1141
        self.approved = value
1363
1142
        gobject.timeout_add(timedelta_to_milliseconds
1364
1143
                            (self.approval_duration),
1365
1144
                            self._reset_approved)
1366
 
        self.send_changedstate()
 
1145
    
1367
1146
    
1368
1147
    ## D-Bus methods, signals & properties
1369
1148
    _interface = "se.recompile.Mandos.Client"
1370
1149
    
1371
 
    ## Interfaces
1372
 
    
1373
 
    @dbus_interface_annotations(_interface)
1374
 
    def _foo(self):
1375
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
 
                     "false"}
1377
 
    
1378
1150
    ## Signals
1379
1151
    
1380
1152
    # CheckerCompleted - signal
1416
1188
        "D-Bus signal"
1417
1189
        return self.need_approval()
1418
1190
    
 
1191
    # NeRwequest - signal
 
1192
    @dbus.service.signal(_interface, signature="s")
 
1193
    def NewRequest(self, ip):
 
1194
        """D-Bus signal
 
1195
        Is sent after a client request a password.
 
1196
        """
 
1197
        pass
 
1198
    
1419
1199
    ## Methods
1420
1200
    
1421
1201
    # Approve - method
1499
1279
    def Host_dbus_property(self, value=None):
1500
1280
        if value is None:       # get
1501
1281
            return dbus.String(self.host)
1502
 
        self.host = unicode(value)
 
1282
        self.host = value
1503
1283
    
1504
1284
    # Created - property
1505
1285
    @dbus_service_property(_interface, signature="s", access="read")
1531
1311
            return
1532
1312
        return datetime_to_dbus(self.last_checked_ok)
1533
1313
    
1534
 
    # LastCheckerStatus - property
1535
 
    @dbus_service_property(_interface, signature="n",
1536
 
                           access="read")
1537
 
    def LastCheckerStatus_dbus_property(self):
1538
 
        return dbus.Int16(self.last_checker_status)
1539
 
    
1540
1314
    # Expires - property
1541
1315
    @dbus_service_property(_interface, signature="s", access="read")
1542
1316
    def Expires_dbus_property(self):
1553
1327
    def Timeout_dbus_property(self, value=None):
1554
1328
        if value is None:       # get
1555
1329
            return dbus.UInt64(self.timeout_milliseconds())
1556
 
        old_timeout = self.timeout
1557
1330
        self.timeout = datetime.timedelta(0, 0, 0, value)
1558
 
        # Reschedule disabling
1559
 
        if self.enabled:
1560
 
            now = datetime.datetime.utcnow()
1561
 
            self.expires += self.timeout - old_timeout
1562
 
            if self.expires <= now:
1563
 
                # The timeout has passed
1564
 
                self.disable()
1565
 
            else:
1566
 
                if (getattr(self, "disable_initiator_tag", None)
1567
 
                    is None):
1568
 
                    return
1569
 
                gobject.source_remove(self.disable_initiator_tag)
1570
 
                self.disable_initiator_tag = (
1571
 
                    gobject.timeout_add(
1572
 
                        timedelta_to_milliseconds(self.expires - now),
1573
 
                        self.disable))
 
1331
        if getattr(self, "disable_initiator_tag", None) is None:
 
1332
            return
 
1333
        # Reschedule timeout
 
1334
        gobject.source_remove(self.disable_initiator_tag)
 
1335
        self.disable_initiator_tag = None
 
1336
        self.expires = None
 
1337
        time_to_die = timedelta_to_milliseconds((self
 
1338
                                                 .last_checked_ok
 
1339
                                                 + self.timeout)
 
1340
                                                - datetime.datetime
 
1341
                                                .utcnow())
 
1342
        if time_to_die <= 0:
 
1343
            # The timeout has passed
 
1344
            self.disable()
 
1345
        else:
 
1346
            self.expires = (datetime.datetime.utcnow()
 
1347
                            + datetime.timedelta(milliseconds =
 
1348
                                                 time_to_die))
 
1349
            self.disable_initiator_tag = (gobject.timeout_add
 
1350
                                          (time_to_die, self.disable))
1574
1351
    
1575
1352
    # ExtendedTimeout - property
1576
1353
    @dbus_service_property(_interface, signature="t",
1602
1379
    def Checker_dbus_property(self, value=None):
1603
1380
        if value is None:       # get
1604
1381
            return dbus.String(self.checker_command)
1605
 
        self.checker_command = unicode(value)
 
1382
        self.checker_command = value
1606
1383
    
1607
1384
    # CheckerRunning - property
1608
1385
    @dbus_service_property(_interface, signature="b",
1655
1432
        self._pipe.send(('setattr', name, value))
1656
1433
 
1657
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1658
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
1440
    """A class to handle client connections.
1660
1441
    
1728
1509
                except KeyError:
1729
1510
                    return
1730
1511
                
 
1512
                if self.server.use_dbus:
 
1513
                    # Emit D-Bus signal
 
1514
                    client.NewRequest(str(self.client_address))
 
1515
                
1731
1516
                if client.approval_delay:
1732
1517
                    delay = client.approval_delay
1733
1518
                    client.approvals_pending += 1
1764
1549
                    #wait until timeout or approved
1765
1550
                    time = datetime.datetime.now()
1766
1551
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1552
                    (client.changedstate.wait
 
1553
                     (float(client.timedelta_to_milliseconds(delay)
 
1554
                            / 1000)))
1770
1555
                    client.changedstate.release()
1771
1556
                    time2 = datetime.datetime.now()
1772
1557
                    if (time2 - time) >= delay:
1788
1573
                    try:
1789
1574
                        sent = session.send(client.secret[sent_size:])
1790
1575
                    except gnutls.errors.GNUTLSError as error:
1791
 
                        logger.warning("gnutls send failed",
1792
 
                                       exc_info=error)
 
1576
                        logger.warning("gnutls send failed")
1793
1577
                        return
1794
1578
                    logger.debug("Sent: %d, remaining: %d",
1795
1579
                                 sent, len(client.secret)
1798
1582
                
1799
1583
                logger.info("Sending secret to %s", client.name)
1800
1584
                # bump the timeout using extended_timeout
1801
 
                client.bump_timeout(client.extended_timeout)
 
1585
                client.checked_ok(client.extended_timeout)
1802
1586
                if self.server.use_dbus:
1803
1587
                    # Emit D-Bus signal
1804
1588
                    client.GotSecret()
1809
1593
                try:
1810
1594
                    session.bye()
1811
1595
                except gnutls.errors.GNUTLSError as error:
1812
 
                    logger.warning("GnuTLS bye failed",
1813
 
                                   exc_info=error)
 
1596
                    logger.warning("GnuTLS bye failed")
1814
1597
    
1815
1598
    @staticmethod
1816
1599
    def peer_certificate(session):
1881
1664
    def sub_process_main(self, request, address):
1882
1665
        try:
1883
1666
            self.finish_request(request, address)
1884
 
        except Exception:
 
1667
        except:
1885
1668
            self.handle_error(request, address)
1886
1669
        self.close_request(request)
1887
1670
    
1888
1671
    def process_request(self, request, address):
1889
1672
        """Start a new process to process the request."""
1890
1673
        proc = multiprocessing.Process(target = self.sub_process_main,
1891
 
                                       args = (request, address))
 
1674
                                       args = (request,
 
1675
                                               address))
1892
1676
        proc.start()
1893
1677
        return proc
1894
1678
 
1922
1706
        use_ipv6:       Boolean; to use IPv6 or not
1923
1707
    """
1924
1708
    def __init__(self, server_address, RequestHandlerClass,
1925
 
                 interface=None, use_ipv6=True, socketfd=None):
1926
 
        """If socketfd is set, use that file descriptor instead of
1927
 
        creating a new one with socket.socket().
1928
 
        """
 
1709
                 interface=None, use_ipv6=True):
1929
1710
        self.interface = interface
1930
1711
        if use_ipv6:
1931
1712
            self.address_family = socket.AF_INET6
1932
 
        if socketfd is not None:
1933
 
            # Save the file descriptor
1934
 
            self.socketfd = socketfd
1935
 
            # Save the original socket.socket() function
1936
 
            self.socket_socket = socket.socket
1937
 
            # To implement --socket, we monkey patch socket.socket.
1938
 
            # 
1939
 
            # (When socketserver.TCPServer is a new-style class, we
1940
 
            # could make self.socket into a property instead of monkey
1941
 
            # patching socket.socket.)
1942
 
            # 
1943
 
            # Create a one-time-only replacement for socket.socket()
1944
 
            @functools.wraps(socket.socket)
1945
 
            def socket_wrapper(*args, **kwargs):
1946
 
                # Restore original function so subsequent calls are
1947
 
                # not affected.
1948
 
                socket.socket = self.socket_socket
1949
 
                del self.socket_socket
1950
 
                # This time only, return a new socket object from the
1951
 
                # saved file descriptor.
1952
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1953
 
            # Replace socket.socket() function with wrapper
1954
 
            socket.socket = socket_wrapper
1955
 
        # The socketserver.TCPServer.__init__ will call
1956
 
        # socket.socket(), which might be our replacement,
1957
 
        # socket_wrapper(), if socketfd was set.
1958
1713
        socketserver.TCPServer.__init__(self, server_address,
1959
1714
                                        RequestHandlerClass)
1960
 
    
1961
1715
    def server_bind(self):
1962
1716
        """This overrides the normal server_bind() function
1963
1717
        to bind to an interface if one was specified, and also NOT to
1971
1725
                try:
1972
1726
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
1727
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
1728
                                           str(self.interface
 
1729
                                               + '\0'))
1975
1730
                except socket.error as error:
1976
 
                    if error.errno == errno.EPERM:
1977
 
                        logger.error("No permission to bind to"
1978
 
                                     " interface %s", self.interface)
1979
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1731
                    if error[0] == errno.EPERM:
 
1732
                        logger.error("No permission to"
 
1733
                                     " bind to interface %s",
 
1734
                                     self.interface)
 
1735
                    elif error[0] == errno.ENOPROTOOPT:
1980
1736
                        logger.error("SO_BINDTODEVICE not available;"
1981
1737
                                     " cannot bind to interface %s",
1982
1738
                                     self.interface)
1983
 
                    elif error.errno == errno.ENODEV:
1984
 
                        logger.error("Interface %s does not exist,"
1985
 
                                     " cannot bind", self.interface)
1986
1739
                    else:
1987
1740
                        raise
1988
1741
        # Only bind(2) the socket if we really need to.
1991
1744
                if self.address_family == socket.AF_INET6:
1992
1745
                    any_address = "::" # in6addr_any
1993
1746
                else:
1994
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1747
                    any_address = socket.INADDR_ANY
1995
1748
                self.server_address = (any_address,
1996
1749
                                       self.server_address[1])
1997
1750
            elif not self.server_address[1]:
2018
1771
    """
2019
1772
    def __init__(self, server_address, RequestHandlerClass,
2020
1773
                 interface=None, use_ipv6=True, clients=None,
2021
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1774
                 gnutls_priority=None, use_dbus=True):
2022
1775
        self.enabled = False
2023
1776
        self.clients = clients
2024
1777
        if self.clients is None:
2028
1781
        IPv6_TCPServer.__init__(self, server_address,
2029
1782
                                RequestHandlerClass,
2030
1783
                                interface = interface,
2031
 
                                use_ipv6 = use_ipv6,
2032
 
                                socketfd = socketfd)
 
1784
                                use_ipv6 = use_ipv6)
2033
1785
    def server_activate(self):
2034
1786
        if self.enabled:
2035
1787
            return socketserver.TCPServer.server_activate(self)
2048
1800
    
2049
1801
    def handle_ipc(self, source, condition, parent_pipe=None,
2050
1802
                   proc = None, client_object=None):
 
1803
        condition_names = {
 
1804
            gobject.IO_IN: "IN",   # There is data to read.
 
1805
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1806
                                    # blocking).
 
1807
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1808
            gobject.IO_ERR: "ERR", # Error condition.
 
1809
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1810
                                    # broken, usually for pipes and
 
1811
                                    # sockets).
 
1812
            }
 
1813
        conditions_string = ' | '.join(name
 
1814
                                       for cond, name in
 
1815
                                       condition_names.iteritems()
 
1816
                                       if cond & condition)
2051
1817
        # error, or the other end of multiprocessing.Pipe has closed
2052
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1818
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2053
1819
            # Wait for other process to exit
2054
1820
            proc.join()
2055
1821
            return False
2113
1879
        return True
2114
1880
 
2115
1881
 
2116
 
def rfc3339_duration_to_delta(duration):
2117
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2118
 
    
2119
 
    >>> rfc3339_duration_to_delta("P7D")
2120
 
    datetime.timedelta(7)
2121
 
    >>> rfc3339_duration_to_delta("PT60S")
2122
 
    datetime.timedelta(0, 60)
2123
 
    >>> rfc3339_duration_to_delta("PT60M")
2124
 
    datetime.timedelta(0, 3600)
2125
 
    >>> rfc3339_duration_to_delta("PT24H")
2126
 
    datetime.timedelta(1)
2127
 
    >>> rfc3339_duration_to_delta("P1W")
2128
 
    datetime.timedelta(7)
2129
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2130
 
    datetime.timedelta(0, 330)
2131
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2132
 
    datetime.timedelta(1, 200)
2133
 
    """
2134
 
    
2135
 
    # Parsing an RFC 3339 duration with regular expressions is not
2136
 
    # possible - there would have to be multiple places for the same
2137
 
    # values, like seconds.  The current code, while more esoteric, is
2138
 
    # cleaner without depending on a parsing library.  If Python had a
2139
 
    # built-in library for parsing we would use it, but we'd like to
2140
 
    # avoid excessive use of external libraries.
2141
 
    
2142
 
    # New type for defining tokens, syntax, and semantics all-in-one
2143
 
    Token = collections.namedtuple("Token",
2144
 
                                   ("regexp", # To match token; if
2145
 
                                              # "value" is not None,
2146
 
                                              # must have a "group"
2147
 
                                              # containing digits
2148
 
                                    "value",  # datetime.timedelta or
2149
 
                                              # None
2150
 
                                    "followers")) # Tokens valid after
2151
 
                                                  # this token
2152
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2154
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2155
 
    token_second = Token(re.compile(r"(\d+)S"),
2156
 
                         datetime.timedelta(seconds=1),
2157
 
                         frozenset((token_end,)))
2158
 
    token_minute = Token(re.compile(r"(\d+)M"),
2159
 
                         datetime.timedelta(minutes=1),
2160
 
                         frozenset((token_second, token_end)))
2161
 
    token_hour = Token(re.compile(r"(\d+)H"),
2162
 
                       datetime.timedelta(hours=1),
2163
 
                       frozenset((token_minute, token_end)))
2164
 
    token_time = Token(re.compile(r"T"),
2165
 
                       None,
2166
 
                       frozenset((token_hour, token_minute,
2167
 
                                  token_second)))
2168
 
    token_day = Token(re.compile(r"(\d+)D"),
2169
 
                      datetime.timedelta(days=1),
2170
 
                      frozenset((token_time, token_end)))
2171
 
    token_month = Token(re.compile(r"(\d+)M"),
2172
 
                        datetime.timedelta(weeks=4),
2173
 
                        frozenset((token_day, token_end)))
2174
 
    token_year = Token(re.compile(r"(\d+)Y"),
2175
 
                       datetime.timedelta(weeks=52),
2176
 
                       frozenset((token_month, token_end)))
2177
 
    token_week = Token(re.compile(r"(\d+)W"),
2178
 
                       datetime.timedelta(weeks=1),
2179
 
                       frozenset((token_end,)))
2180
 
    token_duration = Token(re.compile(r"P"), None,
2181
 
                           frozenset((token_year, token_month,
2182
 
                                      token_day, token_time,
2183
 
                                      token_week))),
2184
 
    # Define starting values
2185
 
    value = datetime.timedelta() # Value so far
2186
 
    found_token = None
2187
 
    followers = frozenset(token_duration,) # Following valid tokens
2188
 
    s = duration                # String left to parse
2189
 
    # Loop until end token is found
2190
 
    while found_token is not token_end:
2191
 
        # Search for any currently valid tokens
2192
 
        for token in followers:
2193
 
            match = token.regexp.match(s)
2194
 
            if match is not None:
2195
 
                # Token found
2196
 
                if token.value is not None:
2197
 
                    # Value found, parse digits
2198
 
                    factor = int(match.group(1), 10)
2199
 
                    # Add to value so far
2200
 
                    value += factor * token.value
2201
 
                # Strip token from string
2202
 
                s = token.regexp.sub("", s, 1)
2203
 
                # Go to found token
2204
 
                found_token = token
2205
 
                # Set valid next tokens
2206
 
                followers = found_token.followers
2207
 
                break
2208
 
        else:
2209
 
            # No currently valid tokens were found
2210
 
            raise ValueError("Invalid RFC 3339 duration")
2211
 
    # End token found
2212
 
    return value
2213
 
 
2214
 
 
2215
1882
def string_to_delta(interval):
2216
1883
    """Parse a string and return a datetime.timedelta
2217
1884
    
2228
1895
    >>> string_to_delta('5m 30s')
2229
1896
    datetime.timedelta(0, 330)
2230
1897
    """
2231
 
    
2232
 
    try:
2233
 
        return rfc3339_duration_to_delta(interval)
2234
 
    except ValueError:
2235
 
        pass
2236
 
    
2237
1898
    timevalue = datetime.timedelta(0)
2238
1899
    for s in interval.split():
2239
1900
        try:
2250
1911
            elif suffix == "w":
2251
1912
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2252
1913
            else:
2253
 
                raise ValueError("Unknown suffix {0!r}"
2254
 
                                 .format(suffix))
 
1914
                raise ValueError("Unknown suffix %r" % suffix)
2255
1915
        except (ValueError, IndexError) as e:
2256
1916
            raise ValueError(*(e.args))
2257
1917
        timevalue += delta
2271
1931
        sys.exit()
2272
1932
    if not noclose:
2273
1933
        # Close all standard open file descriptors
2274
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1934
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2275
1935
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
1936
            raise OSError(errno.ENODEV,
2277
 
                          "{0} not a character device"
2278
 
                          .format(os.devnull))
 
1937
                          "%s not a character device"
 
1938
                          % os.path.devnull)
2279
1939
        os.dup2(null, sys.stdin.fileno())
2280
1940
        os.dup2(null, sys.stdout.fileno())
2281
1941
        os.dup2(null, sys.stderr.fileno())
2290
1950
    
2291
1951
    parser = argparse.ArgumentParser()
2292
1952
    parser.add_argument("-v", "--version", action="version",
2293
 
                        version = "%(prog)s {0}".format(version),
 
1953
                        version = "%%(prog)s %s" % version,
2294
1954
                        help="show version number and exit")
2295
1955
    parser.add_argument("-i", "--interface", metavar="IF",
2296
1956
                        help="Bind to interface IF")
2302
1962
                        help="Run self-test")
2303
1963
    parser.add_argument("--debug", action="store_true",
2304
1964
                        help="Debug mode; run in foreground and log"
2305
 
                        " to terminal", default=None)
 
1965
                        " to terminal")
2306
1966
    parser.add_argument("--debuglevel", metavar="LEVEL",
2307
1967
                        help="Debug level for stdout output")
2308
1968
    parser.add_argument("--priority", help="GnuTLS"
2315
1975
                        " files")
2316
1976
    parser.add_argument("--no-dbus", action="store_false",
2317
1977
                        dest="use_dbus", help="Do not provide D-Bus"
2318
 
                        " system bus interface", default=None)
 
1978
                        " system bus interface")
2319
1979
    parser.add_argument("--no-ipv6", action="store_false",
2320
 
                        dest="use_ipv6", help="Do not use IPv6",
2321
 
                        default=None)
 
1980
                        dest="use_ipv6", help="Do not use IPv6")
2322
1981
    parser.add_argument("--no-restore", action="store_false",
2323
1982
                        dest="restore", help="Do not restore stored"
2324
 
                        " state", default=None)
2325
 
    parser.add_argument("--socket", type=int,
2326
 
                        help="Specify a file descriptor to a network"
2327
 
                        " socket to use instead of creating one")
 
1983
                        " state")
2328
1984
    parser.add_argument("--statedir", metavar="DIR",
2329
1985
                        help="Directory to save/restore state in")
2330
 
    parser.add_argument("--foreground", action="store_true",
2331
 
                        help="Run in foreground", default=None)
2332
1986
    
2333
1987
    options = parser.parse_args()
2334
1988
    
2343
1997
                        "port": "",
2344
1998
                        "debug": "False",
2345
1999
                        "priority":
2346
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
 
2000
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2347
2001
                        "servicename": "Mandos",
2348
2002
                        "use_dbus": "True",
2349
2003
                        "use_ipv6": "True",
2350
2004
                        "debuglevel": "",
2351
2005
                        "restore": "True",
2352
 
                        "socket": "",
2353
 
                        "statedir": "/var/lib/mandos",
2354
 
                        "foreground": "False",
 
2006
                        "statedir": "/var/lib/mandos"
2355
2007
                        }
2356
2008
    
2357
2009
    # Parse config file for server-global settings
2362
2014
    # Convert the SafeConfigParser object to a dict
2363
2015
    server_settings = server_config.defaults()
2364
2016
    # Use the appropriate methods on the non-string config options
2365
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2017
    for option in ("debug", "use_dbus", "use_ipv6"):
2366
2018
        server_settings[option] = server_config.getboolean("DEFAULT",
2367
2019
                                                           option)
2368
2020
    if server_settings["port"]:
2369
2021
        server_settings["port"] = server_config.getint("DEFAULT",
2370
2022
                                                       "port")
2371
 
    if server_settings["socket"]:
2372
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2373
 
                                                         "socket")
2374
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2375
 
        # over with an opened os.devnull.  But we don't want this to
2376
 
        # happen with a supplied network socket.
2377
 
        if 0 <= server_settings["socket"] <= 2:
2378
 
            server_settings["socket"] = os.dup(server_settings
2379
 
                                               ["socket"])
2380
2023
    del server_config
2381
2024
    
2382
2025
    # Override the settings from the config file with command line
2384
2027
    for option in ("interface", "address", "port", "debug",
2385
2028
                   "priority", "servicename", "configdir",
2386
2029
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
2030
                   "statedir"):
2388
2031
        value = getattr(options, option)
2389
2032
        if value is not None:
2390
2033
            server_settings[option] = value
2393
2036
    for option in server_settings.keys():
2394
2037
        if type(server_settings[option]) is str:
2395
2038
            server_settings[option] = unicode(server_settings[option])
2396
 
    # Force all boolean options to be boolean
2397
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2398
 
                   "foreground"):
2399
 
        server_settings[option] = bool(server_settings[option])
2400
 
    # Debug implies foreground
2401
 
    if server_settings["debug"]:
2402
 
        server_settings["foreground"] = True
2403
2039
    # Now we have our good server settings in "server_settings"
2404
2040
    
2405
2041
    ##################################################################
2411
2047
    use_ipv6 = server_settings["use_ipv6"]
2412
2048
    stored_state_path = os.path.join(server_settings["statedir"],
2413
2049
                                     stored_state_file)
2414
 
    foreground = server_settings["foreground"]
2415
2050
    
2416
2051
    if debug:
2417
 
        initlogger(debug, logging.DEBUG)
 
2052
        initlogger(logging.DEBUG)
2418
2053
    else:
2419
2054
        if not debuglevel:
2420
 
            initlogger(debug)
 
2055
            initlogger()
2421
2056
        else:
2422
2057
            level = getattr(logging, debuglevel.upper())
2423
 
            initlogger(debug, level)
 
2058
            initlogger(level)
2424
2059
    
2425
2060
    if server_settings["servicename"] != "Mandos":
2426
2061
        syslogger.setFormatter(logging.Formatter
2427
 
                               ('Mandos ({0}) [%(process)d]:'
2428
 
                                ' %(levelname)s: %(message)s'
2429
 
                                .format(server_settings
2430
 
                                        ["servicename"])))
 
2062
                               ('Mandos (%s) [%%(process)d]:'
 
2063
                                ' %%(levelname)s: %%(message)s'
 
2064
                                % server_settings["servicename"]))
2431
2065
    
2432
2066
    # Parse config file with clients
2433
 
    client_config = configparser.SafeConfigParser(Client
2434
 
                                                  .client_defaults)
 
2067
    client_defaults = { "timeout": "5m",
 
2068
                        "extended_timeout": "15m",
 
2069
                        "interval": "2m",
 
2070
                        "checker": "fping -q -- %%(host)s",
 
2071
                        "host": "",
 
2072
                        "approval_delay": "0s",
 
2073
                        "approval_duration": "1s",
 
2074
                        }
 
2075
    client_config = configparser.SafeConfigParser(client_defaults)
2435
2076
    client_config.read(os.path.join(server_settings["configdir"],
2436
2077
                                    "clients.conf"))
2437
2078
    
2446
2087
                              use_ipv6=use_ipv6,
2447
2088
                              gnutls_priority=
2448
2089
                              server_settings["priority"],
2449
 
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
2452
 
    if not foreground:
2453
 
        pidfilename = "/run/mandos.pid"
2454
 
        pidfile = None
 
2090
                              use_dbus=use_dbus)
 
2091
    if not debug:
 
2092
        pidfilename = "/var/run/mandos.pid"
2455
2093
        try:
2456
2094
            pidfile = open(pidfilename, "w")
2457
 
        except IOError as e:
2458
 
            logger.error("Could not open file %r", pidfilename,
2459
 
                         exc_info=e)
 
2095
        except IOError:
 
2096
            logger.error("Could not open file %r", pidfilename)
2460
2097
    
2461
 
    for name in ("_mandos", "mandos", "nobody"):
 
2098
    try:
 
2099
        uid = pwd.getpwnam("_mandos").pw_uid
 
2100
        gid = pwd.getpwnam("_mandos").pw_gid
 
2101
    except KeyError:
2462
2102
        try:
2463
 
            uid = pwd.getpwnam(name).pw_uid
2464
 
            gid = pwd.getpwnam(name).pw_gid
2465
 
            break
 
2103
            uid = pwd.getpwnam("mandos").pw_uid
 
2104
            gid = pwd.getpwnam("mandos").pw_gid
2466
2105
        except KeyError:
2467
 
            continue
2468
 
    else:
2469
 
        uid = 65534
2470
 
        gid = 65534
 
2106
            try:
 
2107
                uid = pwd.getpwnam("nobody").pw_uid
 
2108
                gid = pwd.getpwnam("nobody").pw_gid
 
2109
            except KeyError:
 
2110
                uid = 65534
 
2111
                gid = 65534
2471
2112
    try:
2472
2113
        os.setgid(gid)
2473
2114
        os.setuid(uid)
2474
2115
    except OSError as error:
2475
 
        if error.errno != errno.EPERM:
 
2116
        if error[0] != errno.EPERM:
2476
2117
            raise error
2477
2118
    
2478
2119
    if debug:
2490
2131
         .gnutls_global_set_log_function(debug_gnutls))
2491
2132
        
2492
2133
        # Redirect stdin so all checkers get /dev/null
2493
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2134
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2494
2135
        os.dup2(null, sys.stdin.fileno())
2495
2136
        if null > 2:
2496
2137
            os.close(null)
 
2138
    else:
 
2139
        # No console logging
 
2140
        logger.removeHandler(console)
2497
2141
    
2498
2142
    # Need to fork before connecting to D-Bus
2499
 
    if not foreground:
 
2143
    if not debug:
2500
2144
        # Close all input and output, do double fork, etc.
2501
2145
        daemon()
2502
2146
    
2503
 
    # multiprocessing will use threads, so before we use gobject we
2504
 
    # need to inform gobject that threads will be used.
2505
 
    gobject.threads_init()
2506
 
    
2507
2147
    global main_loop
2508
2148
    # From the Avahi example code
2509
 
    DBusGMainLoop(set_as_default=True)
 
2149
    DBusGMainLoop(set_as_default=True )
2510
2150
    main_loop = gobject.MainLoop()
2511
2151
    bus = dbus.SystemBus()
2512
2152
    # End of Avahi example code
2518
2158
                            ("se.bsnet.fukt.Mandos", bus,
2519
2159
                             do_not_queue=True))
2520
2160
        except dbus.exceptions.NameExistsException as e:
2521
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2161
            logger.error(unicode(e) + ", disabling D-Bus")
2522
2162
            use_dbus = False
2523
2163
            server_settings["use_dbus"] = False
2524
2164
            tcp_server.use_dbus = False
2536
2176
    
2537
2177
    client_class = Client
2538
2178
    if use_dbus:
2539
 
        client_class = functools.partial(ClientDBus, bus = bus)
2540
 
    
2541
 
    client_settings = Client.config_parser(client_config)
 
2179
        client_class = functools.partial(ClientDBusTransitional,
 
2180
                                         bus = bus)
 
2181
    
 
2182
    special_settings = {
 
2183
        # Some settings need to be accessd by special methods;
 
2184
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2185
        "approved_by_default":
 
2186
            lambda section:
 
2187
            client_config.getboolean(section, "approved_by_default"),
 
2188
        "enabled":
 
2189
            lambda section:
 
2190
            client_config.getboolean(section, "enabled"),
 
2191
        }
 
2192
    # Construct a new dict of client settings of this form:
 
2193
    # { client_name: {setting_name: value, ...}, ...}
 
2194
    # with exceptions for any special settings as defined above
 
2195
    client_settings = dict((clientname,
 
2196
                           dict((setting,
 
2197
                                 (value
 
2198
                                  if setting not in special_settings
 
2199
                                  else special_settings[setting]
 
2200
                                  (clientname)))
 
2201
                                for setting, value in
 
2202
                                client_config.items(clientname)))
 
2203
                          for clientname in client_config.sections())
 
2204
    
2542
2205
    old_client_settings = {}
2543
 
    clients_data = {}
2544
 
    
2545
 
    # This is used to redirect stdout and stderr for checker processes
2546
 
    global wnull
2547
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2548
 
    # Only used if server is running in foreground but not in debug
2549
 
    # mode
2550
 
    if debug or not foreground:
2551
 
        wnull.close()
 
2206
    clients_data = []
2552
2207
    
2553
2208
    # Get client data and settings from last running state.
2554
2209
    if server_settings["restore"]:
2558
2213
                                                     (stored_state))
2559
2214
            os.remove(stored_state_path)
2560
2215
        except IOError as e:
2561
 
            if e.errno == errno.ENOENT:
2562
 
                logger.warning("Could not load persistent state: {0}"
2563
 
                                .format(os.strerror(e.errno)))
2564
 
            else:
2565
 
                logger.critical("Could not load persistent state:",
2566
 
                                exc_info=e)
 
2216
            logger.warning("Could not load persistent state: {0}"
 
2217
                           .format(e))
 
2218
            if e.errno != errno.ENOENT:
2567
2219
                raise
2568
 
        except EOFError as e:
2569
 
            logger.warning("Could not load persistent state: "
2570
 
                           "EOFError:", exc_info=e)
2571
2220
    
2572
 
    with PGPEngine() as pgp:
2573
 
        for client_name, client in clients_data.iteritems():
2574
 
            # Skip removed clients
2575
 
            if client_name not in client_settings:
2576
 
                continue
 
2221
    with Crypto() as crypt:
 
2222
        for client in clients_data:
 
2223
            client_name = client["name"]
2577
2224
            
2578
2225
            # Decide which value to use after restoring saved state.
2579
2226
            # We have three different values: Old config file,
2588
2235
                    if (name != "secret" and
2589
2236
                        value != old_client_settings[client_name]
2590
2237
                        [name]):
2591
 
                        client[name] = value
 
2238
                        setattr(client, name, value)
2592
2239
                except KeyError:
2593
2240
                    pass
2594
2241
            
2595
2242
            # Clients who has passed its expire date can still be
2596
 
            # enabled if its last checker was successful.  Clients
2597
 
            # whose checker succeeded before we stored its state is
2598
 
            # assumed to have successfully run all checkers during
2599
 
            # downtime.
2600
 
            if client["enabled"]:
2601
 
                if datetime.datetime.utcnow() >= client["expires"]:
2602
 
                    if not client["last_checked_ok"]:
2603
 
                        logger.warning(
2604
 
                            "disabling client {0} - Client never "
2605
 
                            "performed a successful checker"
2606
 
                            .format(client_name))
2607
 
                        client["enabled"] = False
2608
 
                    elif client["last_checker_status"] != 0:
2609
 
                        logger.warning(
2610
 
                            "disabling client {0} - Client "
2611
 
                            "last checker failed with error code {1}"
2612
 
                            .format(client_name,
2613
 
                                    client["last_checker_status"]))
 
2243
            # enabled if its last checker was sucessful.  Clients
 
2244
            # whose checker failed before we stored its state is
 
2245
            # assumed to have failed all checkers during downtime.
 
2246
            if client["enabled"] and client["last_checked_ok"]:
 
2247
                if ((datetime.datetime.utcnow()
 
2248
                     - client["last_checked_ok"])
 
2249
                    > client["interval"]):
 
2250
                    if client["last_checker_status"] != 0:
2614
2251
                        client["enabled"] = False
2615
2252
                    else:
2616
2253
                        client["expires"] = (datetime.datetime
2617
2254
                                             .utcnow()
2618
2255
                                             + client["timeout"])
2619
 
                        logger.debug("Last checker succeeded,"
2620
 
                                     " keeping {0} enabled"
2621
 
                                     .format(client_name))
 
2256
            
 
2257
            client["changedstate"] = (multiprocessing_manager
 
2258
                                      .Condition
 
2259
                                      (multiprocessing_manager
 
2260
                                       .Lock()))
 
2261
            if use_dbus:
 
2262
                new_client = (ClientDBusTransitional.__new__
 
2263
                              (ClientDBusTransitional))
 
2264
                tcp_server.clients[client_name] = new_client
 
2265
                new_client.bus = bus
 
2266
                for name, value in client.iteritems():
 
2267
                    setattr(new_client, name, value)
 
2268
                client_object_name = unicode(client_name).translate(
 
2269
                    {ord("."): ord("_"),
 
2270
                     ord("-"): ord("_")})
 
2271
                new_client.dbus_object_path = (dbus.ObjectPath
 
2272
                                               ("/clients/"
 
2273
                                                + client_object_name))
 
2274
                DBusObjectWithProperties.__init__(new_client,
 
2275
                                                  new_client.bus,
 
2276
                                                  new_client
 
2277
                                                  .dbus_object_path)
 
2278
            else:
 
2279
                tcp_server.clients[client_name] = (Client.__new__
 
2280
                                                   (Client))
 
2281
                for name, value in client.iteritems():
 
2282
                    setattr(tcp_server.clients[client_name],
 
2283
                            name, value)
 
2284
            
2622
2285
            try:
2623
 
                client["secret"] = (
2624
 
                    pgp.decrypt(client["encrypted_secret"],
2625
 
                                client_settings[client_name]
2626
 
                                ["secret"]))
2627
 
            except PGPError:
 
2286
                tcp_server.clients[client_name].secret = (
 
2287
                    crypt.decrypt(tcp_server.clients[client_name]
 
2288
                                  .encrypted_secret,
 
2289
                                  client_settings[client_name]
 
2290
                                  ["secret"]))
 
2291
            except CryptoError:
2628
2292
                # If decryption fails, we use secret from new settings
2629
 
                logger.debug("Failed to decrypt {0} old secret"
2630
 
                             .format(client_name))
2631
 
                client["secret"] = (
 
2293
                tcp_server.clients[client_name].secret = (
2632
2294
                    client_settings[client_name]["secret"])
2633
2295
    
2634
 
    # Add/remove clients based on new changes made to config
2635
 
    for client_name in (set(old_client_settings)
2636
 
                        - set(client_settings)):
2637
 
        del clients_data[client_name]
2638
 
    for client_name in (set(client_settings)
2639
 
                        - set(old_client_settings)):
2640
 
        clients_data[client_name] = client_settings[client_name]
2641
 
    
2642
 
    # Create all client objects
2643
 
    for client_name, client in clients_data.iteritems():
2644
 
        tcp_server.clients[client_name] = client_class(
2645
 
            name = client_name, settings = client,
2646
 
            server_settings = server_settings)
 
2296
    # Create/remove clients based on new changes made to config
 
2297
    for clientname in set(old_client_settings) - set(client_settings):
 
2298
        del tcp_server.clients[clientname]
 
2299
    for clientname in set(client_settings) - set(old_client_settings):
 
2300
        tcp_server.clients[clientname] = (client_class(name
 
2301
                                                       = clientname,
 
2302
                                                       config =
 
2303
                                                       client_settings
 
2304
                                                       [clientname]))
2647
2305
    
2648
2306
    if not tcp_server.clients:
2649
2307
        logger.warning("No clients defined")
2650
 
    
2651
 
    if not foreground:
2652
 
        if pidfile is not None:
2653
 
            try:
2654
 
                with pidfile:
2655
 
                    pid = os.getpid()
2656
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2657
 
            except IOError:
2658
 
                logger.error("Could not write to file %r with PID %d",
2659
 
                             pidfilename, pid)
2660
 
        del pidfile
 
2308
        
 
2309
    if not debug:
 
2310
        try:
 
2311
            with pidfile:
 
2312
                pid = os.getpid()
 
2313
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2314
            del pidfile
 
2315
        except IOError:
 
2316
            logger.error("Could not write to file %r with PID %d",
 
2317
                         pidfilename, pid)
 
2318
        except NameError:
 
2319
            # "pidfile" was never created
 
2320
            pass
2661
2321
        del pidfilename
 
2322
        
 
2323
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2662
2324
    
2663
2325
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
2326
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2665
2327
    
2666
2328
    if use_dbus:
2667
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2668
 
                                        "se.bsnet.fukt.Mandos"})
2669
 
        class MandosDBusService(DBusObjectWithProperties):
 
2329
        class MandosDBusService(dbus.service.Object):
2670
2330
            """A D-Bus proxy object"""
2671
2331
            def __init__(self):
2672
2332
                dbus.service.Object.__init__(self, bus, "/")
2673
2333
            _interface = "se.recompile.Mandos"
2674
2334
            
2675
 
            @dbus_interface_annotations(_interface)
2676
 
            def _foo(self):
2677
 
                return { "org.freedesktop.DBus.Property"
2678
 
                         ".EmitsChangedSignal":
2679
 
                             "false"}
2680
 
            
2681
2335
            @dbus.service.signal(_interface, signature="o")
2682
2336
            def ClientAdded(self, objpath):
2683
2337
                "D-Bus signal"
2725
2379
            
2726
2380
            del _interface
2727
2381
        
2728
 
        mandos_dbus_service = MandosDBusService()
 
2382
        class MandosDBusServiceTransitional(MandosDBusService):
 
2383
            __metaclass__ = AlternateDBusNamesMetaclass
 
2384
        mandos_dbus_service = MandosDBusServiceTransitional()
2729
2385
    
2730
2386
    def cleanup():
2731
2387
        "Cleanup function; run on exit"
2732
2388
        service.cleanup()
2733
2389
        
2734
2390
        multiprocessing.active_children()
2735
 
        wnull.close()
2736
2391
        if not (tcp_server.clients or client_settings):
2737
2392
            return
2738
2393
        
2739
2394
        # Store client before exiting. Secrets are encrypted with key
2740
2395
        # based on what config file has. If config file is
2741
2396
        # removed/edited, old secret will thus be unrecovable.
2742
 
        clients = {}
2743
 
        with PGPEngine() as pgp:
 
2397
        clients = []
 
2398
        with Crypto() as crypt:
2744
2399
            for client in tcp_server.clients.itervalues():
2745
2400
                key = client_settings[client.name]["secret"]
2746
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2747
 
                                                      key)
 
2401
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2402
                                                        key)
2748
2403
                client_dict = {}
2749
2404
                
2750
 
                # A list of attributes that can not be pickled
2751
 
                # + secret.
2752
 
                exclude = set(("bus", "changedstate", "secret",
2753
 
                               "checker", "server_settings"))
 
2405
                # A list of attributes that will not be stored when
 
2406
                # shutting down.
 
2407
                exclude = set(("bus", "changedstate", "secret"))
2754
2408
                for name, typ in (inspect.getmembers
2755
2409
                                  (dbus.service.Object)):
2756
2410
                    exclude.add(name)
2761
2415
                    if attr not in exclude:
2762
2416
                        client_dict[attr] = getattr(client, attr)
2763
2417
                
2764
 
                clients[client.name] = client_dict
 
2418
                clients.append(client_dict)
2765
2419
                del client_settings[client.name]["secret"]
2766
2420
        
2767
2421
        try:
2768
 
            with (tempfile.NamedTemporaryFile
2769
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2770
 
                   dir=os.path.dirname(stored_state_path),
2771
 
                   delete=False)) as stored_state:
 
2422
            with os.fdopen(os.open(stored_state_path,
 
2423
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2424
                                   0600), "wb") as stored_state:
2772
2425
                pickle.dump((clients, client_settings), stored_state)
2773
 
                tempname=stored_state.name
2774
 
            os.rename(tempname, stored_state_path)
2775
2426
        except (IOError, OSError) as e:
2776
 
            if not debug:
2777
 
                try:
2778
 
                    os.remove(tempname)
2779
 
                except NameError:
2780
 
                    pass
2781
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
 
                logger.warning("Could not save persistent state: {0}"
2783
 
                               .format(os.strerror(e.errno)))
2784
 
            else:
2785
 
                logger.warning("Could not save persistent state:",
2786
 
                               exc_info=e)
2787
 
                raise e
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
 
2429
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2430
                raise
2788
2431
        
2789
2432
        # Delete all clients, and settings from config
2790
2433
        while tcp_server.clients:
2817
2460
    service.port = tcp_server.socket.getsockname()[1]
2818
2461
    if use_ipv6:
2819
2462
        logger.info("Now listening on address %r, port %d,"
2820
 
                    " flowinfo %d, scope_id %d",
2821
 
                    *tcp_server.socket.getsockname())
 
2463
                    " flowinfo %d, scope_id %d"
 
2464
                    % tcp_server.socket.getsockname())
2822
2465
    else:                       # IPv4
2823
 
        logger.info("Now listening on address %r, port %d",
2824
 
                    *tcp_server.socket.getsockname())
 
2466
        logger.info("Now listening on address %r, port %d"
 
2467
                    % tcp_server.socket.getsockname())
2825
2468
    
2826
2469
    #service.interface = tcp_server.socket.getsockname()[3]
2827
2470
    
2830
2473
        try:
2831
2474
            service.activate()
2832
2475
        except dbus.exceptions.DBusException as error:
2833
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2476
            logger.critical("DBusException: %s", error)
2834
2477
            cleanup()
2835
2478
            sys.exit(1)
2836
2479
        # End of Avahi example code
2843
2486
        logger.debug("Starting main loop")
2844
2487
        main_loop.run()
2845
2488
    except AvahiError as error:
2846
 
        logger.critical("Avahi Error", exc_info=error)
 
2489
        logger.critical("AvahiError: %s", error)
2847
2490
        cleanup()
2848
2491
        sys.exit(1)
2849
2492
    except KeyboardInterrupt:
2854
2497
    # Must run before the D-Bus bus name gets deregistered
2855
2498
    cleanup()
2856
2499
 
 
2500
 
2857
2501
if __name__ == '__main__':
2858
2502
    main()