/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2012-07-03 20:55:09 UTC
  • Revision ID: belorn@recompile.se-20120703205509-fkeb6uqy4i6gt4b6
added note messages when mandos-monitor starts without running server,
or a server with no clients.

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
65
67
import types
66
68
import binascii
67
69
import tempfile
 
70
import itertools
 
71
import collections
68
72
 
69
73
import dbus
70
74
import dbus.service
85
89
    except ImportError:
86
90
        SO_BINDTODEVICE = None
87
91
 
88
 
 
89
 
version = "1.4.1"
90
 
stored_state_path = "/var/lib/mandos/clients.pickle"
 
92
version = "1.6.0"
 
93
stored_state_file = "clients.pickle"
91
94
 
92
95
logger = logging.getLogger()
93
96
syslogger = (logging.handlers.SysLogHandler
111
114
        return interface_index
112
115
 
113
116
 
114
 
def initlogger(level=logging.WARNING):
 
117
def initlogger(debug, level=logging.WARNING):
115
118
    """init logger and add loglevel"""
116
119
    
117
120
    syslogger.setFormatter(logging.Formatter
119
122
                            ' %(message)s'))
120
123
    logger.addHandler(syslogger)
121
124
    
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)
 
125
    if debug:
 
126
        console = logging.StreamHandler()
 
127
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
128
                                               ' [%(process)d]:'
 
129
                                               ' %(levelname)s:'
 
130
                                               ' %(message)s'))
 
131
        logger.addHandler(console)
128
132
    logger.setLevel(level)
129
133
 
130
134
 
131
 
class CryptoError(Exception):
 
135
class PGPError(Exception):
 
136
    """Exception if encryption/decryption fails"""
132
137
    pass
133
138
 
134
139
 
135
 
class Crypto(object):
 
140
class PGPEngine(object):
136
141
    """A simple class for OpenPGP symmetric encryption & decryption"""
137
142
    def __init__(self):
138
143
        self.gnupg = GnuPGInterface.GnuPG()
141
146
        self.gnupg.options.meta_interactive = False
142
147
        self.gnupg.options.homedir = self.tempdir
143
148
        self.gnupg.options.extra_args.extend(['--force-mdc',
144
 
                                              '--quiet'])
 
149
                                              '--quiet',
 
150
                                              '--no-use-agent'])
145
151
    
146
152
    def __enter__(self):
147
153
        return self
148
154
    
149
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
155
    def __exit__(self, exc_type, exc_value, traceback):
150
156
        self._cleanup()
151
157
        return False
152
158
    
173
179
    
174
180
    def encrypt(self, data, password):
175
181
        self.gnupg.passphrase = self.password_encode(password)
176
 
        with open(os.devnull) as devnull:
 
182
        with open(os.devnull, "w") as devnull:
177
183
            try:
