/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

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-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
89
85
    except ImportError:
90
86
        SO_BINDTODEVICE = None
91
87
 
92
 
version = "1.6.0"
 
88
 
 
89
version = "1.4.1"
93
90
stored_state_file = "clients.pickle"
94
91
 
95
92
logger = logging.getLogger()
114
111
        return interface_index
115
112
 
116
113
 
117
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
118
115
    """init logger and add loglevel"""
119
116
    
120
117
    syslogger.setFormatter(logging.Formatter
122
119
                            ' %(message)s'))
123
120
    logger.addHandler(syslogger)
124
121
    
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)
 
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)
132
128
    logger.setLevel(level)
133
129
 
134
130
 
135
 
class PGPError(Exception):
136
 
    """Exception if encryption/decryption fails"""
 
131
class CryptoError(Exception):
137
132
    pass
138
133
 
139
134
 
140
 
class PGPEngine(object):
 
135
class Crypto(object):
141
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
142
137
    def __init__(self):
143
138
        self.gnupg = GnuPGInterface.GnuPG()
146
141
        self.gnupg.options.meta_interactive = False
147
142
        self.gnupg.options.homedir = self.tempdir
148
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
149
 
                                              '--quiet',
150
 
                                              '--no-use-agent'])
 
144
                                              '--quiet'])
151
145
    
152
146
    def __enter__(self):
153
147
        return self
154
148
    
155
 
    def __exit__(self, exc_type, exc_value, traceback):
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
156
150
        self._cleanup()
157
151
        return False
158
152
    
179
173
    
180
174
    def encrypt(self, data, password):
181
175
        self.gnupg.passphrase = self.password_encode(password)
182
 
        with open(os.devnull, "w") as devnull:
 
176
        with open(os.devnull) as devnull:
183
177
            try:
184
178
                proc = self.gnupg.run(['--symmetric'],
185
179
                                      create_fhs=['stdin', 'stdout'],
190
184
                    ciphertext = f.read()
191
185
                proc.wait()
192
186
            except IOError as e:
193
 
                raise PGPError(e)
 
187
                raise CryptoError(e)
194
188
        self.gnupg.passphrase = None
195
189
        return ciphertext
196
190
    
197
191
    def decrypt(self, data, password):
198
192
        self.gnupg.passphrase = self.password_encode(password)
199
 
        with open(os.devnull, "w") as devnull:
 
193
        with open(os.devnull) as devnull:
200
194
            try:
201
195
                proc = self.gnupg.run(['--decrypt'],
202
196
                                      create_fhs=['stdin', 'stdout'],
203
197
                                      attach_fhs={'stderr': devnull})
204
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
205
199
                    f.write(data)
206
200
                with contextlib.closing(proc.handles['stdout']) as f:
207
201
                    decrypted_plaintext = f.read()
208
202
                proc.wait()
209
203
            except IOError as e:
210
 
                raise PGPError(e)
 
204
                raise CryptoError(e)
211
205
        self.gnupg.passphrase = None
212
206
        return decrypted_plaintext
213
207
 
214
208
 
 
209
 
215
210
class AvahiError(Exception):
216
211
    def __init__(self, value, *args, **kwargs):
217
212
        self.value = value
246
241
    server: D-Bus Server
247
242
    bus: dbus.SystemBus()
248
243
    """
249
 
    
250
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
245
                 servicetype = None, port = None, TXT = None,
252
246
                 domain = "", host = "", max_renames = 32768,
265
259
        self.server = None
266
260
        self.bus = bus
267
261
        self.entry_group_state_changed_match = None
268
 
    
269
262
    def rename(self):
270
263
        """Derived from the Avahi example code"""
271
264
        if self.rename_count >= self.max_renames:
281
274
        try:
282
275
            self.add()
283
276
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
285
278
            self.cleanup()
286
279
            os._exit(1)
287
280
        self.rename_count += 1
288
 
    
289
281
    def remove(self):
290
282
        """Derived from the Avahi example code"""
291
283
        if self.entry_group_state_changed_match is not None:
293
285
            self.entry_group_state_changed_match = None
294
286
        if self.group is not None:
295
287
            self.group.Reset()
296
 
    
297
288
    def add(self):
298
289
        """Derived from the Avahi example code"""
299
290
        self.remove()
316
307
            dbus.UInt16(self.port),
317
308
            avahi.string_array_to_txt_array(self.TXT))
318
309
        self.group.Commit()
319
 
    
320
310
    def entry_group_state_changed(self, state, error):
321
311
        """Derived from the Avahi example code"""
322
312
        logger.debug("Avahi entry group state change: %i", state)
329
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
320
            logger.critical("Avahi: Error in group state changed %s",
331
321
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
335
324
    def cleanup(self):
336
325
        """Derived from the Avahi example code"""
337
326
        if self.group is not None:
342
331
                pass
343
332
            self.group = None
344
333
        self.remove()
345
 
    
346
334
    def server_state_changed(self, state, error=None):
347
335
        """Derived from the Avahi example code"""
348
336
        logger.debug("Avahi server state change: %i", state)
367
355
                logger.debug("Unknown state: %r", state)
368
356
            else:
369
357
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
358
    def activate(self):
372
359
        """Derived from the Avahi example code"""
373
360
        if self.server is None:
380
367
                                 self.server_state_changed)
381
368
        self.server_state_changed(self.server.GetState())
382
369
 
383
 
 
384
370
class AvahiServiceToSyslog(AvahiService):
385
371
    def rename(self):
386
372
        """Add the new name to the syslog messages"""
387
373
        ret = AvahiService.rename(self)
388
374
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
392
378
        return ret
393
379
 
394
 
 
395
 
def timedelta_to_milliseconds(td):
 
380
def _timedelta_to_milliseconds(td):
396
381
    "Convert a datetime.timedelta() to milliseconds"
397
382
    return ((td.days * 24 * 60 * 60 * 1000)
398
383
            + (td.seconds * 1000)
399
384
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
385
        
402
386
class Client(object):
403
387
    """A representation of a client host served by this server.
404
388
    
405
389
    Attributes:
406
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
390
    _approved:   bool(); 'None' if not yet approved/disapproved
407
391
    approval_delay: datetime.timedelta(); Time to wait for approval
408
392
    approval_duration: datetime.timedelta(); Duration of one approval
409
393
    checker:    subprocess.Popen(); a running checker process used
427
411
    interval:   datetime.timedelta(); How often to start a new checker
428
412
    last_approval_request: datetime.datetime(); (UTC) or None
429
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
414
 
430
415
    last_checker_status: integer between 0 and 255 reflecting exit
431
416
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
433
418
    last_enabled: datetime.datetime(); (UTC) or None
434
419
    name:       string; from the config file, used in log messages and
435
420
                        D-Bus identifiers
436
421
    secret:     bytestring; sent verbatim (over TLS) to client
437
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
423
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
440
425
    runtime_expansions: Allowed attributes for runtime expansion.
441
426
    expires:    datetime.datetime(); time (UTC) when a client will be
442
427
                disabled, or None
443
428
    """
444
429
    
445
430
    runtime_expansions = ("approval_delay", "approval_duration",
446
 
                          "created", "enabled", "expires",
447
 
                          "fingerprint", "host", "interval",
448
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
449
433
                          "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
 
                        }
460
434
    
461
435
    def timeout_milliseconds(self):
462
436
        "Return the 'timeout' attribute in milliseconds"
463
 
        return timedelta_to_milliseconds(self.timeout)
 
437
        return _timedelta_to_milliseconds(self.timeout)
464
438
    
465
439
    def extended_timeout_milliseconds(self):
466
440
        "Return the 'extended_timeout' attribute in milliseconds"
467
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
468
442
    
469
443
    def interval_milliseconds(self):
470
444
        "Return the 'interval' attribute in milliseconds"
471
 
        return timedelta_to_milliseconds(self.interval)
 
445
        return _timedelta_to_milliseconds(self.interval)
472
446
    
473
447
    def approval_delay_milliseconds(self):
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):
 
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."""
524
454
        self.name = name
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
 
        
 
455
        if config is None:
 
456
            config = {}
539
457
        logger.debug("Creating client %r", self.name)
540
458
        # Uppercase and remove spaces from fingerprint for later
541
459
        # comparison purposes with return value from the fingerprint()
542
460
        # function
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
462
                            .replace(" ", ""))
