/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-12-21 17:09:12 UTC
  • mfrom: (526 trunk)
  • mto: This revision was merged to the branch mainline in revision 527.
  • Revision ID: teddy@recompile.se-20111221170912-tr0v60ul607zhd2q
Merge from trunk.

Show diffs side-by-side

added added

removed removed

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