178
184
                proc = self.gnupg.run(['--symmetric'],
179
185
                                      create_fhs=['stdin', 'stdout'],
184
190
                    ciphertext = f.read()
185
191
                proc.wait()
186
192
            except IOError as e:
187
 
                raise CryptoError(e)
 
193
                raise PGPError(e)
188
194
        self.gnupg.passphrase = None
189
195
        return ciphertext
190
196
    
191
197
    def decrypt(self, data, password):
192
198
        self.gnupg.passphrase = self.password_encode(password)
193
 
        with open(os.devnull) as devnull:
 
199
        with open(os.devnull, "w") as devnull:
194
200
            try:
195
201
                proc = self.gnupg.run(['--decrypt'],
196
202
                                      create_fhs=['stdin', 'stdout'],
197
203
                                      attach_fhs={'stderr': devnull})
198
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
204
                with contextlib.closing(proc.handles['stdin']) as f:
199
205
                    f.write(data)
200
206
                with contextlib.closing(proc.handles['stdout']) as f:
201
207
                    decrypted_plaintext = f.read()
202
208
                proc.wait()
203
209
            except IOError as e:
204
 
                raise CryptoError(e)
 
210
                raise PGPError(e)
205
211
        self.gnupg.passphrase = None
206
212
        return decrypted_plaintext
207
213
 
208
214
 
209
 
 
210
215
class AvahiError(Exception):
211
216
    def __init__(self, value, *args, **kwargs):
212
217
        self.value = value
241
246
    server: D-Bus Server
242
247
    bus: dbus.SystemBus()
243
248
    """
 
249
    
244
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
245
251
                 servicetype = None, port = None, TXT = None,
246
252
                 domain = "", host = "", max_renames = 32768,
259
265
        self.server = None
260
266
        self.bus = bus
261
267
        self.entry_group_state_changed_match = None
 
268
    
262
269
    def rename(self):
263
270
        """Derived from the Avahi example code"""
264
271
        if self.rename_count >= self.max_renames:
274
281
        try:
275
282
            self.add()
276
283
        except dbus.exceptions.DBusException as error:
277
 
            logger.critical("DBusException: %s", error)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
278
285
            self.cleanup()
279
286
            os._exit(1)
280
287
        self.rename_count += 1
 
288
    
281
289
    def remove(self):
282
290
        """Derived from the Avahi example code"""
283
291
        if self.entry_group_state_changed_match is not None:
285
293
            self.entry_group_state_changed_match = None
286
294
        if self.group is not None:
287
295
            self.group.Reset()
 
296
    
288
297
    def add(self):
289
298
        """Derived from the Avahi example code"""
290
299
        self.remove()
307
316
            dbus.UInt16(self.port),
308
317
            avahi.string_array_to_txt_array(self.TXT))
309
318
        self.group.Commit()
 
319
    
310
320
    def entry_group_state_changed(self, state, error):
311
321
        """Derived from the Avahi example code"""
312
322
        logger.debug("Avahi entry group state change: %i", state)
319
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
320
330
            logger.critical("Avahi: Error in group state changed %s",
321
331
                            unicode(error))
322
 
            raise AvahiGroupError("State changed: %s"
323
 
                                  % unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
 
334
    
324
335
    def cleanup(self):
325
336
        """Derived from the Avahi example code"""
326
337
        if self.group is not None:
331
342
                pass
332
343
            self.group = None
333
344
        self.remove()
 
345
    
334
346
    def server_state_changed(self, state, error=None):
335
347
        """Derived from the Avahi example code"""
336
348
        logger.debug("Avahi server state change: %i", state)
355
367
                logger.debug("Unknown state: %r", state)
356
368
            else:
357
369
                logger.debug("Unknown state: %r: %r", state, error)
 
370
    
358
371
    def activate(self):
359
372
        """Derived from the Avahi example code"""
360
373
        if self.server is None:
367
380
                                 self.server_state_changed)
368
381
        self.server_state_changed(self.server.GetState())
369
382
 
 
383
 
370
384
class AvahiServiceToSyslog(AvahiService):
371
385
    def rename(self):
372
386
        """Add the new name to the syslog messages"""
373
387
        ret = AvahiService.rename(self)
374
388
        syslogger.setFormatter(logging.Formatter
375
 
                               ('Mandos (%s) [%%(process)d]:'
376
 
                                ' %%(levelname)s: %%(message)s'
377
 
                                % self.name))
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
378
392
        return ret
379
393
 
380
 
def _timedelta_to_milliseconds(td):
 
394
 
 
395
def timedelta_to_milliseconds(td):
381
396
    "Convert a datetime.timedelta() to milliseconds"
382
397
    return ((td.days * 24 * 60 * 60 * 1000)
383
398
            + (td.seconds * 1000)
384
399
            + (td.microseconds // 1000))
385
 
        
 
400
 
 
401
 
386
402
class Client(object):
387
403
    """A representation of a client host served by this server.
388
404
    
389
405
    Attributes:
390
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
406
    approved:   bool(); 'None' if not yet approved/disapproved
391
407
    approval_delay: datetime.timedelta(); Time to wait for approval
392
408
    approval_duration: datetime.timedelta(); Duration of one approval
393
409
    checker:    subprocess.Popen(); a running checker process used
411
427
    interval:   datetime.timedelta(); How often to start a new checker
412
428
    last_approval_request: datetime.datetime(); (UTC) or None
413
429
    last_checked_ok: datetime.datetime(); (UTC) or None
414
 
 
415
430
    last_checker_status: integer between 0 and 255 reflecting exit
416
431
                         status of last checker. -1 reflects crashed
417
 
                         checker, or None.
418
 
    last_enabled: datetime.datetime(); (UTC)
 
432
                         checker, -2 means no checker completed yet.
 
433
    last_enabled: datetime.datetime(); (UTC) or None
419
434
    name:       string; from the config file, used in log messages and
420
435
                        D-Bus identifiers
421
436
    secret:     bytestring; sent verbatim (over TLS) to client
422
437
    timeout:    datetime.timedelta(); How long from last_checked_ok
423
438
                                      until this client is disabled
424
 
    extended_timeout:   extra long timeout when password has been sent
 
439
    extended_timeout:   extra long timeout when secret has been sent
425
440
    runtime_expansions: Allowed attributes for runtime expansion.
426
441
    expires:    datetime.datetime(); time (UTC) when a client will be
427
442
                disabled, or None
428
443
    """
429
444
    
430
445
    runtime_expansions = ("approval_delay", "approval_duration",
431
 
                          "created", "enabled", "fingerprint",
432
 
                          "host", "interval", "last_checked_ok",
 
446
                          "created", "enabled", "expires",
 
447
                          "fingerprint", "host", "interval",
 
448
                          "last_approval_request", "last_checked_ok",
433
449
                          "last_enabled", "name", "timeout")
 
450
    client_defaults = { "timeout": "PT5M",
 
451
                        "extended_timeout": "PT15M",
 
452
                        "interval": "PT2M",
 
453
                        "checker": "fping -q -- %%(host)s",
 
454
                        "host": "",
 
455
                        "approval_delay": "PT0S",
 
456
                        "approval_duration": "PT1S",
 
457
                        "approved_by_default": "True",
 
458
                        "enabled": "True",
 
459
                        }
434
460
    
435
461
    def timeout_milliseconds(self):
436
462
        "Return the 'timeout' attribute in milliseconds"
437
 
        return _timedelta_to_milliseconds(self.timeout)
 
463
        return timedelta_to_milliseconds(self.timeout)
438
464
    
439
465
    def extended_timeout_milliseconds(self):
440
466
        "Return the 'extended_timeout' attribute in milliseconds"
441
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
467
        return timedelta_to_milliseconds(self.extended_timeout)
442
468
    
443
469
    def interval_milliseconds(self):
444
470
        "Return the 'interval' attribute in milliseconds"
445
 
        return _timedelta_to_milliseconds(self.interval)
 
471
        return timedelta_to_milliseconds(self.interval)
446
472
    
447
473
    def approval_delay_milliseconds(self):
448
 
        return _timedelta_to_milliseconds(self.approval_delay)
449
 
    
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."""
 
474
        return timedelta_to_milliseconds(self.approval_delay)
 
475
    
 
476
    @staticmethod
 
477
    def config_parser(config):
 
478
        """Construct a new dict of client settings of this form:
 
479
        { client_name: {setting_name: value, ...}, ...}
 
480
        with exceptions for any special settings as defined above.
 
481
        NOTE: Must be a pure function. Must return the same result
 
482
        value given the same arguments.
 
483
        """
 
484
        settings = {}
 
485
        for client_name in config.sections():
 
486
            section = dict(config.items(client_name))
 
487
            client = settings[client_name] = {}
 
488
            
 
489
            client["host"] = section["host"]
 
490
            # Reformat values from string types to Python types
 
491
            client["approved_by_default"] = config.getboolean(
 
492
                client_name, "approved_by_default")
 
493
            client["enabled"] = config.getboolean(client_name,
 
494
                                                  "enabled")
 
495
            
 
496
            client["fingerprint"] = (section["fingerprint"].upper()
 
497
                                     .replace(" ", ""))
 
498
            if "secret" in section:
 
499
                client["secret"] = section["secret"].decode("base64")
 
500
            elif "secfile" in section:
 
501
                with open(os.path.expanduser(os.path.expandvars
 
502
                                             (section["secfile"])),
 
503
                          "rb") as secfile:
 
504
                    client["secret"] = secfile.read()
 
505
            else:
 
506
                raise TypeError("No secret or secfile for section {0}"
 
507
                                .format(section))
 
508
            client["timeout"] = string_to_delta(section["timeout"])
 
509
            client["extended_timeout"] = string_to_delta(
 
510
                section["extended_timeout"])
 
511
            client["interval"] = string_to_delta(section["interval"])
 
512
            client["approval_delay"] = string_to_delta(
 
513
                section["approval_delay"])
 
514
            client["approval_duration"] = string_to_delta(
 
515
                section["approval_duration"])
 
516
            client["checker_command"] = section["checker"]
 
517
            client["last_approval_request"] = None
 
518
            client["last_checked_ok"] = None
 
519
            client["last_checker_status"] = -2
 
520
        
 
521
        return settings
 
522
    
 
523
    def __init__(self, settings, name = None):
454
524
        self.name = name
455
 
        if config is None:
456
 
            config = {}
 
525
        # adding all client settings
 
526
        for setting, value in settings.iteritems():
 
527
            setattr(self, setting, value)
 
528
        
 
529
        if self.enabled:
 
530
            if not hasattr(self, "last_enabled"):
 
531
                self.last_enabled = datetime.datetime.utcnow()
 
532
            if not hasattr(self, "expires"):
 
533
                self.expires = (datetime.datetime.utcnow()
 
534
                                + self.timeout)
 
535
        else:
 
536
            self.last_enabled = None
 
537
            self.expires = None
 
538
        
457
539
        logger.debug("Creating client %r", self.name)
458
540
        # Uppercase and remove spaces from fingerprint for later
459
541
        # comparison purposes with return value from the fingerprint()
460
542
        # function
461
 
        self.fingerprint = (config["fingerprint"].upper()
462
 
                            .replace(" ", ""))
463
543
        logger.debug("  Fingerprint: %s", self.fingerprint)
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 = True
477
 
        self.last_approval_request = None
478
 
        self.last_enabled = datetime.datetime.utcnow()
479
 
        self.last_checked_ok = None
480
 
        self.last_checker_status = None
481
 
        self.timeout = string_to_delta(config["timeout"])
482
 
        self.extended_timeout = string_to_delta(config
483
 
                                                ["extended_timeout"])
484
 
        self.interval = string_to_delta(config["interval"])
 
544
        self.created = settings.get("created",
 
545
                                    datetime.datetime.utcnow())
 
546
        
 
547
        # attributes specific for this server instance
485
548
        self.checker = None
486
549
        self.checker_initiator_tag = None
487
550
        self.disable_initiator_tag = None
488
 
        self.expires = datetime.datetime.utcnow() + self.timeout
489
551
        self.checker_callback_tag = None
490
 
        self.checker_command = config["checker"]
491
552
        self.current_checker_command = None
492
 
        self._approved = None
493
 
        self.approved_by_default = config.get("approved_by_default",
494
 
                                              True)
 
553
        self.approved = None
495
554
        self.approvals_pending = 0
496
 
        self.approval_delay = string_to_delta(
497
 
            config["approval_delay"])
498
 
        self.approval_duration = string_to_delta(
499
 
            config["approval_duration"])
500
555
        self.changedstate = (multiprocessing_manager
501
556
                             .Condition(multiprocessing_manager
502
557
                                        .Lock()))
522
577
        if getattr(self, "enabled", False):
523
578
            # Already enabled
524
579
            return
525
 
        self.send_changedstate()
526
580
        self.expires = datetime.datetime.utcnow() + self.timeout
527
581
        self.enabled = True
528
582
        self.last_enabled = datetime.datetime.utcnow()
529
583
        self.init_checker()
 
584
        self.send_changedstate()
530
585
    
531
586
    def disable(self, quiet=True):
532
587
        """Disable this client."""
533
588
        if not getattr(self, "enabled", False):
534
589
            return False
535
590
        if not quiet:
536
 
            self.send_changedstate()
537
 
        if not quiet:
538
591
            logger.info("Disabling client %s", self.name)
539
 
        if getattr(self, "disable_initiator_tag", False):
 
592
        if getattr(self, "disable_initiator_tag", None) is not None:
540
593
            gobject.source_remove(self.disable_initiator_tag)
541
594
            self.disable_initiator_tag = None
542
595
        self.expires = None
543
 
        if getattr(self, "checker_initiator_tag", False):
 
596
        if getattr(self, "checker_initiator_tag", None) is not None:
544
597
            gobject.source_remove(self.checker_initiator_tag)
545
598
            self.checker_initiator_tag = None
546
599
        self.stop_checker()
547
600
        self.enabled = False
 
601
        if not quiet:
 
602
            self.send_changedstate()
548
603
        # Do not run this again if called by a gobject.timeout_add
549
604
        return False
550
605
    
554
609
    def init_checker(self):
555
610
        # Schedule a new checker to be started an 'interval' from now,
556
611
        # and every interval from then on.
 
612
        if self.checker_initiator_tag is not None:
 
613
            gobject.source_remove(self.checker_initiator_tag)
557
614
        self.checker_initiator_tag = (gobject.timeout_add
558
615
                                      (self.interval_milliseconds(),
559
616
                                       self.start_checker))
560
617
        # Schedule a disable() when 'timeout' has passed
 
618
        if self.disable_initiator_tag is not None:
 
619
            gobject.source_remove(self.disable_initiator_tag)
561
620
        self.disable_initiator_tag = (gobject.timeout_add
562
621
                                   (self.timeout_milliseconds(),
563
622
                                    self.disable))
569
628
        self.checker_callback_tag = None
570
629
        self.checker = None
571
630
        if os.WIFEXITED(condition):
572
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
631
            self.last_checker_status = os.WEXITSTATUS(condition)
573
632
            if self.last_checker_status == 0:
574
633
                logger.info("Checker for %(name)s succeeded",
575
634
                            vars(self))
582
641
            logger.warning("Checker for %(name)s crashed?",
583
642
                           vars(self))
584
643
    
585
 
    def checked_ok(self, timeout=None):
586
 
        """Bump up the timeout for this client.
587
 
        
588
 
        This should only be called when the client has been seen,
589
 
        alive and well.
590
 
        """
 
644
    def checked_ok(self):
 
645
        """Assert that the client has been seen, alive and well."""
 
646
        self.last_checked_ok = datetime.datetime.utcnow()
 
647
        self.last_checker_status = 0
 
648
        self.bump_timeout()
 
649
    
 
650
    def bump_timeout(self, timeout=None):
 
651
        """Bump up the timeout for this client."""
591
652
        if timeout is None:
592
653
            timeout = self.timeout
593
 
        self.last_checked_ok = datetime.datetime.utcnow()
594
654
        if self.disable_initiator_tag is not None:
595
655
            gobject.source_remove(self.disable_initiator_tag)
 
656
            self.disable_initiator_tag = None
596
657
        if getattr(self, "enabled", False):
597
658
            self.disable_initiator_tag = (gobject.timeout_add
598
 
                                          (_timedelta_to_milliseconds
 
659
                                          (timedelta_to_milliseconds
599
660
                                           (timeout), self.disable))
600
661
            self.expires = datetime.datetime.utcnow() + timeout
601
662
    
608
669
        If a checker already exists, leave it running and do
609
670
        nothing."""
610
671
        # The reason for not killing a running checker is that if we
611
 
        # did that, then if a checker (for some reason) started
612
 
        # running slowly and taking more than 'interval' time, the
613
 
        # client would inevitably timeout, since no checker would get
614
 
        # a chance to run to completion.  If we instead leave running
 
672
        # did that, and if a checker (for some reason) started running
 
673
        # slowly and taking more than 'interval' time, then the client
 
674
        # would inevitably timeout, since no checker would get a
 
675
        # chance to run to completion.  If we instead leave running
615
676
        # checkers alone, the checker would have to take more time
616
677
        # than 'timeout' for the client to be disabled, which is as it
617
678
        # should be.
631
692
                                      self.current_checker_command)
632
693
        # Start a new checker if needed
633
694
        if self.checker is None:
 
695
            # Escape attributes for the shell
 
696
            escaped_attrs = dict(
 
697
                (attr, re.escape(unicode(getattr(self, attr))))
 
698
                for attr in
 
699
                self.runtime_expansions)
634
700
            try:
635
 
                # In case checker_command has exactly one % operator
636
 
                command = self.checker_command % self.host
637
 
            except TypeError:
638
 
                # Escape attributes for the shell
639
 
                escaped_attrs = dict(
640
 
                    (attr,
641
 
                     re.escape(unicode(str(getattr(self, attr, "")),
642
 
                                       errors=
643
 
                                       'replace')))
644
 
                    for attr in
645
 
                    self.runtime_expansions)
646
 
                
647
 
                try:
648
 
                    command = self.checker_command % escaped_attrs
649
 
                except TypeError as error:
650
 
                    logger.error('Could not format string "%s":'
651
 
                                 ' %s', self.checker_command, error)
652
 
                    return True # Try again later
 
701
                command = self.checker_command % escaped_attrs
 
702
            except TypeError as error:
 
703
                logger.error('Could not format string "%s"',
 
704
                             self.checker_command, exc_info=error)
 
705
                return True # Try again later
653
706
            self.current_checker_command = command
654
707
            try:
655
708
                logger.info("Starting checker %r for %s",
661
714
                self.checker = subprocess.Popen(command,
662
715
                                                close_fds=True,
663
716
                                                shell=True, cwd="/")
664
 
                self.checker_callback_tag = (gobject.child_watch_add
665
 
                                             (self.checker.pid,
666
 
                                              self.checker_callback,
667
 
                                              data=command))
668
 
                # The checker may have completed before the gobject
669
 
                # watch was added.  Check for this.
 
717
            except OSError as error:
 
718
                logger.error("Failed to start subprocess",
 
719
                             exc_info=error)
 
720
                return True
 
721
            self.checker_callback_tag = (gobject.child_watch_add
 
722
                                         (self.checker.pid,
 
723
                                          self.checker_callback,
 
724
                                          data=command))
 
725
            # The checker may have completed before the gobject
 
726
            # watch was added.  Check for this.
 
727
            try:
670
728
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
 
                if pid:
672
 
                    gobject.source_remove(self.checker_callback_tag)
673
 
                    self.checker_callback(pid, status, command)
674
729
            except OSError as error:
675
 
                logger.error("Failed to start subprocess: %s",
676
 
                             error)
 
730
                if error.errno == errno.ECHILD:
 
731
                    # This should never happen
 
732
                    logger.error("Child process vanished",
 
733
                                 exc_info=error)
 
734
                    return True
 
735
                raise
 
736
            if pid:
 
737
                gobject.source_remove(self.checker_callback_tag)
 
738
                self.checker_callback(pid, status, command)
677
739
        # Re-run this periodically if run by gobject.timeout_add
678
740
        return True
679
741
    
686
748
            return
687
749
        logger.debug("Stopping checker for %(name)s", vars(self))
688
750
        try:
689
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
751
            self.checker.terminate()
690
752
            #time.sleep(0.5)
691
753
            #if self.checker.poll() is None:
692
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
754
            #    self.checker.kill()
693
755
        except OSError as error:
694
756
            if error.errno != errno.ESRCH: # No such process
695
757
                raise
712
774
    # "Set" method, so we fail early here:
713
775
    if byte_arrays and signature != "ay":
714
776
        raise ValueError("Byte arrays not supported for non-'ay'"
715
 
                         " signature %r" % signature)
 
777
                         " signature {0!r}".format(signature))
716
778
    def decorator(func):
717
779
        func._dbus_is_property = True
718
780
        func._dbus_interface = dbus_interface
726
788
    return decorator
727
789
 
728
790
 
 
791
def dbus_interface_annotations(dbus_interface):
 
792
    """Decorator for marking functions returning interface annotations
 
793
    
 
794
    Usage:
 
795
    
 
796
    @dbus_interface_annotations("org.example.Interface")
 
797
    def _foo(self):  # Function name does not matter
 
798
        return {"org.freedesktop.DBus.Deprecated": "true",
 
799
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
800
                    "false"}
 
801
    """
 
802
    def decorator(func):
 
803
        func._dbus_is_interface = True
 
804
        func._dbus_interface = dbus_interface
 
805
        func._dbus_name = dbus_interface
 
806
        return func
 
807
    return decorator
 
808
 
 
809
 
 
810
def dbus_annotations(annotations):
 
811
    """Decorator to annotate D-Bus methods, signals or properties
 
812
    Usage:
 
813
    
 
814
    @dbus_service_property("org.example.Interface", signature="b",
 
815
                           access="r")
 
816
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
817
                        "org.freedesktop.DBus.Property."
 
818
                        "EmitsChangedSignal": "false"})
 