543
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
544
 
        self.created = settings.get("created",
545
 
                                    datetime.datetime.utcnow())
546
 
        
547
 
        # attributes specific for this server instance
 
464
        if "secret" in config:
 
465
            self.secret = config["secret"].decode("base64")
 
466
        elif "secfile" in config:
 
467
            with open(os.path.expanduser(os.path.expandvars
 
468
                                         (config["secfile"])),
 
469
                      "rb") as secfile:
 
470
                self.secret = secfile.read()
 
471
        else:
 
472
            raise TypeError("No secret or secfile for client %s"
 
473
                            % self.name)
 
474
        self.host = config.get("host", "")
 
475
        self.created = datetime.datetime.utcnow()
 
476
        self.enabled = config.get("enabled", True)
 
477
        self.last_approval_request = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
 
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
 
484
        self.timeout = string_to_delta(config["timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
 
487
        self.interval = string_to_delta(config["interval"])
548
488
        self.checker = None
549
489
        self.checker_initiator_tag = None
550
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
551
495
        self.checker_callback_tag = None
 
496
        self.checker_command = config["checker"]
552
497
        self.current_checker_command = None
553
 
        self.approved = None
 
498
        self._approved = None
 
499
        self.approved_by_default = config.get("approved_by_default",
 
500
                                              True)
554
501
        self.approvals_pending = 0
 
502
        self.approval_delay = string_to_delta(
 
503
            config["approval_delay"])
 
504
        self.approval_duration = string_to_delta(
 
505
            config["approval_duration"])
555
506
        self.changedstate = (multiprocessing_manager
556
507
                             .Condition(multiprocessing_manager
557
508
                                        .Lock()))
577
528
        if getattr(self, "enabled", False):
578
529
            # Already enabled
579
530
            return
 
531
        self.send_changedstate()
580
532
        self.expires = datetime.datetime.utcnow() + self.timeout
581
533
        self.enabled = True
582
534
        self.last_enabled = datetime.datetime.utcnow()
583
535
        self.init_checker()
584
 
        self.send_changedstate()
585
536
    
586
537
    def disable(self, quiet=True):
587
538
        """Disable this client."""
588
539
        if not getattr(self, "enabled", False):
589
540
            return False
590
541
        if not quiet:
 
542
            self.send_changedstate()
 
543
        if not quiet:
591
544
            logger.info("Disabling client %s", self.name)
592
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
545
        if getattr(self, "disable_initiator_tag", False):
593
546
            gobject.source_remove(self.disable_initiator_tag)
594
547
            self.disable_initiator_tag = None
595
548
        self.expires = None
596
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
549
        if getattr(self, "checker_initiator_tag", False):
597
550
            gobject.source_remove(self.checker_initiator_tag)
598
551
            self.checker_initiator_tag = None
599
552
        self.stop_checker()
600
553
        self.enabled = False
601
 
        if not quiet:
602
 
            self.send_changedstate()
603
554
        # Do not run this again if called by a gobject.timeout_add
604
555
        return False
605
556
    
609
560
    def init_checker(self):
610
561
        # Schedule a new checker to be started an 'interval' from now,
611
562
        # and every interval from then on.
612
 
        if self.checker_initiator_tag is not None:
613
 
            gobject.source_remove(self.checker_initiator_tag)
614
563
        self.checker_initiator_tag = (gobject.timeout_add
615
564
                                      (self.interval_milliseconds(),
616
565
                                       self.start_checker))
617
566
        # Schedule a disable() when 'timeout' has passed
618
 
        if self.disable_initiator_tag is not None:
619
 
            gobject.source_remove(self.disable_initiator_tag)
620
567
        self.disable_initiator_tag = (gobject.timeout_add
621
568
                                   (self.timeout_milliseconds(),
622
569
                                    self.disable))
628
575
        self.checker_callback_tag = None
629
576
        self.checker = None
630
577
        if os.WIFEXITED(condition):
631
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
632
579
            if self.last_checker_status == 0:
633
580
                logger.info("Checker for %(name)s succeeded",
634
581
                            vars(self))
641
588
            logger.warning("Checker for %(name)s crashed?",
642
589
                           vars(self))
643
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
    def checked_ok(self, timeout=None):
 
592
        """Bump up the timeout for this client.
 
593
        
 
594
        This should only be called when the client has been seen,
 
595
        alive and well.
 
596
        """
652
597
        if timeout is None:
653
598
            timeout = self.timeout
 
599
        self.last_checked_ok = datetime.datetime.utcnow()
654
600
        if self.disable_initiator_tag is not None:
655
601
            gobject.source_remove(self.disable_initiator_tag)
656
 
            self.disable_initiator_tag = None
657
602
        if getattr(self, "enabled", False):
658
603
            self.disable_initiator_tag = (gobject.timeout_add
659
 
                                          (timedelta_to_milliseconds
 
604
                                          (_timedelta_to_milliseconds
660
605
                                           (timeout), self.disable))
661
606
            self.expires = datetime.datetime.utcnow() + timeout
662
607
    
669
614
        If a checker already exists, leave it running and do
670
615
        nothing."""
671
616
        # The reason for not killing a running checker is that if we
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
 
617
        # did that, then if a checker (for some reason) started
 
618
        # running slowly and taking more than 'interval' time, the
 
619
        # client would inevitably timeout, since no checker would get
 
620
        # a chance to run to completion.  If we instead leave running
676
621
        # checkers alone, the checker would have to take more time
677
622
        # than 'timeout' for the client to be disabled, which is as it
678
623
        # should be.
692
637
                                      self.current_checker_command)
693
638
        # Start a new checker if needed
694
639
        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)
700
640
            try:
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
 
641
                # In case checker_command has exactly one % operator
 
642
                command = self.checker_command % self.host
 
643
            except TypeError:
 
644
                # Escape attributes for the shell
 
645
                escaped_attrs = dict(
 
646
                    (attr,
 
647
                     re.escape(unicode(str(getattr(self, attr, "")),
 
648
                                       errors=
 
649
                                       'replace')))
 
650
                    for attr in
 
651
                    self.runtime_expansions)
 
652
                
 
653
                try:
 
654
                    command = self.checker_command % escaped_attrs
 
655
                except TypeError as error:
 
656
                    logger.error('Could not format string "%s":'
 
657
                                 ' %s', self.checker_command, error)
 
658
                    return True # Try again later
706
659
            self.current_checker_command = command
707
660
            try:
708
661
                logger.info("Starting checker %r for %s",
714
667
                self.checker = subprocess.Popen(command,
715
668
                                                close_fds=True,
716
669
                                                shell=True, cwd="/")
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
                self.checker_callback_tag = (gobject.child_watch_add
 
671
                                             (self.checker.pid,
 
672
                                              self.checker_callback,
 
673
                                              data=command))
 
674
                # The checker may have completed before the gobject
 
675
                # watch was added.  Check for this.
728
676
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
677
                if pid:
 
678
                    gobject.source_remove(self.checker_callback_tag)
 
679
                    self.checker_callback(pid, status, command)
729
680
            except OSError as error:
730
 
                if error.errno == errno.ECHILD:
731
 
                    # This should never happen
732
 
                    logger.error("Child process vanished",
733
 
                                 exc_info=error)
734
 
                    return True
735
 
                raise
736
 
            if pid:
737
 
                gobject.source_remove(self.checker_callback_tag)
738
 
                self.checker_callback(pid, status, command)
 
681
                logger.error("Failed to start subprocess: %s",
 
682
                             error)
739
683
        # Re-run this periodically if run by gobject.timeout_add
740
684
        return True
741
685
    
748
692
            return
749
693
        logger.debug("Stopping checker for %(name)s", vars(self))
750
694
        try:
751
 
            self.checker.terminate()
 
695
            os.kill(self.checker.pid, signal.SIGTERM)
752
696
            #time.sleep(0.5)
753
697
            #if self.checker.poll() is None:
754
 
            #    self.checker.kill()
 
698
            #    os.kill(self.checker.pid, signal.SIGKILL)
755
699
        except OSError as error:
756
700
            if error.errno != errno.ESRCH: # No such process
757
701
                raise
774
718
    # "Set" method, so we fail early here:
775
719
    if byte_arrays and signature != "ay":
776
720
        raise ValueError("Byte arrays not supported for non-'ay'"
777
 
                         " signature {0!r}".format(signature))
 
721
                         " signature %r" % signature)
778
722
    def decorator(func):
779
723
        func._dbus_is_property = True
780
724
        func._dbus_interface = dbus_interface
788
732
    return decorator
789
733
 
790
734
 
791
 
def dbus_interface_annotations(dbus_interface):
792
 
    """Decorator for marking functions returning interface annotations
793
 
    
794
 
    Usage:
795
 
    
796
 
    @dbus_interface_annotations("org.example.Interface")
797
 
    def _foo(self):  # Function name does not matter
798
 
        return {"org.freedesktop.DBus.Deprecated": "true",
799
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
800
 
                    "false"}
801
 
    """
802
 
    def decorator(func):
803
 
        func._dbus_is_interface = True
804
 
        func._dbus_interface = dbus_interface
805
 
        func._dbus_name = dbus_interface
806
 
        return func
807
 
    return decorator
808
 
 
809
 
 
810
 
def dbus_annotations(annotations):
811
 
    """Decorator to annotate D-Bus methods, signals or properties
812
 
    Usage:
813
 
    
814
 
    @dbus_service_property("org.example.Interface", signature="b",
815
 
                           access="r")
816
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
 
                        "org.freedesktop.DBus.Property."
818
 
                        "EmitsChangedSignal": "false"})
819
 
    def Property_dbus_property(self):
820
 
        return dbus.Boolean(False)
821
 
    """
822
 
    def decorator(func):
823
 
        func._dbus_annotations = annotations
824
 
        return func
825
 
    return decorator
826
 
 
827
 
 
828
735
class DBusPropertyException(dbus.exceptions.DBusException):
829
736
    """A base class for D-Bus property-related exceptions
830
737
    """
853
760
    """
854
761
    
855
762
    @staticmethod
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)
 
763
    def _is_dbus_property(obj):
 
764
        return getattr(obj, "_dbus_is_property", False)
864
765
    
865
 
    def _get_all_dbus_things(self, thing):
 
766
    def _get_all_dbus_properties(self):
866
767
        """Returns a generator of (name, attribute) pairs
867
768
        """
868
 
        return ((getattr(athing.__get__(self), "_dbus_name",
869
 
                         name),
870
 
                 athing.__get__(self))
 
769
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
871
770
                for cls in self.__class__.__mro__
872
 
                for name, athing in
873
 
                inspect.getmembers(cls,
874
 
                                   self._is_dbus_thing(thing)))
 
771
                for name, prop in
 
772
                inspect.getmembers(cls, self._is_dbus_property))
875
773
    
876
774
    def _get_dbus_property(self, interface_name, property_name):
877
775
        """Returns a bound method if one exists which is a D-Bus
879
777
        """
880
778
        for cls in  self.__class__.__mro__:
881
779
            for name, value in (inspect.getmembers
882
 
                                (cls,
883
 
                                 self._is_dbus_thing("property"))):
 
780
                                (cls, self._is_dbus_property)):
884
781
                if (value._dbus_name == property_name
885
782
                    and value._dbus_interface == interface_name):
886
783
                    return value.__get__(self)
915
812
            # signatures other than "ay".
916
813
            if prop._dbus_signature != "ay":
917
814
                raise ValueError
918
 
            value = dbus.ByteArray(b''.join(chr(byte)
919
 
                                            for byte in value))
 
815
            value = dbus.ByteArray(''.join(unichr(byte)
 
816
                                           for byte in value))
920
817
        prop(value)
921
818
    
922
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
928
825
        Note: Will not include properties with access="write".
929
826
        """
930
827
        properties = {}
931
 
        for name, prop in self._get_all_dbus_things("property"):
 
828
        for name, prop in self._get_all_dbus_properties():
932
829
            if (interface_name
933
830
                and interface_name != prop._dbus_interface):
934
831
                # Interface non-empty but did not match
949
846
                         path_keyword='object_path',
950
847
                         connection_keyword='connection')
951
848
    def Introspect(self, object_path, connection):
952
 
        """Overloading of standard D-Bus method.
953
 
        
954
 
        Inserts property tags and interface annotation tags.
 
849
        """Standard D-Bus method, overloaded to insert property tags.
955
850
        """
956
851
        xmlstring = dbus.service.Object.Introspect(self, object_path,
957
852
                                                   connection)
964
859
                e.setAttribute("access", prop._dbus_access)
965
860
                return e
966
861
            for if_tag in document.getElementsByTagName("interface"):
967
 
                # Add property tags
968
862
                for tag in (make_tag(document, name, prop)
969
863
                            for name, prop
970
 
                            in self._get_all_dbus_things("property")
 
864
                            in self._get_all_dbus_properties()
971
865
                            if prop._dbus_interface
972
866
                            == if_tag.getAttribute("name")):
973
867
                    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)
1005
868
                # Add the names to the return values for the
1006
869
                # "org.freedesktop.DBus.Properties" methods
1007
870
                if (if_tag.getAttribute("name")
1022
885
        except (AttributeError, xml.dom.DOMException,
1023
886
                xml.parsers.expat.ExpatError) as error:
1024
887
            logger.error("Failed to override Introspection method",
1025
 
                         exc_info=error)
 
888
                         error)
1026
889
        return xmlstring
1027
890
 
1028
891
 
1029
 
def datetime_to_dbus(dt, variant_level=0):
 
892
def datetime_to_dbus (dt, variant_level=0):
1030
893
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1031
894
    if dt is None:
1032
895
        return dbus.String("", variant_level = variant_level)
1034
897
                       variant_level=variant_level)
1035
898
 
1036
899
 
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).
 
900
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
901
                                  .__metaclass__):
 
902
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
903
    will add additional D-Bus attributes matching a certain pattern.
1059
904
    """
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):
 
905
    def __new__(mcs, name, bases, attr):
 
906
        # Go through all the base classes which could have D-Bus
 
907
        # methods, signals, or properties in them
 
908
        for base in (b for b in bases
 
909
                     if issubclass(b, dbus.service.Object)):
 
910
            # Go though all attributes of the base class
 
911
            for attrname, attribute in inspect.getmembers(base):
1067
912
                # Ignore non-D-Bus attributes, and D-Bus attributes
1068
913
                # with the wrong interface name
1069
914
                if (not hasattr(attribute, "_dbus_interface")
1070
915
                    or not attribute._dbus_interface
1071
 
                    .startswith(orig_interface_name)):
 
916
                    .startswith("se.recompile.Mandos")):
1072
917
                    continue
1073
918
                # Create an alternate D-Bus interface name based on
1074
919
                # the current name
1075
920
                alt_interface = (attribute._dbus_interface
1076
 
                                 .replace(orig_interface_name,
1077
 
                                          alt_interface_name))
1078
 
                interface_names.add(alt_interface)
 
921
                                 .replace("se.recompile.Mandos",
 
922
                                          "se.bsnet.fukt.Mandos"))
1079
923
                # Is this a D-Bus signal?
1080
924
                if getattr(attribute, "_dbus_is_signal", False):
1081
925
                    # Extract the original non-method function by
1096
940
                                nonmethod_func.func_name,
1097
941
                                nonmethod_func.func_defaults,
1098
942
                                nonmethod_func.func_closure)))
1099
 
                    # Copy annotations, if any
1100
 
                    try:
1101
 
                        new_function._dbus_annotations = (
1102
 
                            dict(attribute._dbus_annotations))
1103
 
                    except AttributeError:
1104
 
                        pass
1105
943
                    # Define a creator of a function to call both the
1106
 
                    # original and alternate functions, so both the
1107
 
                    # original and alternate signals gets sent when
1108
 
                    # the function is called
 
944
                    # old and new functions, so both the old and new
 
945
                    # signals gets sent when the function is called
1109
946
                    def fixscope(func1, func2):
1110
947
                        """This function is a scope container to pass