819
    def Property_dbus_property(self):
 
820
        return dbus.Boolean(False)
 
821
    """
 
822
    def decorator(func):
 
823
        func._dbus_annotations = annotations
 
824
        return func
 
825
    return decorator
 
826
 
 
827
 
729
828
class DBusPropertyException(dbus.exceptions.DBusException):
730
829
    """A base class for D-Bus property-related exceptions
731
830
    """
754
853
    """
755
854
    
756
855
    @staticmethod
757
 
    def _is_dbus_property(obj):
758
 
        return getattr(obj, "_dbus_is_property", False)
 
856
    def _is_dbus_thing(thing):
 
857
        """Returns a function testing if an attribute is a D-Bus thing
 
858
        
 
859
        If called like _is_dbus_thing("method") it returns a function
 
860
        suitable for use as predicate to inspect.getmembers().
 
861
        """
 
862
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
863
                                   False)
759
864
    
760
 
    def _get_all_dbus_properties(self):
 
865
    def _get_all_dbus_things(self, thing):
761
866
        """Returns a generator of (name, attribute) pairs
762
867
        """
763
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
868
        return ((getattr(athing.__get__(self), "_dbus_name",
 
869
                         name),
 
870
                 athing.__get__(self))
764
871
                for cls in self.__class__.__mro__
765
 
                for name, prop in
766
 
                inspect.getmembers(cls, self._is_dbus_property))
 
872
                for name, athing in
 
873
                inspect.getmembers(cls,
 
874
                                   self._is_dbus_thing(thing)))
767
875
    
768
876
    def _get_dbus_property(self, interface_name, property_name):
769
877
        """Returns a bound method if one exists which is a D-Bus
771
879
        """
772
880
        for cls in  self.__class__.__mro__:
773
881
            for name, value in (inspect.getmembers
774
 
                                (cls, self._is_dbus_property)):
 
882
                                (cls,
 
883
                                 self._is_dbus_thing("property"))):
775
884
                if (value._dbus_name == property_name
776
885
                    and value._dbus_interface == interface_name):
777
886
                    return value.__get__(self)
806
915
            # signatures other than "ay".
807
916
            if prop._dbus_signature != "ay":
808
917
                raise ValueError
809
 
            value = dbus.ByteArray(''.join(unichr(byte)
810
 
                                           for byte in value))
 
918
            value = dbus.ByteArray(b''.join(chr(byte)
 
919
                                            for byte in value))
811
920
        prop(value)
812
921
    
813
922
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
819
928
        Note: Will not include properties with access="write".
820
929
        """
821
930
        properties = {}
822
 
        for name, prop in self._get_all_dbus_properties():
 
931
        for name, prop in self._get_all_dbus_things("property"):
823
932
            if (interface_name
824
933
                and interface_name != prop._dbus_interface):
825
934
                # Interface non-empty but did not match
840
949
                         path_keyword='object_path',
841
950
                         connection_keyword='connection')
842
951
    def Introspect(self, object_path, connection):
843
 
        """Standard D-Bus method, overloaded to insert property tags.
 
952
        """Overloading of standard D-Bus method.
 
953
        
 
954
        Inserts property tags and interface annotation tags.
844
955
        """
845
956
        xmlstring = dbus.service.Object.Introspect(self, object_path,
846
957
                                                   connection)
853
964
                e.setAttribute("access", prop._dbus_access)
854
965
                return e
855
966
            for if_tag in document.getElementsByTagName("interface"):
 
967
                # Add property tags
856
968
                for tag in (make_tag(document, name, prop)
857
969
                            for name, prop
858
 
                            in self._get_all_dbus_properties()
 
970
                            in self._get_all_dbus_things("property")
859
971
                            if prop._dbus_interface
860
972
                            == if_tag.getAttribute("name")):
861
973
                    if_tag.appendChild(tag)
 
974
                # Add annotation tags
 
975
                for typ in ("method", "signal", "property"):
 
976
                    for tag in if_tag.getElementsByTagName(typ):
 
977
                        annots = dict()
 
978
                        for name, prop in (self.
 
979
                                           _get_all_dbus_things(typ)):
 
980
                            if (name == tag.getAttribute("name")
 
981
                                and prop._dbus_interface
 
982
                                == if_tag.getAttribute("name")):
 
983
                                annots.update(getattr
 
984
                                              (prop,
 
985
                                               "_dbus_annotations",
 
986
                                               {}))
 
987
                        for name, value in annots.iteritems():
 
988
                            ann_tag = document.createElement(
 
989
                                "annotation")
 
990
                            ann_tag.setAttribute("name", name)
 
991
                            ann_tag.setAttribute("value", value)
 
992
                            tag.appendChild(ann_tag)
 
993
                # Add interface annotation tags
 
994
                for annotation, value in dict(
 
995
                    itertools.chain.from_iterable(
 
996
                        annotations().iteritems()
 
997
                        for name, annotations in
 
998
                        self._get_all_dbus_things("interface")
 
999
                        if name == if_tag.getAttribute("name")
 
1000
                        )).iteritems():
 
1001
                    ann_tag = document.createElement("annotation")
 
1002
                    ann_tag.setAttribute("name", annotation)
 
1003
                    ann_tag.setAttribute("value", value)
 
1004
                    if_tag.appendChild(ann_tag)
862
1005
                # Add the names to the return values for the
863
1006
                # "org.freedesktop.DBus.Properties" methods
864
1007
                if (if_tag.getAttribute("name")
879
1022
        except (AttributeError, xml.dom.DOMException,
880
1023
                xml.parsers.expat.ExpatError) as error:
881
1024
            logger.error("Failed to override Introspection method",
882
 
                         error)
 
1025
                         exc_info=error)
883
1026
        return xmlstring
884
1027
 
885
1028
 
886
 
def datetime_to_dbus (dt, variant_level=0):
 
1029
def datetime_to_dbus(dt, variant_level=0):
887
1030
    """Convert a UTC datetime.datetime() to a D-Bus type."""
888
1031
    if dt is None:
889
1032
        return dbus.String("", variant_level = variant_level)
891
1034
                       variant_level=variant_level)
892
1035
 
893
1036
 
894
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
895
 
                                  .__metaclass__):
896
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
897
 
    will add additional D-Bus attributes matching a certain pattern.
 
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1038
    """A class decorator; applied to a subclass of
 
1039
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1040
    interface names according to the "alt_interface_names" mapping.
 
1041
    Usage:
 
1042
    
 
1043
    @alternate_dbus_interfaces({"org.example.Interface":
 
1044
                                    "net.example.AlternateInterface"})
 
1045
    class SampleDBusObject(dbus.service.Object):
 
1046
        @dbus.service.method("org.example.Interface")
 
1047
        def SampleDBusMethod():
 
1048
            pass
 
1049
    
 
1050
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1051
    reachable via two interfaces: "org.example.Interface" and
 
1052
    "net.example.AlternateInterface", the latter of which will have
 
1053
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1054
    "true", unless "deprecate" is passed with a False value.
 
1055
    
 
1056
    This works for methods and signals, and also for D-Bus properties
 
1057
    (from DBusObjectWithProperties) and interfaces (from the
 
1058
    dbus_interface_annotations decorator).
898
1059
    """
899
 
    def __new__(mcs, name, bases, attr):
900
 
        # Go through all the base classes which could have D-Bus
901
 
        # methods, signals, or properties in them
902
 
        for base in (b for b in bases
903
 
                     if issubclass(b, dbus.service.Object)):