1111
948
                        func1 and func2 to the "call_both" function
1118
955
                        return call_both
1119
956
                    # Create the "call_both" function and add it to
1120
957
                    # the class
1121
 
                    attr[attrname] = fixscope(attribute, new_function)
 
958
                    attr[attrname] = fixscope(attribute,
 
959
                                              new_function)
1122
960
                # Is this a D-Bus method?
1123
961
                elif getattr(attribute, "_dbus_is_method", False):
1124
962
                    # Create a new, but exactly alike, function
1135
973
                                        attribute.func_name,
1136
974
                                        attribute.func_defaults,
1137
975
                                        attribute.func_closure)))
1138
 
                    # Copy annotations, if any
1139
 
                    try:
1140
 
                        attr[attrname]._dbus_annotations = (
1141
 
                            dict(attribute._dbus_annotations))
1142
 
                    except AttributeError:
1143
 
                        pass
1144
976
                # Is this a D-Bus property?
1145
977
                elif getattr(attribute, "_dbus_is_property", False):
1146
978
                    # Create a new, but exactly alike, function
1160
992
                                        attribute.func_name,
1161
993
                                        attribute.func_defaults,
1162
994
                                        attribute.func_closure)))
1163
 
                    # Copy annotations, if any
1164
 
                    try:
1165
 
                        attr[attrname]._dbus_annotations = (
1166
 
                            dict(attribute._dbus_annotations))
1167
 
                    except AttributeError:
1168
 
                        pass
1169
 
                # Is this a D-Bus interface?
1170
 
                elif getattr(attribute, "_dbus_is_interface", False):
1171
 
                    # Create a new, but exactly alike, function
1172
 
                    # object.  Decorate it to be a new D-Bus interface
1173
 
                    # with the alternate D-Bus interface name.  Add it
1174
 
                    # to the class.
1175
 
                    attr[attrname] = (dbus_interface_annotations
1176
 
                                      (alt_interface)
1177
 
                                      (types.FunctionType
1178
 
                                       (attribute.func_code,
1179
 
                                        attribute.func_globals,
1180
 
                                        attribute.func_name,
1181
 
                                        attribute.func_defaults,
1182
 
                                        attribute.func_closure)))
1183
 
            if deprecate:
1184
 
                # Deprecate all alternate interfaces
1185
 
                iname="_AlternateDBusNames_interface_annotation{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"})
 
995
        return type.__new__(mcs, name, bases, attr)
 
996
 
 
997
 
1208
998
class ClientDBus(Client, DBusObjectWithProperties):
1209
999
    """A Client class using D-Bus
1210
1000
    
1221
1011
    def __init__(self, bus = None, *args, **kwargs):
1222
1012
        self.bus = bus
1223
1013
        Client.__init__(self, *args, **kwargs)
 
1014
        
 
1015
        self._approvals_pending = 0
1224
1016
        # Only now, when this client is initialized, can it show up on
1225
1017
        # the D-Bus
1226
1018
        client_object_name = unicode(self.name).translate(
1230
1022
                                 ("/clients/" + client_object_name))
1231
1023
        DBusObjectWithProperties.__init__(self, self.bus,
1232
1024
                                          self.dbus_object_path)
1233
 
    
 
1025
        
1234
1026
    def notifychangeproperty(transform_func,
1235
1027
                             dbus_name, type_func=lambda x: x,
1236
1028
                             variant_level=1):
1259
1051
        
1260
1052
        return property(lambda self: getattr(self, attrname), setter)
1261
1053
    
 
1054
    
1262
1055
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1263
1056
    approvals_pending = notifychangeproperty(dbus.Boolean,
1264
1057
                                             "ApprovalPending",
1271
1064
                                       checker is not None)
1272
1065
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1066
                                           "LastCheckedOK")
1274
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1275
 
                                               "LastCheckerStatus")
1276
1067
    last_approval_request = notifychangeproperty(
1277
1068
        datetime_to_dbus, "LastApprovalRequest")
1278
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
1279
1070
                                               "ApprovedByDefault")
1280
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
1281
1072
                                          "ApprovalDelay",
1282
1073
                                          type_func =
1283
 
                                          timedelta_to_milliseconds)
 
1074
                                          _timedelta_to_milliseconds)
1284
1075
    approval_duration = notifychangeproperty(
1285
 
        dbus.UInt64, "ApprovalDuration",
1286
 
        type_func = timedelta_to_milliseconds)
 
1076
        dbus.UInt16, "ApprovalDuration",
 
1077
        type_func = _timedelta_to_milliseconds)
1287
1078
    host = notifychangeproperty(dbus.String, "Host")
1288
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1289
1080
                                   type_func =
1290
 
                                   timedelta_to_milliseconds)
 
1081
                                   _timedelta_to_milliseconds)
1291
1082
    extended_timeout = notifychangeproperty(
1292
 
        dbus.UInt64, "ExtendedTimeout",
1293
 
        type_func = timedelta_to_milliseconds)
1294
 
    interval = notifychangeproperty(dbus.UInt64,
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
1084
        type_func = _timedelta_to_milliseconds)
 
1085
    interval = notifychangeproperty(dbus.UInt16,
1295
1086
                                    "Interval",
1296
1087
                                    type_func =
1297
 
                                    timedelta_to_milliseconds)
 
1088
                                    _timedelta_to_milliseconds)
1298
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
1299
1090
    
1300
1091
    del notifychangeproperty
1342
1133
        return r
1343
1134
    
1344
1135
    def _reset_approved(self):
1345
 
        self.approved = None
 
1136
        self._approved = None
1346
1137
        return False
1347
1138
    
1348
1139
    def approve(self, value=True):
1349
 
        self.approved = value
1350
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1140
        self.send_changedstate()
 
1141
        self._approved = value
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
1351
1143
                            (self.approval_duration),
1352
1144
                            self._reset_approved)
1353
 
        self.send_changedstate()
 
1145
    
1354
1146
    
1355
1147
    ## D-Bus methods, signals & properties
1356
1148
    _interface = "se.recompile.Mandos.Client"
1357
1149
    
1358
 
    ## Interfaces
1359
 
    
1360
 
    @dbus_interface_annotations(_interface)
1361
 
    def _foo(self):
1362
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1363
 
                     "false"}
1364
 
    
1365
1150
    ## Signals
1366
1151
    
1367
1152
    # CheckerCompleted - signal
1403
1188
        "D-Bus signal"
1404
1189
        return self.need_approval()
1405
1190
    
 
1191
    # NeRwequest - signal
 
1192
    @dbus.service.signal(_interface, signature="s")
 
1193
    def NewRequest(self, ip):
 
1194
        """D-Bus signal
 
1195
        Is sent after a client request a password.
 