904
 
            # Go though all attributes of the base class
905
 
            for attrname, attribute in inspect.getmembers(base):
 
1060
    def wrapper(cls):
 
1061
        for orig_interface_name, alt_interface_name in (
 
1062
            alt_interface_names.iteritems()):
 
1063
            attr = {}
 
1064
            interface_names = set()
 
1065
            # Go though all attributes of the class
 
1066
            for attrname, attribute in inspect.getmembers(cls):
906
1067
                # Ignore non-D-Bus attributes, and D-Bus attributes
907
1068
                # with the wrong interface name
908
1069
                if (not hasattr(attribute, "_dbus_interface")
909
1070
                    or not attribute._dbus_interface
910
 
                    .startswith("se.recompile.Mandos")):
 
1071
                    .startswith(orig_interface_name)):
911
1072
                    continue
912
1073
                # Create an alternate D-Bus interface name based on
913
1074
                # the current name
914
1075
                alt_interface = (attribute._dbus_interface
915
 
                                 .replace("se.recompile.Mandos",
916
 
                                          "se.bsnet.fukt.Mandos"))
 
1076
                                 .replace(orig_interface_name,
 
1077
                                          alt_interface_name))
 
1078
                interface_names.add(alt_interface)
917
1079
                # Is this a D-Bus signal?
918
1080
                if getattr(attribute, "_dbus_is_signal", False):
919
1081
                    # Extract the original non-method function by
934
1096
                                nonmethod_func.func_name,
935
1097
                                nonmethod_func.func_defaults,
936
1098
                                nonmethod_func.func_closure)))
 
1099
                    # Copy annotations, if any
 
1100
                    try:
 
1101
                        new_function._dbus_annotations = (
 
1102
                            dict(attribute._dbus_annotations))
 
1103
                    except AttributeError:
 
1104
                        pass
937
1105
                    # Define a creator of a function to call both the
938
 
                    # old and new functions, so both the old and new
939
 
                    # signals gets sent when the function is called
 
1106
                    # original and alternate functions, so both the
 
1107
                    # original and alternate signals gets sent when
 
1108
                    # the function is called
940
1109
                    def fixscope(func1, func2):
941
1110
                        """This function is a scope container to pass
942
1111
                        func1 and func2 to the "call_both" function
949
1118
                        return call_both
950
1119
                    # Create the "call_both" function and add it to
951
1120
                    # the class
952
 
                    attr[attrname] = fixscope(attribute,
953
 
                                              new_function)
 
1121
                    attr[attrname] = fixscope(attribute, new_function)
954
1122
                # Is this a D-Bus method?
955
1123
                elif getattr(attribute, "_dbus_is_method", False):
956
1124
                    # Create a new, but exactly alike, function
967
1135
                                        attribute.func_name,
968
1136
                                        attribute.func_defaults,
969
1137
                                        attribute.func_closure)))
 
1138
                    # Copy annotations, if any
 
1139
                    try:
 
1140
                        attr[attrname]._dbus_annotations = (
 
1141
                            dict(attribute._dbus_annotations))
 
1142
                    except AttributeError:
 
1143
                        pass
970
1144
                # Is this a D-Bus property?
971
1145
                elif getattr(attribute, "_dbus_is_property", False):
972
1146
                    # Create a new, but exactly alike, function
986
1160
                                        attribute.func_name,
987
1161
                                        attribute.func_defaults,
988
1162
                                        attribute.func_closure)))
989
 
        return type.__new__(mcs, name, bases, attr)
990
 
 
991
 
 
 
1163
                    # Copy annotations, if any
 
1164
                    try:
 
1165
                        attr[attrname]._dbus_annotations = (
 
1166
                            dict(attribute._dbus_annotations))
 
1167
                    except AttributeError:
 
1168
                        pass
 
1169
                # Is this a D-Bus interface?
 
1170
                elif getattr(attribute, "_dbus_is_interface", False):
 
1171
                    # Create a new, but exactly alike, function
 
1172
                    # object.  Decorate it to be a new D-Bus interface
 
1173
                    # with the alternate D-Bus interface name.  Add it
 
1174
                    # to the class.
 
1175
                    attr[attrname] = (dbus_interface_annotations
 
1176
                                      (alt_interface)
 
1177
                                      (types.FunctionType
 
1178
                                       (attribute.func_code,
 
1179
                                        attribute.func_globals,
 
1180
                                        attribute.func_name,
 
1181
                                        attribute.func_defaults,
 
1182
                                        attribute.func_closure)))
 
1183
            if deprecate:
 
1184
                # Deprecate all alternate interfaces
 
1185
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1186
                for interface_name in interface_names:
 
1187
                    @dbus_interface_annotations(interface_name)
 
1188
                    def func(self):
 
1189
                        return { "org.freedesktop.DBus.Deprecated":
 
1190
                                     "true" }
 
1191
                    # Find an unused name
 
1192
                    for aname in (iname.format(i)
 
1193
                                  for i in itertools.count()):
 
1194
                        if aname not in attr:
 
1195
                            attr[aname] = func
 
1196
                            break
 
1197
            if interface_names:
 
1198
                # Replace the class with a new subclass of it with
 
1199
                # methods, signals, etc. as created above.
 
1200
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1201
                           (cls,), attr)
 
1202
        return cls
 
1203
    return wrapper
 
1204
 
 
1205
 
 
1206
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1207
                                "se.bsnet.fukt.Mandos"})
992
1208
class ClientDBus(Client, DBusObjectWithProperties):
993
1209
    """A Client class using D-Bus
994
1210
    
1005
1221
    def __init__(self, bus = None, *args, **kwargs):
1006
1222
        self.bus = bus
1007
1223
        Client.__init__(self, *args, **kwargs)
1008
 
        
1009
 
        self._approvals_pending = 0
1010
1224
        # Only now, when this client is initialized, can it show up on
1011
1225
        # the D-Bus
1012
1226
        client_object_name = unicode(self.name).translate(
1016
1230
                                 ("/clients/" + client_object_name))
1017
1231
        DBusObjectWithProperties.__init__(self, self.bus,
1018
1232
                                          self.dbus_object_path)
1019
 
        
 
1233
    
1020
1234
    def notifychangeproperty(transform_func,
1021
1235
                             dbus_name, type_func=lambda x: x,
1022
1236
                             variant_level=1):
1045
1259
        
1046
1260
        return property(lambda self: getattr(self, attrname), setter)
1047
1261
    
1048
 
    
1049
1262
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1050
1263
    approvals_pending = notifychangeproperty(dbus.Boolean,
1051
1264
                                             "ApprovalPending",
1058
1271
                                       checker is not None)
1059
1272
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1060
1273
                                           "LastCheckedOK")
 
1274
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1275
                                               "LastCheckerStatus")
1061
1276
    last_approval_request = notifychangeproperty(
1062
1277
        datetime_to_dbus, "LastApprovalRequest")
1063
1278
    approved_by_default = notifychangeproperty(dbus.Boolean,
1064
1279
                                               "ApprovedByDefault")
1065
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1280
    approval_delay = notifychangeproperty(dbus.UInt64,
1066
1281
                                          "ApprovalDelay",
1067
1282
                                          type_func =
1068
 
                                          _timedelta_to_milliseconds)
 
1283
                                          timedelta_to_milliseconds)
1069
1284
    approval_duration = notifychangeproperty(
1070
 
        dbus.UInt16, "ApprovalDuration",
1071
 
        type_func = _timedelta_to_milliseconds)
 
1285
        dbus.UInt64, "ApprovalDuration",
 
1286
        type_func = timedelta_to_milliseconds)
1072
1287
    host = notifychangeproperty(dbus.String, "Host")
1073
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1288
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1074
1289
                                   type_func =
1075
 
                                   _timedelta_to_milliseconds)
 
1290
                                   timedelta_to_milliseconds)
1076
1291
    extended_timeout = notifychangeproperty(
1077
 
        dbus.UInt16, "ExtendedTimeout",
1078
 
        type_func = _timedelta_to_milliseconds)
1079
 
    interval = notifychangeproperty(dbus.UInt16,
 
1292
        dbus.UInt64, "ExtendedTimeout",
 
1293
        type_func = timedelta_to_milliseconds)
 
1294
    interval = notifychangeproperty(dbus.UInt64,
1080
1295
                                    "Interval",
1081
1296
                                    type_func =
1082
 
                                    _timedelta_to_milliseconds)
 
1297
                                    timedelta_to_milliseconds)
1083
1298
    checker_command = notifychangeproperty(dbus.String, "Checker")
1084
1299
    
1085
1300
    del notifychangeproperty
1127
1342
        return r
1128
1343
    
1129
1344
    def _reset_approved(self):
1130
 
        self._approved = None
 
1345
        self.approved = None
1131
1346
        return False
1132
1347
    
1133
1348
    def approve(self, value=True):
1134
 
        self.send_changedstate()
1135
 
        self._approved = value
1136
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1349
        self.approved = value
 
1350
        gobject.timeout_add(timedelta_to_milliseconds
1137
1351
                            (self.approval_duration),
1138
1352
                            self._reset_approved)
1139
 
    
 
1353
        self.send_changedstate()
1140
1354
    
1141
1355
    ## D-Bus methods, signals & properties
1142
1356
    _interface = "se.recompile.Mandos.Client"
1143
1357
    
 
1358
    ## Interfaces
 
1359
    
 
1360
    @dbus_interface_annotations(_interface)
 
1361
    def _foo(self):
 
1362
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1363
                     "false"}
 
1364
    
1144
1365
    ## Signals
1145
1366
    
1146
1367
    # CheckerCompleted - signal
1182
1403
        "D-Bus signal"
1183
1404
        return self.need_approval()
1184
1405
    
1185
 
    # NeRwequest - signal
1186
 
    @dbus.service.signal(_interface, signature="s")
1187
 
    def NewRequest(self, ip):
1188
 
        """D-Bus signal
1189
 
        Is sent after a client request a password.
1190
 
        """
1191
 
        pass
1192
 
    
1193
1406
    ## Methods
1194
1407
    
1195
1408
    # Approve - method
1253
1466
                           access="readwrite")
1254
1467
    def ApprovalDuration_dbus_property(self, value=None):
1255
1468
        if value is None:       # get
1256
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1469
            return dbus.UInt64(timedelta_to_milliseconds(
1257
1470
                    self.approval_duration))
1258
1471
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1259
1472
    
1273
1486
    def Host_dbus_property(self, value=None):
1274
1487
        if value is None:       # get
1275
1488
            return dbus.String(self.host)
1276
 
        self.host = value
 
1489
        self.host = unicode(value)
1277
1490
    
1278
1491
    # Created - property
1279
1492
    @dbus_service_property(_interface, signature="s", access="read")
1280
1493
    def Created_dbus_property(self):
1281
 
        return dbus.String(datetime_to_dbus(self.created))
 
1494
        return datetime_to_dbus(self.created)
1282
1495
    
1283
1496
    # LastEnabled - property
1284
1497
    @dbus_service_property(_interface, signature="s", access="read")
1305
1518
            return
1306
1519
        return datetime_to_dbus(self.last_checked_ok)
1307
1520
    
 
1521
    # LastCheckerStatus - property
 
1522
    @dbus_service_property(_interface, signature="n",
 
1523
                           access="read")
 
1524
    def LastCheckerStatus_dbus_property(self):
 
1525
        return dbus.Int16(self.last_checker_status)
 
1526
    
1308
1527
    # Expires - property
1309
1528
    @dbus_service_property(_interface, signature="s", access="read")
1310
1529
    def Expires_dbus_property(self):
1321
1540
    def Timeout_dbus_property(self, value=None):
1322
1541
        if value is None:       # get
1323
1542
            return dbus.UInt64(self.timeout_milliseconds())
 
1543
        old_timeout = self.timeout
1324
1544
        self.timeout = datetime.timedelta(0, 0, 0, value)
1325
 
        if getattr(self, "disable_initiator_tag", None) is None:
1326
 
            return
1327
 
        # Reschedule timeout
1328
 
        gobject.source_remove(self.disable_initiator_tag)
1329
 
        self.disable_initiator_tag = None
1330
 
        self.expires = None
1331
 
        time_to_die = _timedelta_to_milliseconds((self
1332
 
                                                  .last_checked_ok
1333
 
                                                  + self.timeout)
1334
 
                                                 - datetime.datetime
1335
 
                                                 .utcnow())
1336
 
        if time_to_die <= 0:
1337
 
            # The timeout has passed
1338
 
            self.disable()
1339
 
        else:
1340
 
            self.expires = (datetime.datetime.utcnow()
1341
 
                            + datetime.timedelta(milliseconds =
1342
 
                                                 time_to_die))
1343
 
            self.disable_initiator_tag = (gobject.timeout_add
1344
 
                                          (time_to_die, self.disable))
 
1545
        # Reschedule disabling
 
1546
        if self.enabled:
 
1547
            now = datetime.datetime.utcnow()
 
1548
            self.expires += self.timeout - old_timeout
 
1549
            if self.expires <= now:
 
1550
                # The timeout has passed
 
1551
                self.disable()
 
1552
            else:
 
1553
                if (getattr(self, "disable_initiator_tag", None)
 
1554
                    is None):
 
1555
                    return
 
1556
                gobject.source_remove(self.disable_initiator_tag)
 
1557
                self.disable_initiator_tag = (
 
1558
                    gobject.timeout_add(
 
1559
                        timedelta_to_milliseconds(self.expires - now),
 
1560
                        self.disable))
1345
1561
    
1346
1562
    # ExtendedTimeout - property