1196
        """
 
1197
        pass
 
1198
    
1406
1199
    ## Methods
1407
1200
    
1408
1201
    # Approve - method
1466
1259
                           access="readwrite")
1467
1260
    def ApprovalDuration_dbus_property(self, value=None):
1468
1261
        if value is None:       # get
1469
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1470
1263
                    self.approval_duration))
1471
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1472
1265
    
1486
1279
    def Host_dbus_property(self, value=None):
1487
1280
        if value is None:       # get
1488
1281
            return dbus.String(self.host)
1489
 
        self.host = unicode(value)
 
1282
        self.host = value
1490
1283
    
1491
1284
    # Created - property
1492
1285
    @dbus_service_property(_interface, signature="s", access="read")
1518
1311
            return
1519
1312
        return datetime_to_dbus(self.last_checked_ok)
1520
1313
    
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
 
    
1527
1314
    # Expires - property
1528
1315
    @dbus_service_property(_interface, signature="s", access="read")
1529
1316
    def Expires_dbus_property(self):
1540
1327
    def Timeout_dbus_property(self, value=None):
1541
1328
        if value is None:       # get
1542
1329
            return dbus.UInt64(self.timeout_milliseconds())
1543
 
        old_timeout = self.timeout
1544
1330
        self.timeout = datetime.timedelta(0, 0, 0, value)
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))
 
1331
        if getattr(self, "disable_initiator_tag", None) is None:
 
1332
            return
 
1333
        # Reschedule timeout
 
1334
        gobject.source_remove(self.disable_initiator_tag)
 
1335
        self.disable_initiator_tag = None
 
1336
        self.expires = None
 
1337
        time_to_die = _timedelta_to_milliseconds((self
 
1338
                                                  .last_checked_ok
 
1339
                                                  + self.timeout)
 
1340
                                                 - datetime.datetime
 
1341
                                                 .utcnow())
 
1342
        if time_to_die <= 0:
 
1343
            # The timeout has passed
 
1344
            self.disable()
 
1345
        else:
 
1346
            self.expires = (datetime.datetime.utcnow()
 
1347
                            + datetime.timedelta(milliseconds =
 
1348
                                                 time_to_die))
 
1349
            self.disable_initiator_tag = (gobject.timeout_add
 
1350
                                          (time_to_die, self.disable))
1561
1351
    
1562
1352
    # ExtendedTimeout - property
1563
1353
    @dbus_service_property(_interface, signature="t",
1589
1379
    def Checker_dbus_property(self, value=None):
1590
1380
        if value is None:       # get
1591
1381
            return dbus.String(self.checker_command)
1592
 
        self.checker_command = unicode(value)
 
1382
        self.checker_command = value
1593
1383
    
1594
1384
    # CheckerRunning - property
1595
1385
    @dbus_service_property(_interface, signature="b",
1624
1414
            raise KeyError()
1625
1415
    
1626
1416
    def __getattribute__(self, name):
1627
 
        if name == '_pipe':
 
1417
        if(name == '_pipe'):
1628
1418
            return super(ProxyClient, self).__getattribute__(name)
1629
1419
        self._pipe.send(('getattr', name))
1630
1420
        data = self._pipe.recv()
1637
1427
            return func
1638
1428
    
1639
1429
    def __setattr__(self, name, value):
1640
 
        if name == '_pipe':
 
1430
        if(name == '_pipe'):
1641
1431
            return super(ProxyClient, self).__setattr__(name, value)
1642
1432
        self._pipe.send(('setattr', name, value))
1643
1433
 
1644
1434
 
 
1435
class ClientDBusTransitional(ClientDBus):
 
1436
    __metaclass__ = AlternateDBusNamesMetaclass
 
1437
 
 
1438
 
1645
1439
class ClientHandler(socketserver.BaseRequestHandler, object):
1646
1440
    """A class to handle client connections.
1647
1441
    
1708
1502
                    logger.warning("Bad certificate: %s", error)
1709
1503
                    return
1710
1504
                logger.debug("Fingerprint: %s", fpr)
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
1711
1508
                
1712
1509
                try:
1713
1510
                    client = ProxyClient(child_pipe, fpr,
1729
1526
                            client.Rejected("Disabled")
1730
1527
                        return
1731
1528
                    
1732
 
                    if client.approved or not client.approval_delay:
 
1529
                    if client._approved or not client.approval_delay:
1733
1530
                        #We are approved or approval is disabled
1734
1531
                        break
1735
 
                    elif client.approved is None:
 
1532
                    elif client._approved is None:
1736
1533
                        logger.info("Client %s needs approval",
1737
1534
                                    client.name)
1738
1535
                        if self.server.use_dbus:
1751
1548
                    #wait until timeout or approved
1752
1549
                    time = datetime.datetime.now()
1753
1550
                    client.changedstate.acquire()
1754
 
                    client.changedstate.wait(
1755
 
                        float(timedelta_to_milliseconds(delay)
1756
 
                              / 1000))
 
1551
                    (client.changedstate.wait
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
 
1553
                            / 1000)))
1757
1554
                    client.changedstate.release()
1758
1555
                    time2 = datetime.datetime.now()
1759
1556
                    if (time2 - time) >= delay:
1775
1572
                    try:
1776
1573
                        sent = session.send(client.secret[sent_size:])
1777
1574
                    except gnutls.errors.GNUTLSError as error:
1778
 
                        logger.warning("gnutls send failed",
1779
 
                                       exc_info=error)
 
1575
                        logger.warning("gnutls send failed")
1780
1576
                        return
1781
1577
                    logger.debug("Sent: %d, remaining: %d",
1782
1578
                                 sent, len(client.secret)
1785
1581
                
1786
1582
                logger.info("Sending secret to %s", client.name)
1787
1583
                # bump the timeout using extended_timeout
1788
 
                client.bump_timeout(client.extended_timeout)
 
1584
                client.checked_ok(client.extended_timeout)
1789
1585
                if self.server.use_dbus:
1790
1586
                    # Emit D-Bus signal
1791
1587
                    client.GotSecret()
1796
1592
                try:
1797
1593
                    session.bye()
1798
1594
                except gnutls.errors.GNUTLSError as error:
1799
 
                    logger.warning("GnuTLS bye failed",
1800
 
                                   exc_info=error)
 
1595
                    logger.warning("GnuTLS bye failed")
1801
1596
    
1802
1597
    @staticmethod
1803
1598
    def peer_certificate(session):
1868
1663
    def sub_process_main(self, request, address):
1869
1664
        try:
1870
1665
            self.finish_request(request, address)
1871
 
        except Exception:
 
1666
        except:
1872
1667
            self.handle_error(request, address)
1873
1668
        self.close_request(request)
1874
1669
    
1875
1670
    def process_request(self, request, address):
1876
1671
        """Start a new process to process the request."""
1877
1672
        proc = multiprocessing.Process(target = self.sub_process_main,
1878
 
                                       args = (request, address))
 
1673
                                       args = (request,
 
1674
                                               address))
1879
1675
        proc.start()
1880
1676
        return proc
1881
1677
 
1909
1705
        use_ipv6:       Boolean; to use IPv6 or not
1910
1706
    """
1911
1707
    def __init__(self, server_address, RequestHandlerClass,
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
 
        """
 
1708
                 interface=None, use_ipv6=True):
1916
1709
        self.interface = interface
1917
1710
        if use_ipv6:
1918
1711
            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.
1945
1712
        socketserver.TCPServer.__init__(self, server_address,
1946
1713
                                        RequestHandlerClass)
1947
 
    
1948
1714
    def server_bind(self):
1949
1715
        """This overrides the normal server_bind() function
1950
1716
        to bind to an interface if one was specified, and also NOT to
1958
1724
                try:
1959
1725
                    self.socket.setsockopt(socket.SOL_SOCKET,
1960
1726
                                           SO_BINDTODEVICE,
1961
 
                                           str(self.interface + '\0'))
 
1727
                                           str(self.interface
 
1728
                                               + '\0'))
1962
1729
                except socket.error as error:
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:
 
1730
                    if error[0] == errno.EPERM:
 
1731
                        logger.error("No permission to"
 
1732
                                     " bind to interface %s",
 
1733
                                     self.interface)
 
1734
                    elif error[0] == errno.ENOPROTOOPT:
1967
1735
                        logger.error("SO_BINDTODEVICE not available;"
1968
1736
                                     " cannot bind to interface %s",
1969
1737
                                     self.interface)
1970
 
                    elif error.errno == errno.ENODEV:
1971
 
                        logger.error("Interface %s does not exist,"
1972
 
                                     " cannot bind", self.interface)
1973
1738
                    else:
1974
1739
                        raise
1975
1740
        # Only bind(2) the socket if we really need to.
2005
1770
    """
2006
1771
    def __init__(self, server_address, RequestHandlerClass,
2007
1772
                 interface=None, use_ipv6=True, clients=None,
2008
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1773
                 gnutls_priority=None, use_dbus=True):
2009
1774
        self.enabled = False
2010
1775
        self.clients = clients
2011
1776
        if self.clients is None:
2015
1780
        IPv6_TCPServer.__init__(self, server_address,
2016
1781
                                RequestHandlerClass,
2017
1782
                                interface = interface,
2018
 
                                use_ipv6 = use_ipv6,
2019
 
                                socketfd = socketfd)
 
1783
                                use_ipv6 = use_ipv6)
2020
1784
    def server_activate(self):
2021
1785
        if self.enabled:
2022
1786
            return socketserver.TCPServer.server_activate(self)
2035
1799
    
2036
1800
    def handle_ipc(self, source, condition, parent_pipe=None,
2037
1801
                   proc = None, client_object=None):
 
1802
        condition_names = {
 
1803
            gobject.IO_IN: "IN",   # There is data to read.
 
1804
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1805
                                    # blocking).
 
1806
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1807
            gobject.IO_ERR: "ERR", # Error condition.
 
1808
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1809
                                    # broken, usually for pipes and
 
1810
                                    # sockets).
 
1811
            }
 
1812
        conditions_string = ' | '.join(name
 
1813
                                       for cond, name in
 
1814
                                       condition_names.iteritems()
 
1815
                                       if cond & condition)
2038
1816
        # error, or the other end of multiprocessing.Pipe has closed
2039
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1817
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2040
1818
            # Wait for other process to exit
2041
1819
            proc.join()
2042
1820
            return False
2100
1878
        return True
2101
1879
 
2102
1880
 
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
 
 
2202
1881
def string_to_delta(interval):
2203
1882
    """Parse a string and return a datetime.timedelta
2204
1883
    
2215
1894
    >>> string_to_delta('5m 30s')
2216
1895
    datetime.timedelta(0, 330)
2217
1896
    """
2218
 
    
2219
 
    try:
2220
 
        return rfc3339_duration_to_delta(interval)
2221
 
    except ValueError:
2222
 
        pass
2223
 
    
2224
1897
    timevalue = datetime.timedelta(0)
2225
1898
    for s in interval.split():
2226
1899
        try:
2237
1910
            elif suffix == "w":
2238
1911
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
1912
            else:
2240
 
                raise ValueError("Unknown suffix {0!r}"
2241
 
                                 .format(suffix))
 
1913
                raise ValueError("Unknown suffix %r" % suffix)
2242
1914
        except (ValueError, IndexError) as e:
2243
1915
            raise ValueError(*(e.args))
2244
1916
        timevalue += delta
2258
1930
        sys.exit()
2259
1931
    if not noclose:
2260
1932
        # Close all standard open file descriptors
2261
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1933
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2262
1934
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
1935
            raise OSError(errno.ENODEV,
2264
 
                          "{0} not a character device"
2265
 
                          .format(os.devnull))
 
1936
                          "%s not a character device"
 
1937
                          % os.path.devnull)
2266
1938
        os.dup2(null, sys.stdin.fileno())
2267
1939
        os.dup2(null, sys.stdout.fileno())
2268
1940
        os.dup2(null, sys.stderr.fileno())
2277
1949
    
2278
1950
    parser = argparse.ArgumentParser()
2279
1951
    parser.add_argument("-v", "--version", action="version",
2280
 
                        version = "%(prog)s {0}".format(version),
 
1952
                        version = "%%(prog)s %s" % version,
2281
1953
                        help="show version number and exit")
2282
1954
    parser.add_argument("-i", "--interface", metavar="IF",
2283
1955
                        help="Bind to interface IF")
2308
1980
    parser.add_argument("--no-restore", action="store_false",
2309
1981
                        dest="restore", help="Do not restore stored"
2310
1982
                        " 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
1983
    parser.add_argument("--statedir", metavar="DIR",
2315
1984
                        help="Directory to save/restore state in")
2316
 
    parser.add_argument("--foreground", action="store_true",
2317
 
                        help="Run in foreground")
2318
1985
    
2319
1986
    options = parser.parse_args()
2320
1987
    
2335
2002
                        "use_ipv6": "True",
2336
2003
                        "debuglevel": "",
2337
2004
                        "restore": "True",
2338
 
                        "socket": "",
2339
 
                        "statedir": "/var/lib/mandos",
2340
 
                        "foreground": "False",
 
2005
                        "statedir": "/var/lib/mandos"
2341
2006
                        }
2342
2007
    
2343
2008
    # Parse config file for server-global settings
2348
2013
    # Convert the SafeConfigParser object to a dict
2349
2014
    server_settings = server_config.defaults()
2350
2015
    # Use the appropriate methods on the non-string config options
2351
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2016
    for option in ("debug", "use_dbus", "use_ipv6"):
2352
2017
        server_settings[option] = server_config.getboolean("DEFAULT",
2353
2018
                                                           option)
2354
2019
    if server_settings["port"]:
2355
2020
        server_settings["port"] = server_config.getint("DEFAULT",
2356
2021
                                                       "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"])
2366
2022
    del server_config
2367
2023
    
2368
2024
    # Override the settings from the config file with command line
2370
2026
    for option in ("interface", "address", "port", "debug",
2371
2027
                   "priority", "servicename", "configdir",
2372
2028
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2373
 
                   "statedir", "socket", "foreground"):
 
2029
                   "statedir"):
2374
2030
        value = getattr(options, option)
2375
2031
        if value is not None:
2376
2032
            server_settings[option] = value
2379
2035
    for option in server_settings.keys():
2380
2036
        if type(server_settings[option]) is str:
2381
2037
            server_settings[option] = unicode(server_settings[option])
2382
 
    # Debug implies foreground
2383
 
    if server_settings["debug"]:
2384
 
        server_settings["foreground"] = True
2385
2038
    # Now we have our good server settings in "server_settings"
2386
2039
    
2387
2040
    ##################################################################
2393
2046
    use_ipv6 = server_settings["use_ipv6"]
2394
2047
    stored_state_path = os.path.join(server_settings["statedir"],
2395
2048
                                     stored_state_file)
2396
 
    foreground = server_settings["foreground"]
2397
2049
    
2398
2050
    if debug:
2399
 
        initlogger(debug, logging.DEBUG)
 
2051
        initlogger(logging.DEBUG)
2400
2052
    else:
2401
2053
        if not debuglevel:
2402
 
            initlogger(debug)
 
2054
            initlogger()
2403
2055
        else:
2404
2056
            level = getattr(logging, debuglevel.upper())
2405
 
            initlogger(debug, level)
 
2057
            initlogger(level)
2406
2058
    
2407
2059
    if server_settings["servicename"] != "Mandos":
2408
2060
        syslogger.setFormatter(logging.Formatter
2409
 
                               ('Mandos ({0}) [%(process)d]:'
2410
 
                                ' %(levelname)s: %(message)s'
2411
 
                                .format(server_settings
2412
 
                                        ["servicename"])))
 
2061
                               ('Mandos (%s) [%%(process)d]:'
 
2062
                                ' %%(levelname)s: %%(message)s'
 
2063
                                % server_settings["servicename"]))
2413
2064
    
2414
2065
    # Parse config file with clients
2415
 
    client_config = configparser.SafeConfigParser(Client
2416
 
                                                  .client_defaults)
 