1347
1563
    @dbus_service_property(_interface, signature="t",
1360
1576
        self.interval = datetime.timedelta(0, 0, 0, value)
1361
1577
        if getattr(self, "checker_initiator_tag", None) is None:
1362
1578
            return
1363
 
        # Reschedule checker run
1364
 
        gobject.source_remove(self.checker_initiator_tag)
1365
 
        self.checker_initiator_tag = (gobject.timeout_add
1366
 
                                      (value, self.start_checker))
1367
 
        self.start_checker()    # Start one now, too
 
1579
        if self.enabled:
 
1580
            # Reschedule checker run
 
1581
            gobject.source_remove(self.checker_initiator_tag)
 
1582
            self.checker_initiator_tag = (gobject.timeout_add
 
1583
                                          (value, self.start_checker))
 
1584
            self.start_checker()    # Start one now, too
1368
1585
    
1369
1586
    # Checker - property
1370
1587
    @dbus_service_property(_interface, signature="s",
1372
1589
    def Checker_dbus_property(self, value=None):
1373
1590
        if value is None:       # get
1374
1591
            return dbus.String(self.checker_command)
1375
 
        self.checker_command = value
 
1592
        self.checker_command = unicode(value)
1376
1593
    
1377
1594
    # CheckerRunning - property
1378
1595
    @dbus_service_property(_interface, signature="b",
1407
1624
            raise KeyError()
1408
1625
    
1409
1626
    def __getattribute__(self, name):
1410
 
        if(name == '_pipe'):
 
1627
        if name == '_pipe':
1411
1628
            return super(ProxyClient, self).__getattribute__(name)
1412
1629
        self._pipe.send(('getattr', name))
1413
1630
        data = self._pipe.recv()
1420
1637
            return func
1421
1638
    
1422
1639
    def __setattr__(self, name, value):
1423
 
        if(name == '_pipe'):
 
1640
        if name == '_pipe':
1424
1641
            return super(ProxyClient, self).__setattr__(name, value)
1425
1642
        self._pipe.send(('setattr', name, value))
1426
1643
 
1427
1644
 
1428
 
class ClientDBusTransitional(ClientDBus):
1429
 
    __metaclass__ = AlternateDBusNamesMetaclass
1430
 
 
1431
 
 
1432
1645
class ClientHandler(socketserver.BaseRequestHandler, object):
1433
1646
    """A class to handle client connections.
1434
1647
    
1495
1708
                    logger.warning("Bad certificate: %s", error)
1496
1709
                    return
1497
1710
                logger.debug("Fingerprint: %s", fpr)
1498
 
                if self.server.use_dbus:
1499
 
                    # Emit D-Bus signal
1500
 
                    client.NewRequest(str(self.client_address))
1501
1711
                
1502
1712
                try:
1503
1713
                    client = ProxyClient(child_pipe, fpr,
1519
1729
                            client.Rejected("Disabled")
1520
1730
                        return
1521
1731
                    
1522
 
                    if client._approved or not client.approval_delay:
 
1732
                    if client.approved or not client.approval_delay:
1523
1733
                        #We are approved or approval is disabled
1524
1734
                        break
1525
 
                    elif client._approved is None:
 
1735
                    elif client.approved is None:
1526
1736
                        logger.info("Client %s needs approval",
1527
1737
                                    client.name)
1528
1738
                        if self.server.use_dbus:
1541
1751
                    #wait until timeout or approved
1542
1752
                    time = datetime.datetime.now()
1543
1753
                    client.changedstate.acquire()
1544
 
                    (client.changedstate.wait
1545
 
                     (float(client._timedelta_to_milliseconds(delay)
1546
 
                            / 1000)))
 
1754
                    client.changedstate.wait(
 
1755
                        float(timedelta_to_milliseconds(delay)
 
1756
                              / 1000))
1547
1757
                    client.changedstate.release()
1548
1758
                    time2 = datetime.datetime.now()
1549
1759
                    if (time2 - time) >= delay:
1565
1775
                    try:
1566
1776
                        sent = session.send(client.secret[sent_size:])
1567
1777
                    except gnutls.errors.GNUTLSError as error:
1568
 
                        logger.warning("gnutls send failed")
 
1778
                        logger.warning("gnutls send failed",
 
1779
                                       exc_info=error)
1569
1780
                        return
1570
1781
                    logger.debug("Sent: %d, remaining: %d",
1571
1782
                                 sent, len(client.secret)
1574
1785
                
1575
1786
                logger.info("Sending secret to %s", client.name)
1576
1787
                # bump the timeout using extended_timeout
1577
 
                client.checked_ok(client.extended_timeout)
 
1788
                client.bump_timeout(client.extended_timeout)
1578
1789
                if self.server.use_dbus:
1579
1790
                    # Emit D-Bus signal
1580
1791
                    client.GotSecret()
1585
1796
                try:
1586
1797
                    session.bye()
1587
1798
                except gnutls.errors.GNUTLSError as error:
1588
 
                    logger.warning("GnuTLS bye failed")
 
1799
                    logger.warning("GnuTLS bye failed",
 
1800
                                   exc_info=error)
1589
1801
    
1590
1802
    @staticmethod
1591
1803
    def peer_certificate(session):
1656
1868
    def sub_process_main(self, request, address):
1657
1869
        try:
1658
1870
            self.finish_request(request, address)
1659
 
        except:
 
1871
        except Exception:
1660
1872
            self.handle_error(request, address)
1661
1873
        self.close_request(request)
1662
1874
    
1663
1875
    def process_request(self, request, address):
1664
1876
        """Start a new process to process the request."""
1665
1877
        proc = multiprocessing.Process(target = self.sub_process_main,
1666
 
                                       args = (request,
1667
 
                                               address))
 
1878
                                       args = (request, address))
1668
1879
        proc.start()
1669
1880
        return proc
1670
1881
 
1698
1909
        use_ipv6:       Boolean; to use IPv6 or not
1699
1910
    """
1700
1911
    def __init__(self, server_address, RequestHandlerClass,
1701
 
                 interface=None, use_ipv6=True):
 
1912
                 interface=None, use_ipv6=True, socketfd=None):
 
1913
        """If socketfd is set, use that file descriptor instead of
 
1914
        creating a new one with socket.socket().
 
1915
        """
1702
1916
        self.interface = interface
1703
1917
        if use_ipv6:
1704
1918
            self.address_family = socket.AF_INET6
 
1919
        if socketfd is not None:
 
1920
            # Save the file descriptor
 
1921
            self.socketfd = socketfd
 
1922
            # Save the original socket.socket() function
 
1923
            self.socket_socket = socket.socket
 
1924
            # To implement --socket, we monkey patch socket.socket.
 
1925
            # 
 
1926
            # (When socketserver.TCPServer is a new-style class, we
 
1927
            # could make self.socket into a property instead of monkey
 
1928
            # patching socket.socket.)
 
1929
            # 
 
1930
            # Create a one-time-only replacement for socket.socket()
 
1931
            @functools.wraps(socket.socket)
 
1932
            def socket_wrapper(*args, **kwargs):
 
1933
                # Restore original function so subsequent calls are
 
1934
                # not affected.
 
1935
                socket.socket = self.socket_socket
 
1936
                del self.socket_socket
 
1937
                # This time only, return a new socket object from the
 
1938
                # saved file descriptor.
 
1939
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1940
            # Replace socket.socket() function with wrapper
 
1941
            socket.socket = socket_wrapper
 
1942
        # The socketserver.TCPServer.__init__ will call
 
1943
        # socket.socket(), which might be our replacement,
 
1944
        # socket_wrapper(), if socketfd was set.
1705
1945
        socketserver.TCPServer.__init__(self, server_address,
1706
1946
                                        RequestHandlerClass)
 
1947
    
1707
1948
    def server_bind(self):
1708
1949
        """This overrides the normal server_bind() function
1709
1950
        to bind to an interface if one was specified, and also NOT to
1717
1958
                try:
1718
1959
                    self.socket.setsockopt(socket.SOL_SOCKET,
1719
1960
                                           SO_BINDTODEVICE,
1720
 
                                           str(self.interface
1721
 
                                               + '\0'))
 
1961
                                           str(self.interface + '\0'))
1722
1962
                except socket.error as error:
1723
 
                    if error[0] == errno.EPERM:
1724
 
                        logger.error("No permission to"
1725
 
                                     " bind to interface %s",
1726
 
                                     self.interface)
1727
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1963
                    if error.errno == errno.EPERM:
 
1964
                        logger.error("No permission to bind to"
 
1965
                                     " interface %s", self.interface)
 
1966
                    elif error.errno == errno.ENOPROTOOPT:
1728
1967
                        logger.error("SO_BINDTODEVICE not available;"
1729
1968
                                     " cannot bind to interface %s",
1730
1969
                                     self.interface)
 
1970
                    elif error.errno == errno.ENODEV:
 
1971
                        logger.error("Interface %s does not exist,"
 
1972
                                     " cannot bind", self.interface)
1731
1973
                    else:
1732
1974
                        raise
1733
1975
        # Only bind(2) the socket if we really need to.
1763
2005
    """
1764
2006
    def __init__(self, server_address, RequestHandlerClass,
1765
2007
                 interface=None, use_ipv6=True, clients=None,
1766
 
                 gnutls_priority=None, use_dbus=True):
 
2008
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1767
2009
        self.enabled = False
1768
2010
        self.clients = clients
1769
2011
        if self.clients is None:
1773
2015
        IPv6_TCPServer.__init__(self, server_address,
1774
2016
                                RequestHandlerClass,
1775
2017
                                interface = interface,
1776
 
                                use_ipv6 = use_ipv6)
 
2018
                                use_ipv6 = use_ipv6,
 
2019
                                socketfd = socketfd)
1777
2020
    def server_activate(self):
1778
2021
        if self.enabled:
1779
2022
            return socketserver.TCPServer.server_activate(self)
1792
2035
    
1793
2036
    def handle_ipc(self, source, condition, parent_pipe=None,
1794
2037
                   proc = None, client_object=None):
1795
 
        condition_names = {
1796
 
            gobject.IO_IN: "IN",   # There is data to read.
1797
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1798
 
                                    # blocking).
1799
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1800
 
            gobject.IO_ERR: "ERR", # Error condition.
1801
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1802
 
                                    # broken, usually for pipes and
1803
 
                                    # sockets).
1804
 
            }
1805
 
        conditions_string = ' | '.join(name
1806
 
                                       for cond, name in
1807
 
                                       condition_names.iteritems()
1808
 
                                       if cond & condition)
1809
2038
        # error, or the other end of multiprocessing.Pipe has closed
1810
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2039
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1811
2040
            # Wait for other process to exit
1812
2041
            proc.join()
1813
2042
            return False
1871
2100
        return True
1872
2101
 
1873
2102
 
 
2103
def rfc3339_duration_to_delta(duration):
 
2104
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2105
    
 
2106
    >>> rfc3339_duration_to_delta("P7D")
 
2107
    datetime.timedelta(7)
 
2108
    >>> rfc3339_duration_to_delta("PT60S")
 
2109
    datetime.timedelta(0, 60)
 
2110
    >>> rfc3339_duration_to_delta("PT60M")
 
2111
    datetime.timedelta(0, 3600)
 
2112
    >>> rfc3339_duration_to_delta("PT24H")
 
2113
    datetime.timedelta(1)
 
2114
    >>> rfc3339_duration_to_delta("P1W")
 
2115
    datetime.timedelta(7)
 
2116
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2117
    datetime.timedelta(0, 330)
 
2118
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2119
    datetime.timedelta(1, 200)
 
2120
    """
 
2121
    
 
2122
    # Parsing an RFC 3339 duration with regular expressions is not
 
2123
    # possible - there would have to be multiple places for the same
 
2124
    # values, like seconds.  The current code, while more esoteric, is
 
2125
    # cleaner without depending on a parsing library.  If Python had a
 
2126
    # built-in library for parsing we would use it, but we'd like to
 
2127
    # avoid excessive use of external libraries.
 
2128
    
 
2129
    # New type for defining tokens, syntax, and semantics all-in-one
 
2130
    Token = collections.namedtuple("Token",
 
2131
                                   ("regexp", # To match token; if
 
2132
                                              # "value" is not None,
 
2133
                                              # must have a "group"
 
2134
                                              # containing digits
 
2135
                                    "value",  # datetime.timedelta or
 
2136
                                              # None
 
2137
                                    "followers")) # Tokens valid after
 
2138
                                                  # this token
 
2139
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2140
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2141
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2142
    token_second = Token(re.compile(r"(\d+)S"),
 
2143
                         datetime.timedelta(seconds=1),
 
2144
                         frozenset((token_end,)))
 
2145
    token_minute = Token(re.compile(r"(\d+)M"),
 
2146
                         datetime.timedelta(minutes=1),
 
2147
                         frozenset((token_second, token_end)))
 
2148
    token_hour = Token(re.compile(r"(\d+)H"),
 
2149
                       datetime.timedelta(hours=1),
 
2150
                       frozenset((token_minute, token_end)))
 
2151
    token_time = Token(re.compile(r"T"),
 
2152
                       None,
 
2153
                       frozenset((token_hour, token_minute,
 
2154
                                  token_second)))
 
2155
    token_day = Token(re.compile(r"(\d+)D"),
 
2156
                      datetime.timedelta(days=1),
 
2157
                      frozenset((token_time, token_end)))
 
2158
    token_month = Token(re.compile(r"(\d+)M"),
 
2159
                        datetime.timedelta(weeks=4),
 
2160
                        frozenset((token_day, token_end)))
 
2161
    token_year = Token(re.compile(r"(\d+)Y"),
 
2162
                       datetime.timedelta(weeks=52),
 
2163
                       frozenset((token_month, token_end)))
 
2164
    token_week = Token(re.compile(r"(\d+)W"),
 
2165
                       datetime.timedelta(weeks=1),
 
2166
                       frozenset((token_end,)))
 
2167
    token_duration = Token(re.compile(r"P"), None,
 
2168
                           frozenset((token_year, token_month,
 
2169
                                      token_day, token_time,
 
2170
                                      token_week))),
 
2171
    # Define starting values
 
2172
    value = datetime.timedelta() # Value so far
 
2173
    found_token = None
 
2174
    followers = frozenset(token_duration,) # Following valid tokens
 
2175
    s = duration                # String left to parse
 
2176
    # Loop until end token is found
 
2177
    while found_token is not token_end:
 
2178
        # Search for any currently valid tokens
 
2179
        for token in followers:
 
2180
            match = token.regexp.match(s)
 
2181
            if match is not None:
 
2182
                # Token found
 
2183
                if token.value is not None:
 
2184
                    # Value found, parse digits
 
2185
                    factor = int(match.group(1), 10)
 
2186
                    # Add to value so far
 
2187
                    value += factor * token.value
 
2188
                # Strip token from string
 
2189
                s = token.regexp.sub("", s, 1)
 
2190
                # Go to found token
 
2191
                found_token = token
 
2192
                # Set valid next tokens
 
2193
                followers = found_token.followers
 
2194
                break
 
2195
        else:
 
2196
            # No currently valid tokens were found
 
2197
            raise ValueError("Invalid RFC 3339 duration")
 
2198
    # End token found
 
2199
    return value
 
2200
 
 
2201
 
1874
2202
def string_to_delta(interval):
1875
2203
    """Parse a string and return a datetime.timedelta
1876
2204
    
1887
2215
    >>> string_to_delta('5m 30s')
1888
2216
    datetime.timedelta(0, 330)
1889
2217
    """
 
2218
    
 
2219
    try:
 
2220
        return rfc3339_duration_to_delta(interval)
 
2221
    except ValueError:
 
2222
        pass
 
2223
    
1890
2224
    timevalue = datetime.timedelta(0)
1891
2225
    for s in interval.split():
1892
2226
        try:
1903
2237
            elif suffix == "w":
1904
2238
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1905
2239
            else:
1906
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2240
                raise ValueError("Unknown suffix {0!r}"
 
2241
                                 .format(suffix))
1907
2242
        except (ValueError, IndexError) as e:
1908
2243
            raise ValueError(*(e.args))
1909
2244
        timevalue += delta
1923
2258
        sys.exit()
1924
2259
    if not noclose:
1925
2260
        # Close all standard open file descriptors
1926
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2261
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1927
2262
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1928
2263
            raise OSError(errno.ENODEV,
1929
 
                          "%s not a character device"
1930
 
                          % os.path.devnull)
 
2264
                          "{0} not a character device"
 
2265
                          .format(os.devnull))
1931
2266
        os.dup2(null, sys.stdin.fileno())
1932
2267
        os.dup2(null, sys.stdout.fileno())
1933
2268
        os.dup2(null, sys.stderr.fileno())
1942
2277
    
1943
2278
    parser = argparse.ArgumentParser()
1944
2279
    parser.add_argument("-v", "--version", action="version",
1945
 
                        version = "%%(prog)s %s" % version,
 
2280
                        version = "%(prog)s {0}".format(version),
1946
2281
                        help="show version number and exit")
1947
2282
    parser.add_argument("-i", "--interface", metavar="IF",
1948
2283
                        help="Bind to interface IF")
1972
2307
                        dest="use_ipv6", help="Do not use IPv6")
1973
2308
    parser.add_argument("--no-restore", action="store_false",
1974
2309
                        dest="restore", help="Do not restore stored"
1975
 
                        " state", default=True)
 
2310
                        " state")
 
2311
    parser.add_argument("--socket", type=int,
 
2312
                        help="Specify a file descriptor to a network"
 
2313
                        " socket to use instead of creating one")
 
2314
    parser.add_argument("--statedir", metavar="DIR",
 
2315
                        help="Directory to save/restore state in")
 
2316
    parser.add_argument("--foreground", action="store_true",
 
2317
                        help="Run in foreground")
1976
2318
    
1977
2319
    options = parser.parse_args()
1978
2320
    
1992
2334
                        "use_dbus": "True",
1993
2335
                        "use_ipv6": "True",
1994
2336
                        "debuglevel": "",
 
2337
                        "restore": "True",
 
2338
                        "socket": "",
 
2339
                        "statedir": "/var/lib/mandos",
 
2340
                        "foreground": "False",
1995
2341
                        }
1996
2342
    
1997
2343
    # Parse config file for server-global settings
2002
2348
    # Convert the SafeConfigParser object to a dict
2003
2349
    server_settings = server_config.defaults()
2004
2350
    # Use the appropriate methods on the non-string config options
2005
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2351
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2006
2352
        server_settings[option] = server_config.getboolean("DEFAULT",
2007
2353
                                                           option)
2008
2354
    if server_settings["port"]:
2009
2355
        server_settings["port"] = server_config.getint("DEFAULT",
2010
2356
                                                       "port")
 
2357
    if server_settings["socket"]:
 
2358
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2359
                                                         "socket")
 
2360
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2361
        # over with an opened os.devnull.  But we don't want this to
 
2362
        # happen with a supplied network socket.
 
2363
        if 0 <= server_settings["socket"] <= 2:
 
2364
            server_settings["socket"] = os.dup(server_settings
 
2365
                                               ["socket"])
2011
2366
    del server_config
2012
2367
    
2013
2368
    # Override the settings from the config file with command line
2014
2369
    # options, if set.
2015
2370
    for option in ("interface", "address", "port", "debug",
2016
2371
                   "priority", "servicename", "configdir",
2017
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2372
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2373
                   "statedir", "socket", "foreground"):
2018
2374
        value = getattr(options, option)
2019
2375
        if value is not None:
2020
2376
            server_settings[option] = value
2023
2379
    for option in server_settings.keys():
2024
2380
        if type(server_settings[option]) is str:
2025
2381
            server_settings[option] = unicode(server_settings[option])
 
2382
    # Debug implies foreground
 
2383
    if server_settings["debug"]:
 
2384
        server_settings["foreground"] = True
2026
2385
    # Now we have our good server settings in "server_settings"
2027
2386
    
2028
2387
    ##################################################################
2032
2391
    debuglevel = server_settings["debuglevel"]
2033
2392
    use_dbus = server_settings["use_dbus"]
2034
2393
    use_ipv6 = server_settings["use_ipv6"]
 
2394
    stored_state_path = os.path.join(server_settings["statedir"],
 
2395
                                     stored_state_file)
 
2396
    foreground = server_settings["foreground"]
2035
2397
    
2036
2398
    if debug:
2037
 
        initlogger(logging.DEBUG)
 
2399
        initlogger(debug, logging.DEBUG)
2038
2400
    else:
2039
2401
        if not debuglevel:
2040
 
            initlogger()
 
2402
            initlogger(debug)
2041
2403
        else:
2042
2404
            level = getattr(logging, debuglevel.upper())
2043
 
            initlogger(level)
 
2405
            initlogger(debug, level)
2044
2406
    
2045
2407
    if server_settings["servicename"] != "Mandos":
2046
2408
        syslogger.setFormatter(logging.Formatter
2047
 
                               ('Mandos (%s) [%%(process)d]:'
2048
 
                                ' %%(levelname)s: %%(message)s'
2049
 
                                % server_settings["servicename"]))
 
2409
                               ('Mandos ({0}) [%(process)d]:'
 
2410
                                ' %(levelname)s: %(message)s'
 
2411
                                .format(server_settings
 
2412
                                        ["servicename"])))
2050
2413
    
2051
2414
    # Parse config file with clients
2052
 
    client_defaults = { "timeout": "5m",
2053
 
                        "extended_timeout": "15m",
2054
 
                        "interval": "2m",
2055
 
                        "checker": "fping -q -- %%(host)s",
2056
 
                        "host": "",
2057
 
                        "approval_delay": "0s",
2058
 
                        "approval_duration": "1s",
2059
 
                        }
2060
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2415
    client_config = configparser.SafeConfigParser(Client
 
2416
                                                  .client_defaults)
2061
2417
    client_config.read(os.path.join(server_settings["configdir"],
2062
2418
                                    "clients.conf"))
2063
2419
    
2072
2428
                              use_ipv6=use_ipv6,
2073
2429
                              gnutls_priority=
2074
2430
                              server_settings["priority"],
2075
 
                              use_dbus=use_dbus)
2076
 
    if not debug:
 
2431
                              use_dbus=use_dbus,
 
2432
                              socketfd=(server_settings["socket"]
 
2433
                                        or None))
 
2434
    if not foreground:
2077
2435
        pidfilename = "/var/run/mandos.pid"
 
2436
        pidfile = None
2078
2437
        try:
2079
2438
            pidfile = open(pidfilename, "w")
2080
 
        except IOError:
2081
 
            logger.error("Could not open file %r", pidfilename)
 
2439
        except IOError as e:
 
2440
            logger.error("Could not open file %r", pidfilename,
 
2441
                         exc_info=e)
2082
2442
    
2083
 
    try:
2084
 
        uid = pwd.getpwnam("_mandos").pw_uid
2085
 
        gid = pwd.getpwnam("_mandos").pw_gid
2086
 
    except KeyError:
 
2443
    for name in ("_mandos", "mandos", "nobody"):
2087
2444
        try:
2088
 
            uid = pwd.getpwnam("mandos").pw_uid
2089
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2445
            uid = pwd.getpwnam(name).pw_uid
 
2446
            gid = pwd.getpwnam(name).pw_gid
 
2447
            break
2090
2448
        except KeyError:
2091
 
            try:
2092
 
                uid = pwd.getpwnam("nobody").pw_uid
2093
 
                gid = pwd.getpwnam("nobody").pw_gid
2094
 
            except KeyError:
2095
 
                uid = 65534
2096
 
                gid = 65534
 
2449
            continue
 
2450
    else:
 
2451
        uid = 65534
 
2452
        gid = 65534
2097
2453
    try:
2098
2454
        os.setgid(gid)
2099
2455
        os.setuid(uid)
2100
2456
    except OSError as error:
2101
 
        if error[0] != errno.EPERM:
 
2457
        if error.errno != errno.EPERM:
2102
2458
            raise error
2103
2459
    
2104
2460
    if debug:
2116
2472
         .gnutls_global_set_log_function(debug_gnutls))
2117
2473
        
2118
2474
        # Redirect stdin so all checkers get /dev/null
2119
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2475
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2120
2476
        os.dup2(null, sys.stdin.fileno())
2121
2477
        if null > 2:
2122
2478
            os.close(null)
2123
 
    else:
2124
 
        # No console logging
2125
 
        logger.removeHandler(console)
2126
2479
    
2127
2480
    # Need to fork before connecting to D-Bus
2128
 
    if not debug:
 
2481
    if not foreground:
2129
2482
        # Close all input and output, do double fork, etc.
2130
2483
        daemon()
2131
2484
    
 
2485
    # multiprocessing will use threads, so before we use gobject we
 
2486
    # need to inform gobject that threads will be used.
 
2487
    gobject.threads_init()
 
2488
    
2132
2489
    global main_loop
2133
2490
    # From the Avahi example code
2134
 
    DBusGMainLoop(set_as_default=True )
 
2491
    DBusGMainLoop(set_as_default=True)
2135
2492
    main_loop = gobject.MainLoop()
2136
2493
    bus = dbus.SystemBus()
2137
2494
    # End of Avahi example code
2143
2500
                            ("se.bsnet.fukt.Mandos", bus,
2144
2501
                             do_not_queue=True))
2145
2502
        except dbus.exceptions.NameExistsException as e:
2146
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2503
            logger.error("Disabling D-Bus:", exc_info=e)
2147
2504
            use_dbus = False
2148
2505
            server_settings["use_dbus"] = False
2149
2506
            tcp_server.use_dbus = False
2161
2518
    
2162
2519
    client_class = Client
2163
2520
    if use_dbus:
2164
 
        client_class = functools.partial(ClientDBusTransitional,
2165
 
                                         bus = bus)
2166
 
    
2167
 
    special_settings = {
2168
 
        # Some settings need to be accessd by special methods;
2169
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2170
 
        "approved_by_default":
2171
 
            lambda section:
2172
 
            client_config.getboolean(section, "approved_by_default"),
2173
 
        }
2174
 
    # Construct a new dict of client settings of this form:
2175
 
    # { client_name: {setting_name: value, ...}, ...}
2176
 
    # with exceptions for any special settings as defined above
2177
 
    client_settings = dict((clientname,
2178
 
                           dict((setting,
2179
 
                                 (value
2180
 
                                  if setting not in special_settings
2181
 
                                  else special_settings[setting]
2182
 
                                  (clientname)))
2183
 
                                for setting, value in
2184
 
                                client_config.items(clientname)))
2185
 
                          for clientname in client_config.sections())
2186
 
    
 
2521
        client_class = functools.partial(ClientDBus, bus = bus)
 
2522
    
 
2523
    client_settings = Client.config_parser(client_config)
2187
2524
    old_client_settings = {}
2188
 
    clients_data = []
 
2525
    clients_data = {}
2189
2526
    
2190
2527
    # Get client data and settings from last running state.
2191
2528
    if server_settings["restore"]:
2195
2532
                                                     (stored_state))
2196
2533
            os.remove(stored_state_path)
2197
2534
        except IOError as e:
2198
 
            logger.warning("Could not load persistent state: {0}"
2199
 
                           .format(e))
2200
 
            if e.errno != errno.ENOENT:
 
2535
            if e.errno == errno.ENOENT:
 
2536
                logger.warning("Could not load persistent state: {0}"
 
2537
                                .format(os.strerror(e.errno)))
 
2538
            else:
 
2539
                logger.critical("Could not load persistent state:",
 
2540
                                exc_info=e)
2201
2541
                raise
 
2542
        except EOFError as e:
 
2543
            logger.warning("Could not load persistent state: "
 
2544
                           "EOFError:", exc_info=e)
2202
2545
    
2203
 
    with Crypto() as crypt:
2204
 
        for client in clients_data:
2205
 
            client_name = client["name"]
2206
 
            
 
2546
    with PGPEngine() as pgp:
 
2547
        for client_name, client in clients_data.iteritems():
2207
2548
            # Decide which value to use after restoring saved state.
2208
2549
            # We have three different values: Old config file,
2209
2550
            # new config file, and saved state.
2217
2558
                    if (name != "secret" and
2218
2559
                        value != old_client_settings[client_name]
2219
2560
                        [name]):
2220
 
                        setattr(client, name, value)
 
2561
                        client[name] = value
2221
2562
                except KeyError:
2222
2563
                    pass
2223
2564
            
2224
2565
            # Clients who has passed its expire date can still be
2225
 
            # enabled if its last checker was sucessful.  Clients
2226
 
            # whose checker failed before we stored its state is
2227
 
            # assumed to have failed all checkers during downtime.
2228
 
            if client["enabled"] and client["last_checked_ok"]:
2229
 
                if ((datetime.datetime.utcnow()
2230
 
                     - client["last_checked_ok"])
2231
 
                    > client["interval"]):
2232
 
                    if client["last_checker_status"] != 0:
 
2566
            # enabled if its last checker was successful.  Clients
 
2567
            # whose checker succeeded before we stored its state is
 
2568
            # assumed to have successfully run all checkers during
 
2569
            # downtime.
 
2570
            if client["enabled"]:
 
2571
                if datetime.datetime.utcnow() >= client["expires"]:
 
2572
                    if not client["last_checked_ok"]:
 
2573
                        logger.warning(
 
2574
                            "disabling client {0} - Client never "
 
2575
                            "performed a successful checker"
 
2576
                            .format(client_name))
 
2577
                        client["enabled"] = False
 
2578
                    elif client["last_checker_status"] != 0:
 
2579
                        logger.warning(
 
2580
                            "disabling client {0} - Client "
 
2581
                            "last checker failed with error code {1}"
 
2582
                            .format(client_name,
 
2583
                                    client["last_checker_status"]))
2233
2584
                        client["enabled"] = False
2234
2585
                    else:
2235
2586
                        client["expires"] = (datetime.datetime
2236
2587
                                             .utcnow()
2237
2588
                                             + client["timeout"])
2238
 
            
2239
 
            client["changedstate"] = (multiprocessing_manager
2240
 
                                      .Condition
2241
 
                                      (multiprocessing_manager
2242
 
                                       .Lock()))
2243
 
            if use_dbus:
2244
 
                new_client = (ClientDBusTransitional.__new__
2245
 
                              (ClientDBusTransitional))
2246
 
                tcp_server.clients[client_name] = new_client
2247
 
                new_client.bus = bus
2248
 
                for name, value in client.iteritems():
2249
 
                    setattr(new_client, name, value)
2250
 
                client_object_name = unicode(client_name).translate(
2251
 
                    {ord("."): ord("_"),
2252
 
                     ord("-"): ord("_")})
2253
 
                new_client.dbus_object_path = (dbus.ObjectPath
2254
 
                                               ("/clients/"
2255
 
                                                + client_object_name))
2256
 
                DBusObjectWithProperties.__init__(new_client,
2257
 
                                                  new_client.bus,
2258
 
                                                  new_client
2259
 
                                                  .dbus_object_path)
2260
 
            else:
2261
 
                tcp_server.clients[client_name] = (Client.__new__
2262
 
                                                   (Client))
2263
 
                for name, value in client.iteritems():
2264
 
                    setattr(tcp_server.clients[client_name],
2265
 
                            name, value)
2266
 
            
 
2589
                        logger.debug("Last checker succeeded,"
 
2590
                                     " keeping {0} enabled"
 
2591
                                     .format(client_name))
2267
2592
            try:
2268
 
                tcp_server.clients[client_name].secret = (
2269
 
                    crypt.decrypt(tcp_server.clients[client_name]
2270
 
                                  .encrypted_secret,
2271
 
                                  client_settings[client_name]
2272
 
                                  ["secret"]))
2273
 
            except CryptoError:
 
2593
                client["secret"] = (
 
2594
                    pgp.decrypt(client["encrypted_secret"],
 
2595
                                client_settings[client_name]
 
2596
                                ["secret"]))
 
2597
            except PGPError:
2274
2598
                # If decryption fails, we use secret from new settings
2275
 
                tcp_server.clients[client_name].secret = (
 
2599
                logger.debug("Failed to decrypt {0} old secret"
 
2600
                             .format(client_name))
 
2601
                client["secret"] = (
2276
2602
                    client_settings[client_name]["secret"])
2277
2603
    
2278
 
    # Create/remove clients based on new changes made to config
2279
 
    for clientname in set(old_client_settings) - set(client_settings):
2280
 
        del tcp_server.clients[clientname]
2281
 
    for clientname in set(client_settings) - set(old_client_settings):
2282
 
        tcp_server.clients[clientname] = (client_class(name
2283
 
                                                       = clientname,
2284
 
                                                       config =
2285
 
                                                       client_settings
2286
 
                                                       [clientname]))
 
2604
    # Add/remove clients based on new changes made to config
 
2605
    for client_name in (set(old_client_settings)
 
2606
                        - set(client_settings)):
 
2607
        del clients_data[client_name]
 
2608
    for client_name in (set(client_settings)
 
2609
                        - set(old_client_settings)):
 
2610
        clients_data[client_name] = client_settings[client_name]
 
2611
    
 
2612
    # Create all client objects
 
2613
    for client_name, client in clients_data.iteritems():
 
2614
        tcp_server.clients[client_name] = client_class(
 
2615
            name = client_name, settings = client)
2287
2616
    
2288
2617
    if not tcp_server.clients:
2289
2618
        logger.warning("No clients defined")
2290
 
        
2291
 
    if not debug:
2292
 
        try:
2293
 
            with pidfile:
2294
 
                pid = os.getpid()
2295
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2296
 
            del pidfile
2297
 
        except IOError:
2298
 
            logger.error("Could not write to file %r with PID %d",
2299
 
                         pidfilename, pid)
2300
 
        except NameError:
2301
 
            # "pidfile" was never created
2302
 
            pass
 
2619
    
 
2620
    if not foreground:
 
2621
        if pidfile is not None:
 
2622
            try:
 
2623
                with pidfile:
 
2624
                    pid = os.getpid()
 
2625
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2626
            except IOError:
 
2627
                logger.error("Could not write to file %r with PID %d",
 
2628
                             pidfilename, pid)
 
2629
        del pidfile
2303
2630
        del pidfilename
2304
 
        
2305
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2306
2631
    
2307
2632
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2308
2633
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2309
2634
    
2310
2635
    if use_dbus:
2311
 
        class MandosDBusService(dbus.service.Object):
 
2636
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2637
                                        "se.bsnet.fukt.Mandos"})
 
2638
        class MandosDBusService(DBusObjectWithProperties):
2312
2639
            """A D-Bus proxy object"""
2313
2640
            def __init__(self):
2314
2641
                dbus.service.Object.__init__(self, bus, "/")
2315
2642
            _interface = "se.recompile.Mandos"
2316
2643
            
 
2644
            @dbus_interface_annotations(_interface)
 
2645
            def _foo(self):
 
2646
                return { "org.freedesktop.DBus.Property"
 
2647
                         ".EmitsChangedSignal":
 
2648
                             "false"}
 
2649
            
2317
2650
            @dbus.service.signal(_interface, signature="o")
2318
2651
            def ClientAdded(self, objpath):
2319
2652
                "D-Bus signal"
2361
2694
            
2362
2695
            del _interface
2363
2696
        
2364
 
        class MandosDBusServiceTransitional(MandosDBusService):
2365
 
            __metaclass__ = AlternateDBusNamesMetaclass
2366
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2697
        mandos_dbus_service = MandosDBusService()
2367
2698
    
2368
2699
    def cleanup():
2369
2700
        "Cleanup function; run on exit"
2376
2707
        # Store client before exiting. Secrets are encrypted with key
2377
2708
        # based on what config file has. If config file is
2378
2709
        # removed/edited, old secret will thus be unrecovable.
2379
 
        clients = []
2380
 
        with Crypto() as crypt:
 
2710
        clients = {}
 
2711
        with PGPEngine() as pgp:
2381
2712
            for client in tcp_server.clients.itervalues():
2382
2713
                key = client_settings[client.name]["secret"]
2383
 
                client.encrypted_secret = crypt.encrypt(client.secret,
2384
 
                                                        key)
 
2714
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2715
                                                      key)
2385
2716
                client_dict = {}
2386
2717
                
2387
 
                # A list of attributes that will not be stored when
2388
 
                # shutting down.
2389
 
                exclude = set(("bus", "changedstate", "secret"))
 
2718
                # A list of attributes that can not be pickled
 
2719
                # + secret.
 
2720
                exclude = set(("bus", "changedstate", "secret",
 
2721
                               "checker"))
2390
2722
                for name, typ in (inspect.getmembers
2391
2723
                                  (dbus.service.Object)):
2392
2724
                    exclude.add(name)
2397
2729
                    if attr not in exclude:
2398
2730
                        client_dict[attr] = getattr(client, attr)
2399
2731
                
2400
 
                clients.append(client_dict)
 
2732
                clients[client.name] = client_dict
2401
2733
                del client_settings[client.name]["secret"]
2402
2734
        
2403
2735
        try:
2404
 
            with os.fdopen(os.open(stored_state_path,
2405
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2406
 
                                   0600), "wb") as stored_state:
 
2736
            with (tempfile.NamedTemporaryFile
 
2737
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2738
                   dir=os.path.dirname(stored_state_path),
 
2739
                   delete=False)) as stored_state:
2407
2740
                pickle.dump((clients, client_settings), stored_state)
 
2741
                tempname=stored_state.name
 
2742
            os.rename(tempname, stored_state_path)
2408
2743
        except (IOError, OSError) as e:
2409
 
            logger.warning("Could not save persistent state: {0}"
2410
 
                           .format(e))
2411
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
2412
 
                raise
 
2744
            if not debug:
 
2745
                try:
 
2746
                    os.remove(tempname)
 
2747
                except NameError:
 
2748
                    pass
 
2749
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2750
                logger.warning("Could not save persistent state: {0}"
 
2751
                               .format(os.strerror(e.errno)))
 
2752
            else:
 
2753
                logger.warning("Could not save persistent state:",
 
2754
                               exc_info=e)
 
2755
                raise e
2413
2756
        
2414
2757
        # Delete all clients, and settings from config
2415
2758
        while tcp_server.clients:
2442
2785
    service.port = tcp_server.socket.getsockname()[1]
2443
2786
    if use_ipv6:
2444
2787
        logger.info("Now listening on address %r, port %d,"
2445
 
                    " flowinfo %d, scope_id %d"
2446
 
                    % tcp_server.socket.getsockname())
 
2788
                    " flowinfo %d, scope_id %d",
 
2789
                    *tcp_server.socket.getsockname())
2447
2790
    else:                       # IPv4
2448
 
        logger.info("Now listening on address %r, port %d"
2449
 
                    % tcp_server.socket.getsockname())
 
2791
        logger.info("Now listening on address %r, port %d",
 
2792
                    *tcp_server.socket.getsockname())
2450
2793
    
2451
2794
    #service.interface = tcp_server.socket.getsockname()[3]
2452
2795
    
2455
2798
        try:
2456
2799
            service.activate()
2457
2800
        except dbus.exceptions.DBusException as error:
2458
 
            logger.critical("DBusException: %s", error)
 
2801
            logger.critical("D-Bus Exception", exc_info=error)
2459
2802
            cleanup()
2460
2803
            sys.exit(1)
2461
2804
        # End of Avahi example code
2468
2811
        logger.debug("Starting main loop")
2469
2812
        main_loop.run()
2470
2813
    except AvahiError as error:
2471
 
        logger.critical("AvahiError: %s", error)
 
2814
        logger.critical("Avahi Error", exc_info=error)
2472
2815
        cleanup()
2473
2816
        sys.exit(1)
2474
2817
    except KeyboardInterrupt:
2479
2822
    # Must run before the D-Bus bus name gets deregistered
2480
2823
    cleanup()
2481
2824
 
2482
 
 
2483
2825
if __name__ == '__main__':
2484
2826
    main()