2066
    client_defaults = { "timeout": "5m",
 
2067
                        "extended_timeout": "15m",
 
2068
                        "interval": "2m",
 
2069
                        "checker": "fping -q -- %%(host)s",
 
2070
                        "host": "",
 
2071
                        "approval_delay": "0s",
 
2072
                        "approval_duration": "1s",
 
2073
                        }
 
2074
    client_config = configparser.SafeConfigParser(client_defaults)
2417
2075
    client_config.read(os.path.join(server_settings["configdir"],
2418
2076
                                    "clients.conf"))
2419
2077
    
2428
2086
                              use_ipv6=use_ipv6,
2429
2087
                              gnutls_priority=
2430
2088
                              server_settings["priority"],
2431
 
                              use_dbus=use_dbus,
2432
 
                              socketfd=(server_settings["socket"]
2433
 
                                        or None))
2434
 
    if not foreground:
 
2089
                              use_dbus=use_dbus)
 
2090
    if not debug:
2435
2091
        pidfilename = "/var/run/mandos.pid"
2436
 
        pidfile = None
2437
2092
        try:
2438
2093
            pidfile = open(pidfilename, "w")
2439
 
        except IOError as e:
2440
 
            logger.error("Could not open file %r", pidfilename,
2441
 
                         exc_info=e)
 
2094
        except IOError:
 
2095
            logger.error("Could not open file %r", pidfilename)
2442
2096
    
2443
 
    for name in ("_mandos", "mandos", "nobody"):
 
2097
    try:
 
2098
        uid = pwd.getpwnam("_mandos").pw_uid
 
2099
        gid = pwd.getpwnam("_mandos").pw_gid
 
2100
    except KeyError:
2444
2101
        try:
2445
 
            uid = pwd.getpwnam(name).pw_uid
2446
 
            gid = pwd.getpwnam(name).pw_gid
2447
 
            break
 
2102
            uid = pwd.getpwnam("mandos").pw_uid
 
2103
            gid = pwd.getpwnam("mandos").pw_gid
2448
2104
        except KeyError:
2449
 
            continue
2450
 
    else:
2451
 
        uid = 65534
2452
 
        gid = 65534
 
2105
            try:
 
2106
                uid = pwd.getpwnam("nobody").pw_uid
 
2107
                gid = pwd.getpwnam("nobody").pw_gid
 
2108
            except KeyError:
 
2109
                uid = 65534
 
2110
                gid = 65534
2453
2111
    try:
2454
2112
        os.setgid(gid)
2455
2113
        os.setuid(uid)
2456
2114
    except OSError as error:
2457
 
        if error.errno != errno.EPERM:
 
2115
        if error[0] != errno.EPERM:
2458
2116
            raise error
2459
2117
    
2460
2118
    if debug:
2472
2130
         .gnutls_global_set_log_function(debug_gnutls))
2473
2131
        
2474
2132
        # Redirect stdin so all checkers get /dev/null
2475
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2133
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2476
2134
        os.dup2(null, sys.stdin.fileno())
2477
2135
        if null > 2:
2478
2136
            os.close(null)
 
2137
    else:
 
2138
        # No console logging
 
2139
        logger.removeHandler(console)
2479
2140
    
2480
2141
    # Need to fork before connecting to D-Bus
2481
 
    if not foreground:
 
2142
    if not debug:
2482
2143
        # Close all input and output, do double fork, etc.
2483
2144
        daemon()
2484
2145
    
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
 
    
2489
2146
    global main_loop
2490
2147
    # From the Avahi example code
2491
 
    DBusGMainLoop(set_as_default=True)
 
2148
    DBusGMainLoop(set_as_default=True )
2492
2149
    main_loop = gobject.MainLoop()
2493
2150
    bus = dbus.SystemBus()
2494
2151
    # End of Avahi example code
2500
2157
                            ("se.bsnet.fukt.Mandos", bus,
2501
2158
                             do_not_queue=True))
2502
2159
        except dbus.exceptions.NameExistsException as e:
2503
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2160
            logger.error(unicode(e) + ", disabling D-Bus")
2504
2161
            use_dbus = False
2505
2162
            server_settings["use_dbus"] = False
2506
2163
            tcp_server.use_dbus = False
2518
2175
    
2519
2176
    client_class = Client
2520
2177
    if use_dbus:
2521
 
        client_class = functools.partial(ClientDBus, bus = bus)
2522
 
    
2523
 
    client_settings = Client.config_parser(client_config)
 
2178
        client_class = functools.partial(ClientDBusTransitional,
 
2179
                                         bus = bus)
 
2180
    
 
2181
    special_settings = {
 
2182
        # Some settings need to be accessd by special methods;
 
2183
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2184
        "approved_by_default":
 
2185
            lambda section:
 
2186
            client_config.getboolean(section, "approved_by_default"),
 
2187
        "enabled":
 
2188
            lambda section:
 
2189
            client_config.getboolean(section, "enabled"),
 
2190
        }
 
2191
    # Construct a new dict of client settings of this form:
 
2192
    # { client_name: {setting_name: value, ...}, ...}
 
2193
    # with exceptions for any special settings as defined above
 
2194
    client_settings = dict((clientname,
 
2195
                           dict((setting,
 
2196
                                 (value
 
2197
                                  if setting not in special_settings
 
2198
                                  else special_settings[setting]
 
2199
                                  (clientname)))
 
2200
                                for setting, value in
 
2201
                                client_config.items(clientname)))
 
2202
                          for clientname in client_config.sections())
 
2203
    
2524
2204
    old_client_settings = {}
2525
 
    clients_data = {}
 
2205
    clients_data = []
2526
2206
    
2527
2207
    # Get client data and settings from last running state.
2528
2208
    if server_settings["restore"]:
2532
2212
                                                     (stored_state))
2533
2213
            os.remove(stored_state_path)
2534
2214
        except IOError as e:
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)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2541
2218
                raise
2542
 
        except EOFError as e:
2543
 
            logger.warning("Could not load persistent state: "
2544
 
                           "EOFError:", exc_info=e)
2545
2219
    
2546
 
    with PGPEngine() as pgp:
2547
 
        for client_name, client in clients_data.iteritems():
 
2220
    with Crypto() as crypt:
 
2221
        for client in clients_data:
 
2222
            client_name = client["name"]
 
2223
            
2548
2224
            # Decide which value to use after restoring saved state.
2549
2225
            # We have three different values: Old config file,
2550
2226
            # new config file, and saved state.
2558
2234
                    if (name != "secret" and
2559
2235
                        value != old_client_settings[client_name]
2560
2236
                        [name]):
2561
 
                        client[name] = value
 
2237
                        setattr(client, name, value)
2562
2238
                except KeyError:
2563
2239
                    pass
2564
2240
            
2565
2241
            # Clients who has passed its expire date can still be
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"]))
 
2242
            # enabled if its last checker was sucessful.  Clients
 
2243
            # whose checker failed before we stored its state is
 
2244
            # assumed to have failed all checkers during downtime.
 
2245
            if client["enabled"] and client["last_checked_ok"]:
 
2246
                if ((datetime.datetime.utcnow()
 
2247
                     - client["last_checked_ok"])
 
2248
                    > client["interval"]):
 
2249
                    if client["last_checker_status"] != 0:
2584
2250
                        client["enabled"] = False
2585
2251
                    else:
2586
2252
                        client["expires"] = (datetime.datetime
2587
2253
                                             .utcnow()
2588
2254
                                             + client["timeout"])
2589
 
                        logger.debug("Last checker succeeded,"
2590
 
                                     " keeping {0} enabled"
2591
 
                                     .format(client_name))
 
2255
            
 
2256
            client["changedstate"] = (multiprocessing_manager
 
2257
                                      .Condition
 
2258
                                      (multiprocessing_manager
 
2259
                                       .Lock()))
 
2260
            if use_dbus:
 
2261
                new_client = (ClientDBusTransitional.__new__
 
2262
                              (ClientDBusTransitional))
 
2263
                tcp_server.clients[client_name] = new_client
 
2264
                new_client.bus = bus
 
2265
                for name, value in client.iteritems():
 
2266
                    setattr(new_client, name, value)
 
2267
                client_object_name = unicode(client_name).translate(
 
2268
                    {ord("."): ord("_"),
 
2269
                     ord("-"): ord("_")})
 
2270
                new_client.dbus_object_path = (dbus.ObjectPath
 
2271
                                               ("/clients/"
 
2272
                                                + client_object_name))
 
2273
                DBusObjectWithProperties.__init__(new_client,
 
2274
                                                  new_client.bus,
 
2275
                                                  new_client
 
2276
                                                  .dbus_object_path)
 
2277
            else:
 
2278
                tcp_server.clients[client_name] = (Client.__new__
 
2279
                                                   (Client))
 
2280
                for name, value in client.iteritems():
 
2281
                    setattr(tcp_server.clients[client_name],
 
2282
                            name, value)
 
2283
            
2592
2284
            try:
2593
 
                client["secret"] = (
2594
 
                    pgp.decrypt(client["encrypted_secret"],
2595
 
                                client_settings[client_name]
2596
 
                                ["secret"]))
2597
 
            except PGPError:
 
2285
                tcp_server.clients[client_name].secret = (
 
2286
                    crypt.decrypt(tcp_server.clients[client_name]
 
2287
                                  .encrypted_secret,
 
2288
                                  client_settings[client_name]
 
2289
                                  ["secret"]))
 
2290
            except CryptoError:
2598
2291
                # If decryption fails, we use secret from new settings
2599
 
                logger.debug("Failed to decrypt {0} old secret"
2600
 
                             .format(client_name))
2601
 
                client["secret"] = (
 
2292
                tcp_server.clients[client_name].secret = (
2602
2293
                    client_settings[client_name]["secret"])
2603
2294
    
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)
 
2295
    # Create/remove clients based on new changes made to config
 
2296
    for clientname in set(old_client_settings) - set(client_settings):
 
2297
        del tcp_server.clients[clientname]
 
2298
    for clientname in set(client_settings) - set(old_client_settings):
 
2299
        tcp_server.clients[clientname] = (client_class(name
 
2300
                                                       = clientname,
 
2301
                                                       config =
 
2302
                                                       client_settings
 
2303
                                                       [clientname]))
2616
2304
    
2617
2305
    if not tcp_server.clients:
2618
2306
        logger.warning("No clients defined")
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
 
2307
        
 
2308
    if not debug:
 
2309
        try:
 
2310
            with pidfile:
 
2311
                pid = os.getpid()
 
2312
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2313
            del pidfile
 
2314
        except IOError:
 
2315
            logger.error("Could not write to file %r with PID %d",
 
2316
                         pidfilename, pid)
 
2317
        except NameError:
 
2318
            # "pidfile" was never created
 
2319
            pass
2630
2320
        del pidfilename
 
2321
        
 
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2631
2323
    
2632
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2633
2325
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2634
2326
    
2635
2327
    if use_dbus:
2636
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2637
 
                                        "se.bsnet.fukt.Mandos"})
2638
 
        class MandosDBusService(DBusObjectWithProperties):
 
2328
        class MandosDBusService(dbus.service.Object):
2639
2329
            """A D-Bus proxy object"""
2640
2330
            def __init__(self):
2641
2331
                dbus.service.Object.__init__(self, bus, "/")
2642
2332
            _interface = "se.recompile.Mandos"
2643
2333
            
2644
 
            @dbus_interface_annotations(_interface)
2645
 
            def _foo(self):
2646
 
                return { "org.freedesktop.DBus.Property"
2647
 
                         ".EmitsChangedSignal":
2648
 
                             "false"}
2649
 
            
2650
2334
            @dbus.service.signal(_interface, signature="o")
2651
2335
            def ClientAdded(self, objpath):
2652
2336
                "D-Bus signal"
2694
2378
            
2695
2379
            del _interface
2696
2380
        
2697
 
        mandos_dbus_service = MandosDBusService()
 
2381
        class MandosDBusServiceTransitional(MandosDBusService):
 
2382
            __metaclass__ = AlternateDBusNamesMetaclass
 
2383
        mandos_dbus_service = MandosDBusServiceTransitional()
2698
2384
    
2699
2385
    def cleanup():
2700
2386
        "Cleanup function; run on exit"
2707
2393
        # Store client before exiting. Secrets are encrypted with key
2708
2394
        # based on what config file has. If config file is
2709
2395
        # removed/edited, old secret will thus be unrecovable.
2710
 
        clients = {}
2711
 
        with PGPEngine() as pgp:
 
2396
        clients = []
 
2397
        with Crypto() as crypt:
2712
2398
            for client in tcp_server.clients.itervalues():
2713
2399
                key = client_settings[client.name]["secret"]
2714
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2715
 
                                                      key)
 
2400
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2401
                                                        key)
2716
2402
                client_dict = {}
2717
2403
                
2718
 
                # A list of attributes that can not be pickled
2719
 
                # + secret.
2720
 
                exclude = set(("bus", "changedstate", "secret",
2721
 
                               "checker"))
 
2404
                # A list of attributes that will not be stored when
 
2405
                # shutting down.
 
2406
                exclude = set(("bus", "changedstate", "secret"))
2722
2407
                for name, typ in (inspect.getmembers
2723
2408
                                  (dbus.service.Object)):
2724
2409
                    exclude.add(name)
2729
2414
                    if attr not in exclude:
2730
2415
                        client_dict[attr] = getattr(client, attr)
2731
2416
                
2732
 
                clients[client.name] = client_dict
 
2417
                clients.append(client_dict)
2733
2418
                del client_settings[client.name]["secret"]
2734
2419
        
2735
2420
        try:
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:
 
2421
            with os.fdopen(os.open(stored_state_path,
 
2422
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2423
                                   0600), "wb") as stored_state:
2740
2424
                pickle.dump((clients, client_settings), stored_state)
2741
 
                tempname=stored_state.name
2742
 
            os.rename(tempname, stored_state_path)
2743
2425
        except (IOError, OSError) as e:
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
 
2426
            logger.warning("Could not save persistent state: {0}"
 
2427
                           .format(e))
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2429
                raise
2756
2430
        
2757
2431
        # Delete all clients, and settings from config
2758
2432
        while tcp_server.clients:
2785
2459
    service.port = tcp_server.socket.getsockname()[1]
2786
2460
    if use_ipv6:
2787
2461
        logger.info("Now listening on address %r, port %d,"
2788
 
                    " flowinfo %d, scope_id %d",
2789
 
                    *tcp_server.socket.getsockname())
 
2462
                    " flowinfo %d, scope_id %d"
 
2463
                    % tcp_server.socket.getsockname())
2790
2464
    else:                       # IPv4
2791
 
        logger.info("Now listening on address %r, port %d",
2792
 
                    *tcp_server.socket.getsockname())
 
2465
        logger.info("Now listening on address %r, port %d"
 
2466
                    % tcp_server.socket.getsockname())
2793
2467
    
2794
2468
    #service.interface = tcp_server.socket.getsockname()[3]
2795
2469
    
2798
2472
        try:
2799
2473
            service.activate()
2800
2474
        except dbus.exceptions.DBusException as error:
2801
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2475
            logger.critical("DBusException: %s", error)
2802
2476
            cleanup()
2803
2477
            sys.exit(1)
2804
2478
        # End of Avahi example code
2811
2485
        logger.debug("Starting main loop")
2812
2486
        main_loop.run()
2813
2487
    except AvahiError as error:
2814
 
        logger.critical("Avahi Error", exc_info=error)
 
2488
        logger.critical("AvahiError: %s", error)
2815
2489
        cleanup()
2816
2490
        sys.exit(1)
2817
2491
    except KeyboardInterrupt:
2822
2496
    # Must run before the D-Bus bus name gets deregistered
2823
2497
    cleanup()
2824
2498
 
 
2499
 
2825
2500
if __name__ == '__main__':
2826
2501
    main()