/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2014-07-13 20:37:44 UTC
  • mfrom: (237.7.258 trunk)
  • Revision ID: teddy@recompile.se-20140713203744-538hqhk81vw9dixv
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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
65
67
import types
66
68
import binascii
67
69
import tempfile
 
70
import itertools
 
71
import collections
68
72
 
69
73
import dbus
70
74
import dbus.service
75
79
import ctypes.util
76
80
import xml.dom.minidom
77
81
import inspect
78
 
import GnuPGInterface
79
82
 
80
83
try:
81
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
88
    except ImportError:
86
89
        SO_BINDTODEVICE = None
87
90
 
88
 
 
89
 
version = "1.4.1"
 
91
version = "1.6.5"
90
92
stored_state_file = "clients.pickle"
91
93
 
92
94
logger = logging.getLogger()
93
 
syslogger = (logging.handlers.SysLogHandler
94
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
 
              address = str("/dev/log")))
 
95
syslogger = None
96
96
 
97
97
try:
98
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
111
111
        return interface_index
112
112
 
113
113
 
114
 
def initlogger(level=logging.WARNING):
 
114
def initlogger(debug, level=logging.WARNING):
115
115
    """init logger and add loglevel"""
116
116
    
 
117
    global syslogger
 
118
    syslogger = (logging.handlers.SysLogHandler
 
119
                 (facility =
 
120
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
121
                  address = str("/dev/log")))
117
122
    syslogger.setFormatter(logging.Formatter
118
123
                           ('Mandos [%(process)d]: %(levelname)s:'
119
124
                            ' %(message)s'))
120
125
    logger.addHandler(syslogger)
121
126
    
122
 
    console = logging.StreamHandler()
123
 
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
124
 
                                           ' [%(process)d]:'
125
 
                                           ' %(levelname)s:'
126
 
                                           ' %(message)s'))
127
 
    logger.addHandler(console)
 
127
    if debug:
 
128
        console = logging.StreamHandler()
 
129
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
130
                                               ' [%(process)d]:'
 
131
                                               ' %(levelname)s:'
 
132
                                               ' %(message)s'))
 
133
        logger.addHandler(console)
128
134
    logger.setLevel(level)
129
135
 
130
136
 
131
 
class CryptoError(Exception):
 
137
class PGPError(Exception):
 
138
    """Exception if encryption/decryption fails"""
132
139
    pass
133
140
 
134
141
 
135
 
class Crypto(object):
 
142
class PGPEngine(object):
136
143
    """A simple class for OpenPGP symmetric encryption & decryption"""
137
144
    def __init__(self):
138
 
        self.gnupg = GnuPGInterface.GnuPG()
139
145
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
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'])
 
146
        self.gnupgargs = ['--batch',
 
147
                          '--home', self.tempdir,
 
148
                          '--force-mdc',
 
149
                          '--quiet',
 
150
                          '--no-use-agent']
145
151
    
146
152
    def __enter__(self):
147
153
        return self
148
154
    
149
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
155
    def __exit__(self, exc_type, exc_value, traceback):
150
156
        self._cleanup()
151
157
        return False
152
158
    
169
175
    def password_encode(self, password):
170
176
        # Passphrase can not be empty and can not contain newlines or
171
177
        # NUL bytes.  So we prefix it and hex encode it.
172
 
        return b"mandos" + binascii.hexlify(password)
 
178
        encoded = b"mandos" + binascii.hexlify(password)
 
179
        if len(encoded) > 2048:
 
180
            # GnuPG can't handle long passwords, so encode differently
 
181
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
182
                       .replace(b"\n", b"\\n")
 
183
                       .replace(b"\0", b"\\x00"))
 
184
        return encoded
173
185
    
174
186
    def encrypt(self, data, password):
175
 
        self.gnupg.passphrase = self.password_encode(password)
176
 
        with open(os.devnull) as devnull:
177
 
            try:
178
 
                proc = self.gnupg.run(['--symmetric'],
179
 
                                      create_fhs=['stdin', 'stdout'],
180
 
                                      attach_fhs={'stderr': devnull})
181
 
                with contextlib.closing(proc.handles['stdin']) as f:
182
 
                    f.write(data)
183
 
                with contextlib.closing(proc.handles['stdout']) as f:
184
 
                    ciphertext = f.read()
185
 
                proc.wait()
186
 
            except IOError as e:
187
 
                raise CryptoError(e)
188
 
        self.gnupg.passphrase = None
 
187
        passphrase = self.password_encode(password)
 
188
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
189
                                         ) as passfile:
 
190
            passfile.write(passphrase)
 
191
            passfile.flush()
 
192
            proc = subprocess.Popen(['gpg', '--symmetric',
 
193
                                     '--passphrase-file',
 
194
                                     passfile.name]
 
195
                                    + self.gnupgargs,
 
196
                                    stdin = subprocess.PIPE,
 
197
                                    stdout = subprocess.PIPE,
 
198
                                    stderr = subprocess.PIPE)
 
199
            ciphertext, err = proc.communicate(input = data)
 
200
        if proc.returncode != 0:
 
201
            raise PGPError(err)
189
202
        return ciphertext
190
203
    
191
204
    def decrypt(self, data, password):
192
 
        self.gnupg.passphrase = self.password_encode(password)
193
 
        with open(os.devnull) as devnull:
194
 
            try:
195
 
                proc = self.gnupg.run(['--decrypt'],
196
 
                                      create_fhs=['stdin', 'stdout'],
197
 
                                      attach_fhs={'stderr': devnull})
198
 
                with contextlib.closing(proc.handles['stdin'] ) as f:
199
 
                    f.write(data)
200
 
                with contextlib.closing(proc.handles['stdout']) as f:
201
 
                    decrypted_plaintext = f.read()
202
 
                proc.wait()
203
 
            except IOError as e:
204
 
                raise CryptoError(e)
205
 
        self.gnupg.passphrase = None
 
205
        passphrase = self.password_encode(password)
 
206
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
207
                                         ) as passfile:
 
208
            passfile.write(passphrase)
 
209
            passfile.flush()
 
210
            proc = subprocess.Popen(['gpg', '--decrypt',
 
211
                                     '--passphrase-file',
 
212
                                     passfile.name]
 
213
                                    + self.gnupgargs,
 
214
                                    stdin = subprocess.PIPE,
 
215
                                    stdout = subprocess.PIPE,
 
216
                                    stderr = subprocess.PIPE)
 
217
            decrypted_plaintext, err = proc.communicate(input
 
218
                                                        = data)
 
219
        if proc.returncode != 0:
 
220
            raise PGPError(err)
206
221
        return decrypted_plaintext
207
222
 
208
223
 
209
 
 
210
224
class AvahiError(Exception):
211
225
    def __init__(self, value, *args, **kwargs):
212
226
        self.value = value
229
243
               Used to optionally bind to the specified interface.
230
244
    name: string; Example: 'Mandos'
231
245
    type: string; Example: '_mandos._tcp'.
232
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
246
     See <https://www.iana.org/assignments/service-names-port-numbers>
233
247
    port: integer; what port to announce
234
248
    TXT: list of strings; TXT record for the service
235
249
    domain: string; Domain to publish on, default to .local if empty.
241
255
    server: D-Bus Server
242
256
    bus: dbus.SystemBus()
243
257
    """
 
258
    
244
259
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
245
260
                 servicetype = None, port = None, TXT = None,
246
261
                 domain = "", host = "", max_renames = 32768,
259
274
        self.server = None
260
275
        self.bus = bus
261
276
        self.entry_group_state_changed_match = None
 
277
    
262
278
    def rename(self):
263
279
        """Derived from the Avahi example code"""
264
280
        if self.rename_count >= self.max_renames:
274
290
        try:
275
291
            self.add()
276
292
        except dbus.exceptions.DBusException as error:
277
 
            logger.critical("DBusException: %s", error)
 
293
            logger.critical("D-Bus Exception", exc_info=error)
278
294
            self.cleanup()
279
295
            os._exit(1)
280
296
        self.rename_count += 1
 
297
    
281
298
    def remove(self):
282
299
        """Derived from the Avahi example code"""
283
300
        if self.entry_group_state_changed_match is not None:
285
302
            self.entry_group_state_changed_match = None
286
303
        if self.group is not None:
287
304
            self.group.Reset()
 
305
    
288
306
    def add(self):
289
307
        """Derived from the Avahi example code"""
290
308
        self.remove()
307
325
            dbus.UInt16(self.port),
308
326
            avahi.string_array_to_txt_array(self.TXT))
309
327
        self.group.Commit()
 
328
    
310
329
    def entry_group_state_changed(self, state, error):
311
330
        """Derived from the Avahi example code"""
312
331
        logger.debug("Avahi entry group state change: %i", state)
319
338
        elif state == avahi.ENTRY_GROUP_FAILURE:
320
339
            logger.critical("Avahi: Error in group state changed %s",
321
340
                            unicode(error))
322
 
            raise AvahiGroupError("State changed: %s"
323
 
                                  % unicode(error))
 
341
            raise AvahiGroupError("State changed: {0!s}"
 
342
                                  .format(error))
 
343
    
324
344
    def cleanup(self):
325
345
        """Derived from the Avahi example code"""
326
346
        if self.group is not None:
331
351
                pass
332
352
            self.group = None
333
353
        self.remove()
 
354
    
334
355
    def server_state_changed(self, state, error=None):
335
356
        """Derived from the Avahi example code"""
336
357
        logger.debug("Avahi server state change: %i", state)
355
376
                logger.debug("Unknown state: %r", state)
356
377
            else:
357
378
                logger.debug("Unknown state: %r: %r", state, error)
 
379
    
358
380
    def activate(self):
359
381
        """Derived from the Avahi example code"""
360
382
        if self.server is None:
367
389
                                 self.server_state_changed)
368
390
        self.server_state_changed(self.server.GetState())
369
391
 
 
392
 
370
393
class AvahiServiceToSyslog(AvahiService):
371
394
    def rename(self):
372
395
        """Add the new name to the syslog messages"""
373
396
        ret = AvahiService.rename(self)
374
397
        syslogger.setFormatter(logging.Formatter
375
 
                               ('Mandos (%s) [%%(process)d]:'
376
 
                                ' %%(levelname)s: %%(message)s'
377
 
                                % self.name))
 
398
                               ('Mandos ({0}) [%(process)d]:'
 
399
                                ' %(levelname)s: %(message)s'
 
400
                                .format(self.name)))
378
401
        return ret
379
402
 
380
 
def _timedelta_to_milliseconds(td):
 
403
 
 
404
def timedelta_to_milliseconds(td):
381
405
    "Convert a datetime.timedelta() to milliseconds"
382
406
    return ((td.days * 24 * 60 * 60 * 1000)
383
407
            + (td.seconds * 1000)
384
408
            + (td.microseconds // 1000))
385
 
        
 
409
 
 
410
 
386
411
class Client(object):
387
412
    """A representation of a client host served by this server.
388
413
    
389
414
    Attributes:
390
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
415
    approved:   bool(); 'None' if not yet approved/disapproved
391
416
    approval_delay: datetime.timedelta(); Time to wait for approval
392
417
    approval_duration: datetime.timedelta(); Duration of one approval
393
418
    checker:    subprocess.Popen(); a running checker process used
411
436
    interval:   datetime.timedelta(); How often to start a new checker
412
437
    last_approval_request: datetime.datetime(); (UTC) or None
413
438
    last_checked_ok: datetime.datetime(); (UTC) or None
414
 
 
415
439
    last_checker_status: integer between 0 and 255 reflecting exit
416
440
                         status of last checker. -1 reflects crashed
417
 
                         checker, or None.
418
 
    last_enabled: datetime.datetime(); (UTC)
 
441
                         checker, -2 means no checker completed yet.
 
442
    last_enabled: datetime.datetime(); (UTC) or None
419
443
    name:       string; from the config file, used in log messages and
420
444
                        D-Bus identifiers
421
445
    secret:     bytestring; sent verbatim (over TLS) to client
422
446
    timeout:    datetime.timedelta(); How long from last_checked_ok
423
447
                                      until this client is disabled
424
 
    extended_timeout:   extra long timeout when password has been sent
 
448
    extended_timeout:   extra long timeout when secret has been sent
425
449
    runtime_expansions: Allowed attributes for runtime expansion.
426
450
    expires:    datetime.datetime(); time (UTC) when a client will be
427
451
                disabled, or None
 
452
    server_settings: The server_settings dict from main()
428
453
    """
429
454
    
430
455
    runtime_expansions = ("approval_delay", "approval_duration",
431
 
                          "created", "enabled", "fingerprint",
432
 
                          "host", "interval", "last_checked_ok",
 
456
                          "created", "enabled", "expires",
 
457
                          "fingerprint", "host", "interval",
 
458
                          "last_approval_request", "last_checked_ok",
433
459
                          "last_enabled", "name", "timeout")
 
460
    client_defaults = { "timeout": "PT5M",
 
461
                        "extended_timeout": "PT15M",
 
462
                        "interval": "PT2M",
 
463
                        "checker": "fping -q -- %%(host)s",
 
464
                        "host": "",
 
465
                        "approval_delay": "PT0S",
 
466
                        "approval_duration": "PT1S",
 
467
                        "approved_by_default": "True",
 
468
                        "enabled": "True",
 
469
                        }
434
470
    
435
471
    def timeout_milliseconds(self):
436
472
        "Return the 'timeout' attribute in milliseconds"
437
 
        return _timedelta_to_milliseconds(self.timeout)
 
473
        return timedelta_to_milliseconds(self.timeout)
438
474
    
439
475
    def extended_timeout_milliseconds(self):
440
476
        "Return the 'extended_timeout' attribute in milliseconds"
441
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
477
        return timedelta_to_milliseconds(self.extended_timeout)
442
478
    
443
479
    def interval_milliseconds(self):
444
480
        "Return the 'interval' attribute in milliseconds"
445
 
        return _timedelta_to_milliseconds(self.interval)
 
481
        return timedelta_to_milliseconds(self.interval)
446
482
    
447
483
    def approval_delay_milliseconds(self):
448
 
        return _timedelta_to_milliseconds(self.approval_delay)
449
 
    
450
 
    def __init__(self, name = None, config=None):
451
 
        """Note: the 'checker' key in 'config' sets the
452
 
        'checker_command' attribute and *not* the 'checker'
453
 
        attribute."""
 
484
        return timedelta_to_milliseconds(self.approval_delay)
 
485
    
 
486
    @staticmethod
 
487
    def config_parser(config):
 
488
        """Construct a new dict of client settings of this form:
 
489
        { client_name: {setting_name: value, ...}, ...}
 
490
        with exceptions for any special settings as defined above.
 
491
        NOTE: Must be a pure function. Must return the same result
 
492
        value given the same arguments.
 
493
        """
 
494
        settings = {}
 
495
        for client_name in config.sections():
 
496
            section = dict(config.items(client_name))
 
497
            client = settings[client_name] = {}
 
498
            
 
499
            client["host"] = section["host"]
 
500
            # Reformat values from string types to Python types
 
501
            client["approved_by_default"] = config.getboolean(
 
502
                client_name, "approved_by_default")
 
503
            client["enabled"] = config.getboolean(client_name,
 
504
                                                  "enabled")
 
505
            
 
506
            client["fingerprint"] = (section["fingerprint"].upper()
 
507
                                     .replace(" ", ""))
 
508
            if "secret" in section:
 
509
                client["secret"] = section["secret"].decode("base64")
 
510
            elif "secfile" in section:
 
511
                with open(os.path.expanduser(os.path.expandvars
 
512
                                             (section["secfile"])),
 
513
                          "rb") as secfile:
 
514
                    client["secret"] = secfile.read()
 
515
            else:
 
516
                raise TypeError("No secret or secfile for section {0}"
 
517
                                .format(section))
 
518
            client["timeout"] = string_to_delta(section["timeout"])
 
519
            client["extended_timeout"] = string_to_delta(
 
520
                section["extended_timeout"])
 
521
            client["interval"] = string_to_delta(section["interval"])
 
522
            client["approval_delay"] = string_to_delta(
 
523
                section["approval_delay"])
 
524
            client["approval_duration"] = string_to_delta(
 
525
                section["approval_duration"])
 
526
            client["checker_command"] = section["checker"]
 
527
            client["last_approval_request"] = None
 
528
            client["last_checked_ok"] = None
 
529
            client["last_checker_status"] = -2
 
530
        
 
531
        return settings
 
532
    
 
533
    def __init__(self, settings, name = None, server_settings=None):
454
534
        self.name = name
455
 
        if config is None:
456
 
            config = {}
 
535
        if server_settings is None:
 
536
            server_settings = {}
 
537
        self.server_settings = server_settings
 
538
        # adding all client settings
 
539
        for setting, value in settings.iteritems():
 
540
            setattr(self, setting, value)
 
541
        
 
542
        if self.enabled:
 
543
            if not hasattr(self, "last_enabled"):
 
544
                self.last_enabled = datetime.datetime.utcnow()
 
545
            if not hasattr(self, "expires"):
 
546
                self.expires = (datetime.datetime.utcnow()
 
547
                                + self.timeout)
 
548
        else:
 
549
            self.last_enabled = None
 
550
            self.expires = None
 
551
        
457
552
        logger.debug("Creating client %r", self.name)
458
553
        # Uppercase and remove spaces from fingerprint for later
459
554
        # comparison purposes with return value from the fingerprint()
460
555
        # function
461
 
        self.fingerprint = (config["fingerprint"].upper()
462
 
                            .replace(" ", ""))
463
556
        logger.debug("  Fingerprint: %s", self.fingerprint)
464
 
        if "secret" in config:
465
 
            self.secret = config["secret"].decode("base64")
466
 
        elif "secfile" in config:
467
 
            with open(os.path.expanduser(os.path.expandvars
468
 
                                         (config["secfile"])),
469
 
                      "rb") as secfile:
470
 
                self.secret = secfile.read()
471
 
        else:
472
 
            raise TypeError("No secret or secfile for client %s"
473
 
                            % self.name)
474
 
        self.host = config.get("host", "")
475
 
        self.created = datetime.datetime.utcnow()
476
 
        self.enabled = True
477
 
        self.last_approval_request = None
478
 
        self.last_enabled = datetime.datetime.utcnow()
479
 
        self.last_checked_ok = None
480
 
        self.last_checker_status = None
481
 
        self.timeout = string_to_delta(config["timeout"])
482
 
        self.extended_timeout = string_to_delta(config
483
 
                                                ["extended_timeout"])
484
 
        self.interval = string_to_delta(config["interval"])
 
557
        self.created = settings.get("created",
 
558
                                    datetime.datetime.utcnow())
 
559
        
 
560
        # attributes specific for this server instance
485
561
        self.checker = None
486
562
        self.checker_initiator_tag = None
487
563
        self.disable_initiator_tag = None
488
 
        self.expires = datetime.datetime.utcnow() + self.timeout
489
564
        self.checker_callback_tag = None
490
 
        self.checker_command = config["checker"]
491
565
        self.current_checker_command = None
492
 
        self._approved = None
493
 
        self.approved_by_default = config.get("approved_by_default",
494
 
                                              True)
 
566
        self.approved = None
495
567
        self.approvals_pending = 0
496
 
        self.approval_delay = string_to_delta(
497
 
            config["approval_delay"])
498
 
        self.approval_duration = string_to_delta(
499
 
            config["approval_duration"])
500
568
        self.changedstate = (multiprocessing_manager
501
569
                             .Condition(multiprocessing_manager
502
570
                                        .Lock()))
522
590
        if getattr(self, "enabled", False):
523
591
            # Already enabled
524
592
            return
525
 
        self.send_changedstate()
526
593
        self.expires = datetime.datetime.utcnow() + self.timeout
527
594
        self.enabled = True
528
595
        self.last_enabled = datetime.datetime.utcnow()
529
596
        self.init_checker()
 
597
        self.send_changedstate()
530
598
    
531
599
    def disable(self, quiet=True):
532
600
        """Disable this client."""
533
601
        if not getattr(self, "enabled", False):
534
602
            return False
535
603
        if not quiet:
536
 
            self.send_changedstate()
537
 
        if not quiet:
538
604
            logger.info("Disabling client %s", self.name)
539
 
        if getattr(self, "disable_initiator_tag", False):
 
605
        if getattr(self, "disable_initiator_tag", None) is not None:
540
606
            gobject.source_remove(self.disable_initiator_tag)
541
607
            self.disable_initiator_tag = None
542
608
        self.expires = None
543
 
        if getattr(self, "checker_initiator_tag", False):
 
609
        if getattr(self, "checker_initiator_tag", None) is not None:
544
610
            gobject.source_remove(self.checker_initiator_tag)
545
611
            self.checker_initiator_tag = None
546
612
        self.stop_checker()
547
613
        self.enabled = False
 
614
        if not quiet:
 
615
            self.send_changedstate()
548
616
        # Do not run this again if called by a gobject.timeout_add
549
617
        return False
550
618
    
554
622
    def init_checker(self):
555
623
        # Schedule a new checker to be started an 'interval' from now,
556
624
        # and every interval from then on.
 
625
        if self.checker_initiator_tag is not None:
 
626
            gobject.source_remove(self.checker_initiator_tag)
557
627
        self.checker_initiator_tag = (gobject.timeout_add
558
628
                                      (self.interval_milliseconds(),
559
629
                                       self.start_checker))
560
630
        # Schedule a disable() when 'timeout' has passed
 
631
        if self.disable_initiator_tag is not None:
 
632
            gobject.source_remove(self.disable_initiator_tag)
561
633
        self.disable_initiator_tag = (gobject.timeout_add
562
634
                                   (self.timeout_milliseconds(),
563
635
                                    self.disable))
569
641
        self.checker_callback_tag = None
570
642
        self.checker = None
571
643
        if os.WIFEXITED(condition):
572
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
644
            self.last_checker_status = os.WEXITSTATUS(condition)
573
645
            if self.last_checker_status == 0:
574
646
                logger.info("Checker for %(name)s succeeded",
575
647
                            vars(self))
582
654
            logger.warning("Checker for %(name)s crashed?",
583
655
                           vars(self))
584
656
    
585
 
    def checked_ok(self, timeout=None):
586
 
        """Bump up the timeout for this client.
587
 
        
588
 
        This should only be called when the client has been seen,
589
 
        alive and well.
590
 
        """
 
657
    def checked_ok(self):
 
658
        """Assert that the client has been seen, alive and well."""
 
659
        self.last_checked_ok = datetime.datetime.utcnow()
 
660
        self.last_checker_status = 0
 
661
        self.bump_timeout()
 
662
    
 
663
    def bump_timeout(self, timeout=None):
 
664
        """Bump up the timeout for this client."""
591
665
        if timeout is None:
592
666
            timeout = self.timeout
593
 
        self.last_checked_ok = datetime.datetime.utcnow()
594
667
        if self.disable_initiator_tag is not None:
595
668
            gobject.source_remove(self.disable_initiator_tag)
 
669
            self.disable_initiator_tag = None
596
670
        if getattr(self, "enabled", False):
597
671
            self.disable_initiator_tag = (gobject.timeout_add
598
 
                                          (_timedelta_to_milliseconds
 
672
                                          (timedelta_to_milliseconds
599
673
                                           (timeout), self.disable))
600
674
            self.expires = datetime.datetime.utcnow() + timeout
601
675
    
608
682
        If a checker already exists, leave it running and do
609
683
        nothing."""
610
684
        # The reason for not killing a running checker is that if we
611
 
        # did that, then if a checker (for some reason) started
612
 
        # running slowly and taking more than 'interval' time, the
613
 
        # client would inevitably timeout, since no checker would get
614
 
        # a chance to run to completion.  If we instead leave running
 
685
        # did that, and if a checker (for some reason) started running
 
686
        # slowly and taking more than 'interval' time, then the client
 
687
        # would inevitably timeout, since no checker would get a
 
688
        # chance to run to completion.  If we instead leave running
615
689
        # checkers alone, the checker would have to take more time
616
690
        # than 'timeout' for the client to be disabled, which is as it
617
691
        # should be.
619
693
        # If a checker exists, make sure it is not a zombie
620
694
        try:
621
695
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
622
 
        except (AttributeError, OSError) as error:
623
 
            if (isinstance(error, OSError)
624
 
                and error.errno != errno.ECHILD):
625
 
                raise error
 
696
        except AttributeError:
 
697
            pass
 
698
        except OSError as error:
 
699
            if error.errno != errno.ECHILD:
 
700
                raise
626
701
        else:
627
702
            if pid:
628
703
                logger.warning("Checker was a zombie")
631
706
                                      self.current_checker_command)
632
707
        # Start a new checker if needed
633
708
        if self.checker is None:
 
709
            # Escape attributes for the shell
 
710
            escaped_attrs = dict(
 
711
                (attr, re.escape(unicode(getattr(self, attr))))
 
712
                for attr in
 
713
                self.runtime_expansions)
634
714
            try:
635
 
                # In case checker_command has exactly one % operator
636
 
                command = self.checker_command % self.host
637
 
            except TypeError:
638
 
                # Escape attributes for the shell
639
 
                escaped_attrs = dict(
640
 
                    (attr,
641
 
                     re.escape(unicode(str(getattr(self, attr, "")),
642
 
                                       errors=
643
 
                                       'replace')))
644
 
                    for attr in
645
 
                    self.runtime_expansions)
646
 
                
647
 
                try:
648
 
                    command = self.checker_command % escaped_attrs
649
 
                except TypeError as error:
650
 
                    logger.error('Could not format string "%s":'
651
 
                                 ' %s', self.checker_command, error)
652
 
                    return True # Try again later
 
715
                command = self.checker_command % escaped_attrs
 
716
            except TypeError as error:
 
717
                logger.error('Could not format string "%s"',
 
718
                             self.checker_command, exc_info=error)
 
719
                return True # Try again later
653
720
            self.current_checker_command = command
654
721
            try:
655
722
                logger.info("Starting checker %r for %s",
658
725
                # in normal mode, that is already done by daemon(),
659
726
                # and in debug mode we don't want to.  (Stdin is
660
727
                # always replaced by /dev/null.)
 
728
                # The exception is when not debugging but nevertheless
 
729
                # running in the foreground; use the previously
 
730
                # created wnull.
 
731
                popen_args = {}
 
732
                if (not self.server_settings["debug"]
 
733
                    and self.server_settings["foreground"]):
 
734
                    popen_args.update({"stdout": wnull,
 
735
                                       "stderr": wnull })
661
736
                self.checker = subprocess.Popen(command,
662
737
                                                close_fds=True,
663
 
                                                shell=True, cwd="/")
664
 
                self.checker_callback_tag = (gobject.child_watch_add
665
 
                                             (self.checker.pid,
666
 
                                              self.checker_callback,
667
 
                                              data=command))
668
 
                # The checker may have completed before the gobject
669
 
                # watch was added.  Check for this.
 
738
                                                shell=True, cwd="/",
 
739
                                                **popen_args)
 
740
            except OSError as error:
 
741
                logger.error("Failed to start subprocess",
 
742
                             exc_info=error)
 
743
                return True
 
744
            self.checker_callback_tag = (gobject.child_watch_add
 
745
                                         (self.checker.pid,
 
746
                                          self.checker_callback,
 
747
                                          data=command))
 
748
            # The checker may have completed before the gobject
 
749
            # watch was added.  Check for this.
 
750
            try:
670
751
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
 
                if pid:
672
 
                    gobject.source_remove(self.checker_callback_tag)
673
 
                    self.checker_callback(pid, status, command)
674
752
            except OSError as error:
675
 
                logger.error("Failed to start subprocess: %s",
676
 
                             error)
 
753
                if error.errno == errno.ECHILD:
 
754
                    # This should never happen
 
755
                    logger.error("Child process vanished",
 
756
                                 exc_info=error)
 
757
                    return True
 
758
                raise
 
759
            if pid:
 
760
                gobject.source_remove(self.checker_callback_tag)
 
761
                self.checker_callback(pid, status, command)
677
762
        # Re-run this periodically if run by gobject.timeout_add
678
763
        return True
679
764
    
686
771
            return
687
772
        logger.debug("Stopping checker for %(name)s", vars(self))
688
773
        try:
689
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
774
            self.checker.terminate()
690
775
            #time.sleep(0.5)
691
776
            #if self.checker.poll() is None:
692
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
777
            #    self.checker.kill()
693
778
        except OSError as error:
694
779
            if error.errno != errno.ESRCH: # No such process
695
780
                raise
712
797
    # "Set" method, so we fail early here:
713
798
    if byte_arrays and signature != "ay":
714
799
        raise ValueError("Byte arrays not supported for non-'ay'"
715
 
                         " signature %r" % signature)
 
800
                         " signature {0!r}".format(signature))
716
801
    def decorator(func):
717
802
        func._dbus_is_property = True
718
803
        func._dbus_interface = dbus_interface
726
811
    return decorator
727
812
 
728
813
 
 
814
def dbus_interface_annotations(dbus_interface):
 
815
    """Decorator for marking functions returning interface annotations
 
816
    
 
817
    Usage:
 
818
    
 
819
    @dbus_interface_annotations("org.example.Interface")
 
820
    def _foo(self):  # Function name does not matter
 
821
        return {"org.freedesktop.DBus.Deprecated": "true",
 
822
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
823
                    "false"}
 
824
    """
 
825
    def decorator(func):
 
826
        func._dbus_is_interface = True
 
827
        func._dbus_interface = dbus_interface
 
828
        func._dbus_name = dbus_interface
 
829
        return func
 
830
    return decorator
 
831
 
 
832
 
 
833
def dbus_annotations(annotations):
 
834
    """Decorator to annotate D-Bus methods, signals or properties
 
835
    Usage:
 
836
    
 
837
    @dbus_service_property("org.example.Interface", signature="b",
 
838
                           access="r")
 
839
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
840
                        "org.freedesktop.DBus.Property."
 
841
                        "EmitsChangedSignal": "false"})
 
842
    def Property_dbus_property(self):
 
843
        return dbus.Boolean(False)
 
844
    """
 
845
    def decorator(func):
 
846
        func._dbus_annotations = annotations
 
847
        return func
 
848
    return decorator
 
849
 
 
850
 
729
851
class DBusPropertyException(dbus.exceptions.DBusException):
730
852
    """A base class for D-Bus property-related exceptions
731
853
    """
754
876
    """
755
877
    
756
878
    @staticmethod
757
 
    def _is_dbus_property(obj):
758
 
        return getattr(obj, "_dbus_is_property", False)
 
879
    def _is_dbus_thing(thing):
 
880
        """Returns a function testing if an attribute is a D-Bus thing
 
881
        
 
882
        If called like _is_dbus_thing("method") it returns a function
 
883
        suitable for use as predicate to inspect.getmembers().
 
884
        """
 
885
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
886
                                   False)
759
887
    
760
 
    def _get_all_dbus_properties(self):
 
888
    def _get_all_dbus_things(self, thing):
761
889
        """Returns a generator of (name, attribute) pairs
762
890
        """
763
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
891
        return ((getattr(athing.__get__(self), "_dbus_name",
 
892
                         name),
 
893
                 athing.__get__(self))
764
894
                for cls in self.__class__.__mro__
765
 
                for name, prop in
766
 
                inspect.getmembers(cls, self._is_dbus_property))
 
895
                for name, athing in
 
896
                inspect.getmembers(cls,
 
897
                                   self._is_dbus_thing(thing)))
767
898
    
768
899
    def _get_dbus_property(self, interface_name, property_name):
769
900
        """Returns a bound method if one exists which is a D-Bus
771
902
        """
772
903
        for cls in  self.__class__.__mro__:
773
904
            for name, value in (inspect.getmembers
774
 
                                (cls, self._is_dbus_property)):
 
905
                                (cls,
 
906
                                 self._is_dbus_thing("property"))):
775
907
                if (value._dbus_name == property_name
776
908
                    and value._dbus_interface == interface_name):
777
909
                    return value.__get__(self)
805
937
            # The byte_arrays option is not supported yet on
806
938
            # signatures other than "ay".
807
939
            if prop._dbus_signature != "ay":
808
 
                raise ValueError
809
 
            value = dbus.ByteArray(''.join(unichr(byte)
810
 
                                           for byte in value))
 
940
                raise ValueError("Byte arrays not supported for non-"
 
941
                                 "'ay' signature {0!r}"
 
942
                                 .format(prop._dbus_signature))
 
943
            value = dbus.ByteArray(b''.join(chr(byte)
 
944
                                            for byte in value))
811
945
        prop(value)
812
946
    
813
947
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
819
953
        Note: Will not include properties with access="write".
820
954
        """
821
955
        properties = {}
822
 
        for name, prop in self._get_all_dbus_properties():
 
956
        for name, prop in self._get_all_dbus_things("property"):
823
957
            if (interface_name
824
958
                and interface_name != prop._dbus_interface):
825
959
                # Interface non-empty but did not match
840
974
                         path_keyword='object_path',
841
975
                         connection_keyword='connection')
842
976
    def Introspect(self, object_path, connection):
843
 
        """Standard D-Bus method, overloaded to insert property tags.
 
977
        """Overloading of standard D-Bus method.
 
978
        
 
979
        Inserts property tags and interface annotation tags.
844
980
        """
845
981
        xmlstring = dbus.service.Object.Introspect(self, object_path,
846
982
                                                   connection)
853
989
                e.setAttribute("access", prop._dbus_access)
854
990
                return e
855
991
            for if_tag in document.getElementsByTagName("interface"):
 
992
                # Add property tags
856
993
                for tag in (make_tag(document, name, prop)
857
994
                            for name, prop
858
 
                            in self._get_all_dbus_properties()
 
995
                            in self._get_all_dbus_things("property")
859
996
                            if prop._dbus_interface
860
997
                            == if_tag.getAttribute("name")):
861
998
                    if_tag.appendChild(tag)
 
999
                # Add annotation tags
 
1000
                for typ in ("method", "signal", "property"):
 
1001
                    for tag in if_tag.getElementsByTagName(typ):
 
1002
                        annots = dict()
 
1003
                        for name, prop in (self.
 
1004
                                           _get_all_dbus_things(typ)):
 
1005
                            if (name == tag.getAttribute("name")
 
1006
                                and prop._dbus_interface
 
1007
                                == if_tag.getAttribute("name")):
 
1008
                                annots.update(getattr
 
1009
                                              (prop,
 
1010
                                               "_dbus_annotations",
 
1011
                                               {}))
 
1012
                        for name, value in annots.iteritems():
 
1013
                            ann_tag = document.createElement(
 
1014
                                "annotation")
 
1015
                            ann_tag.setAttribute("name", name)
 
1016
                            ann_tag.setAttribute("value", value)
 
1017
                            tag.appendChild(ann_tag)
 
1018
                # Add interface annotation tags
 
1019
                for annotation, value in dict(
 
1020
                    itertools.chain.from_iterable(
 
1021
                        annotations().iteritems()
 
1022
                        for name, annotations in
 
1023
                        self._get_all_dbus_things("interface")
 
1024
                        if name == if_tag.getAttribute("name")
 
1025
                        )).iteritems():
 
1026
                    ann_tag = document.createElement("annotation")
 
1027
                    ann_tag.setAttribute("name", annotation)
 
1028
                    ann_tag.setAttribute("value", value)
 
1029
                    if_tag.appendChild(ann_tag)
862
1030
                # Add the names to the return values for the
863
1031
                # "org.freedesktop.DBus.Properties" methods
864
1032
                if (if_tag.getAttribute("name")
879
1047
        except (AttributeError, xml.dom.DOMException,
880
1048
                xml.parsers.expat.ExpatError) as error:
881
1049
            logger.error("Failed to override Introspection method",
882
 
                         error)
 
1050
                         exc_info=error)
883
1051
        return xmlstring
884
1052
 
885
1053
 
886
 
def datetime_to_dbus (dt, variant_level=0):
 
1054
def datetime_to_dbus(dt, variant_level=0):
887
1055
    """Convert a UTC datetime.datetime() to a D-Bus type."""
888
1056
    if dt is None:
889
1057
        return dbus.String("", variant_level = variant_level)
891
1059
                       variant_level=variant_level)
892
1060
 
893
1061
 
894
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
895
 
                                  .__metaclass__):
896
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
897
 
    will add additional D-Bus attributes matching a certain pattern.
 
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1063
    """A class decorator; applied to a subclass of
 
1064
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1065
    interface names according to the "alt_interface_names" mapping.
 
1066
    Usage:
 
1067
    
 
1068
    @alternate_dbus_interfaces({"org.example.Interface":
 
1069
                                    "net.example.AlternateInterface"})
 
1070
    class SampleDBusObject(dbus.service.Object):
 
1071
        @dbus.service.method("org.example.Interface")
 
1072
        def SampleDBusMethod():
 
1073
            pass
 
1074
    
 
1075
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1076
    reachable via two interfaces: "org.example.Interface" and
 
1077
    "net.example.AlternateInterface", the latter of which will have
 
1078
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1079
    "true", unless "deprecate" is passed with a False value.
 
1080
    
 
1081
    This works for methods and signals, and also for D-Bus properties
 
1082
    (from DBusObjectWithProperties) and interfaces (from the
 
1083
    dbus_interface_annotations decorator).
898
1084
    """
899
 
    def __new__(mcs, name, bases, attr):
900
 
        # Go through all the base classes which could have D-Bus
901
 
        # methods, signals, or properties in them
902
 
        for base in (b for b in bases
903
 
                     if issubclass(b, dbus.service.Object)):
904
 
            # Go though all attributes of the base class
905
 
            for attrname, attribute in inspect.getmembers(base):
 
1085
    def wrapper(cls):
 
1086
        for orig_interface_name, alt_interface_name in (
 
1087
            alt_interface_names.iteritems()):
 
1088
            attr = {}
 
1089
            interface_names = set()
 
1090
            # Go though all attributes of the class
 
1091
            for attrname, attribute in inspect.getmembers(cls):
906
1092
                # Ignore non-D-Bus attributes, and D-Bus attributes
907
1093
                # with the wrong interface name
908
1094
                if (not hasattr(attribute, "_dbus_interface")
909
1095
                    or not attribute._dbus_interface
910
 
                    .startswith("se.recompile.Mandos")):
 
1096
                    .startswith(orig_interface_name)):
911
1097
                    continue
912
1098
                # Create an alternate D-Bus interface name based on
913
1099
                # the current name
914
1100
                alt_interface = (attribute._dbus_interface
915
 
                                 .replace("se.recompile.Mandos",
916
 
                                          "se.bsnet.fukt.Mandos"))
 
1101
                                 .replace(orig_interface_name,
 
1102
                                          alt_interface_name))
 
1103
                interface_names.add(alt_interface)
917
1104
                # Is this a D-Bus signal?
918
1105
                if getattr(attribute, "_dbus_is_signal", False):
919
 
                    # Extract the original non-method function by
920
 
                    # black magic
 
1106
                    # Extract the original non-method undecorated
 
1107
                    # function by black magic
921
1108
                    nonmethod_func = (dict(
922
1109
                            zip(attribute.func_code.co_freevars,
923
1110
                                attribute.__closure__))["func"]
934
1121
                                nonmethod_func.func_name,
935
1122
                                nonmethod_func.func_defaults,
936
1123
                                nonmethod_func.func_closure)))
 
1124
                    # Copy annotations, if any
 
1125
                    try:
 
1126
                        new_function._dbus_annotations = (
 
1127
                            dict(attribute._dbus_annotations))
 
1128
                    except AttributeError:
 
1129
                        pass
937
1130
                    # Define a creator of a function to call both the
938
 
                    # old and new functions, so both the old and new
939
 
                    # signals gets sent when the function is called
 
1131
                    # original and alternate functions, so both the
 
1132
                    # original and alternate signals gets sent when
 
1133
                    # the function is called
940
1134
                    def fixscope(func1, func2):
941
1135
                        """This function is a scope container to pass
942
1136
                        func1 and func2 to the "call_both" function
949
1143
                        return call_both
950
1144
                    # Create the "call_both" function and add it to
951
1145
                    # the class
952
 
                    attr[attrname] = fixscope(attribute,
953
 
                                              new_function)
 
1146
                    attr[attrname] = fixscope(attribute, new_function)
954
1147
                # Is this a D-Bus method?
955
1148
                elif getattr(attribute, "_dbus_is_method", False):
956
1149
                    # Create a new, but exactly alike, function
967
1160
                                        attribute.func_name,
968
1161
                                        attribute.func_defaults,
969
1162
                                        attribute.func_closure)))
 
1163
                    # Copy annotations, if any
 
1164
                    try:
 
1165
                        attr[attrname]._dbus_annotations = (
 
1166
                            dict(attribute._dbus_annotations))
 
1167
                    except AttributeError:
 
1168
                        pass
970
1169
                # Is this a D-Bus property?
971
1170
                elif getattr(attribute, "_dbus_is_property", False):
972
1171
                    # Create a new, but exactly alike, function
986
1185
                                        attribute.func_name,
987
1186
                                        attribute.func_defaults,
988
1187
                                        attribute.func_closure)))
989
 
        return type.__new__(mcs, name, bases, attr)
990
 
 
991
 
 
 
1188
                    # Copy annotations, if any
 
1189
                    try:
 
1190
                        attr[attrname]._dbus_annotations = (
 
1191
                            dict(attribute._dbus_annotations))
 
1192
                    except AttributeError:
 
1193
                        pass
 
1194
                # Is this a D-Bus interface?
 
1195
                elif getattr(attribute, "_dbus_is_interface", False):
 
1196
                    # Create a new, but exactly alike, function
 
1197
                    # object.  Decorate it to be a new D-Bus interface
 
1198
                    # with the alternate D-Bus interface name.  Add it
 
1199
                    # to the class.
 
1200
                    attr[attrname] = (dbus_interface_annotations
 
1201
                                      (alt_interface)
 
1202
                                      (types.FunctionType
 
1203
                                       (attribute.func_code,
 
1204
                                        attribute.func_globals,
 
1205
                                        attribute.func_name,
 
1206
                                        attribute.func_defaults,
 
1207
                                        attribute.func_closure)))
 
1208
            if deprecate:
 
1209
                # Deprecate all alternate interfaces
 
1210
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1211
                for interface_name in interface_names:
 
1212
                    @dbus_interface_annotations(interface_name)
 
1213
                    def func(self):
 
1214
                        return { "org.freedesktop.DBus.Deprecated":
 
1215
                                     "true" }
 
1216
                    # Find an unused name
 
1217
                    for aname in (iname.format(i)
 
1218
                                  for i in itertools.count()):
 
1219
                        if aname not in attr:
 
1220
                            attr[aname] = func
 
1221
                            break
 
1222
            if interface_names:
 
1223
                # Replace the class with a new subclass of it with
 
1224
                # methods, signals, etc. as created above.
 
1225
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1226
                           (cls,), attr)
 
1227
        return cls
 
1228
    return wrapper
 
1229
 
 
1230
 
 
1231
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1232
                                "se.bsnet.fukt.Mandos"})
992
1233
class ClientDBus(Client, DBusObjectWithProperties):
993
1234
    """A Client class using D-Bus
994
1235
    
1005
1246
    def __init__(self, bus = None, *args, **kwargs):
1006
1247
        self.bus = bus
1007
1248
        Client.__init__(self, *args, **kwargs)
1008
 
        
1009
 
        self._approvals_pending = 0
1010
1249
        # Only now, when this client is initialized, can it show up on
1011
1250
        # the D-Bus
1012
1251
        client_object_name = unicode(self.name).translate(
1016
1255
                                 ("/clients/" + client_object_name))
1017
1256
        DBusObjectWithProperties.__init__(self, self.bus,
1018
1257
                                          self.dbus_object_path)
1019
 
        
 
1258
    
1020
1259
    def notifychangeproperty(transform_func,
1021
1260
                             dbus_name, type_func=lambda x: x,
1022
1261
                             variant_level=1):
1045
1284
        
1046
1285
        return property(lambda self: getattr(self, attrname), setter)
1047
1286
    
1048
 
    
1049
1287
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1050
1288
    approvals_pending = notifychangeproperty(dbus.Boolean,
1051
1289
                                             "ApprovalPending",
1058
1296
                                       checker is not None)
1059
1297
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1060
1298
                                           "LastCheckedOK")
 
1299
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1300
                                               "LastCheckerStatus")
1061
1301
    last_approval_request = notifychangeproperty(
1062
1302
        datetime_to_dbus, "LastApprovalRequest")
1063
1303
    approved_by_default = notifychangeproperty(dbus.Boolean,
1064
1304
                                               "ApprovedByDefault")
1065
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1305
    approval_delay = notifychangeproperty(dbus.UInt64,
1066
1306
                                          "ApprovalDelay",
1067
1307
                                          type_func =
1068
 
                                          _timedelta_to_milliseconds)
 
1308
                                          timedelta_to_milliseconds)
1069
1309
    approval_duration = notifychangeproperty(
1070
 
        dbus.UInt16, "ApprovalDuration",
1071
 
        type_func = _timedelta_to_milliseconds)
 
1310
        dbus.UInt64, "ApprovalDuration",
 
1311
        type_func = timedelta_to_milliseconds)
1072
1312
    host = notifychangeproperty(dbus.String, "Host")
1073
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1313
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1074
1314
                                   type_func =
1075
 
                                   _timedelta_to_milliseconds)
 
1315
                                   timedelta_to_milliseconds)
1076
1316
    extended_timeout = notifychangeproperty(
1077
 
        dbus.UInt16, "ExtendedTimeout",
1078
 
        type_func = _timedelta_to_milliseconds)
1079
 
    interval = notifychangeproperty(dbus.UInt16,
 
1317
        dbus.UInt64, "ExtendedTimeout",
 
1318
        type_func = timedelta_to_milliseconds)
 
1319
    interval = notifychangeproperty(dbus.UInt64,
1080
1320
                                    "Interval",
1081
1321
                                    type_func =
1082
 
                                    _timedelta_to_milliseconds)
 
1322
                                    timedelta_to_milliseconds)
1083
1323
    checker_command = notifychangeproperty(dbus.String, "Checker")
1084
1324
    
1085
1325
    del notifychangeproperty
1113
1353
                                       *args, **kwargs)
1114
1354
    
1115
1355
    def start_checker(self, *args, **kwargs):
1116
 
        old_checker = self.checker
1117
 
        if self.checker is not None:
1118
 
            old_checker_pid = self.checker.pid
1119
 
        else:
1120
 
            old_checker_pid = None
 
1356
        old_checker_pid = getattr(self.checker, "pid", None)
1121
1357
        r = Client.start_checker(self, *args, **kwargs)
1122
1358
        # Only if new checker process was started
1123
1359
        if (self.checker is not None
1127
1363
        return r
1128
1364
    
1129
1365
    def _reset_approved(self):
1130
 
        self._approved = None
 
1366
        self.approved = None
1131
1367
        return False
1132
1368
    
1133
1369
    def approve(self, value=True):
1134
 
        self.send_changedstate()
1135
 
        self._approved = value
1136
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1370
        self.approved = value
 
1371
        gobject.timeout_add(timedelta_to_milliseconds
1137
1372
                            (self.approval_duration),
1138
1373
                            self._reset_approved)
1139
 
    
 
1374
        self.send_changedstate()
1140
1375
    
1141
1376
    ## D-Bus methods, signals & properties
1142
1377
    _interface = "se.recompile.Mandos.Client"
1143
1378
    
 
1379
    ## Interfaces
 
1380
    
 
1381
    @dbus_interface_annotations(_interface)
 
1382
    def _foo(self):
 
1383
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1384
                     "false"}
 
1385
    
1144
1386
    ## Signals
1145
1387
    
1146
1388
    # CheckerCompleted - signal
1182
1424
        "D-Bus signal"
1183
1425
        return self.need_approval()
1184
1426
    
1185
 
    # NeRwequest - signal
1186
 
    @dbus.service.signal(_interface, signature="s")
1187
 
    def NewRequest(self, ip):
1188
 
        """D-Bus signal
1189
 
        Is sent after a client request a password.
1190
 
        """
1191
 
        pass
1192
 
    
1193
1427
    ## Methods
1194
1428
    
1195
1429
    # Approve - method
1253
1487
                           access="readwrite")
1254
1488
    def ApprovalDuration_dbus_property(self, value=None):
1255
1489
        if value is None:       # get
1256
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1490
            return dbus.UInt64(timedelta_to_milliseconds(
1257
1491
                    self.approval_duration))
1258
1492
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1259
1493
    
1273
1507
    def Host_dbus_property(self, value=None):
1274
1508
        if value is None:       # get
1275
1509
            return dbus.String(self.host)
1276
 
        self.host = value
 
1510
        self.host = unicode(value)
1277
1511
    
1278
1512
    # Created - property
1279
1513
    @dbus_service_property(_interface, signature="s", access="read")
1280
1514
    def Created_dbus_property(self):
1281
 
        return dbus.String(datetime_to_dbus(self.created))
 
1515
        return datetime_to_dbus(self.created)
1282
1516
    
1283
1517
    # LastEnabled - property
1284
1518
    @dbus_service_property(_interface, signature="s", access="read")
1305
1539
            return
1306
1540
        return datetime_to_dbus(self.last_checked_ok)
1307
1541
    
 
1542
    # LastCheckerStatus - property
 
1543
    @dbus_service_property(_interface, signature="n",
 
1544
                           access="read")
 
1545
    def LastCheckerStatus_dbus_property(self):
 
1546
        return dbus.Int16(self.last_checker_status)
 
1547
    
1308
1548
    # Expires - property
1309
1549
    @dbus_service_property(_interface, signature="s", access="read")
1310
1550
    def Expires_dbus_property(self):
1321
1561
    def Timeout_dbus_property(self, value=None):
1322
1562
        if value is None:       # get
1323
1563
            return dbus.UInt64(self.timeout_milliseconds())
 
1564
        old_timeout = self.timeout
1324
1565
        self.timeout = datetime.timedelta(0, 0, 0, value)
1325
 
        if getattr(self, "disable_initiator_tag", None) is None:
1326
 
            return
1327
 
        # Reschedule timeout
1328
 
        gobject.source_remove(self.disable_initiator_tag)
1329
 
        self.disable_initiator_tag = None
1330
 
        self.expires = None
1331
 
        time_to_die = _timedelta_to_milliseconds((self
1332
 
                                                  .last_checked_ok
1333
 
                                                  + self.timeout)
1334
 
                                                 - datetime.datetime
1335
 
                                                 .utcnow())
1336
 
        if time_to_die <= 0:
1337
 
            # The timeout has passed
1338
 
            self.disable()
1339
 
        else:
1340
 
            self.expires = (datetime.datetime.utcnow()
1341
 
                            + datetime.timedelta(milliseconds =
1342
 
                                                 time_to_die))
1343
 
            self.disable_initiator_tag = (gobject.timeout_add
1344
 
                                          (time_to_die, self.disable))
 
1566
        # Reschedule disabling
 
1567
        if self.enabled:
 
1568
            now = datetime.datetime.utcnow()
 
1569
            self.expires += self.timeout - old_timeout
 
1570
            if self.expires <= now:
 
1571
                # The timeout has passed
 
1572
                self.disable()
 
1573
            else:
 
1574
                if (getattr(self, "disable_initiator_tag", None)
 
1575
                    is None):
 
1576
                    return
 
1577
                gobject.source_remove(self.disable_initiator_tag)
 
1578
                self.disable_initiator_tag = (
 
1579
                    gobject.timeout_add(
 
1580
                        timedelta_to_milliseconds(self.expires - now),
 
1581
                        self.disable))
1345
1582
    
1346
1583
    # ExtendedTimeout - property
1347
1584
    @dbus_service_property(_interface, signature="t",
1360
1597
        self.interval = datetime.timedelta(0, 0, 0, value)
1361
1598
        if getattr(self, "checker_initiator_tag", None) is None:
1362
1599
            return
1363
 
        # Reschedule checker run
1364
 
        gobject.source_remove(self.checker_initiator_tag)
1365
 
        self.checker_initiator_tag = (gobject.timeout_add
1366
 
                                      (value, self.start_checker))
1367
 
        self.start_checker()    # Start one now, too
 
1600
        if self.enabled:
 
1601
            # Reschedule checker run
 
1602
            gobject.source_remove(self.checker_initiator_tag)
 
1603
            self.checker_initiator_tag = (gobject.timeout_add
 
1604
                                          (value, self.start_checker))
 
1605
            self.start_checker()    # Start one now, too
1368
1606
    
1369
1607
    # Checker - property
1370
1608
    @dbus_service_property(_interface, signature="s",
1372
1610
    def Checker_dbus_property(self, value=None):
1373
1611
        if value is None:       # get
1374
1612
            return dbus.String(self.checker_command)
1375
 
        self.checker_command = value
 
1613
        self.checker_command = unicode(value)
1376
1614
    
1377
1615
    # CheckerRunning - property
1378
1616
    @dbus_service_property(_interface, signature="b",
1407
1645
            raise KeyError()
1408
1646
    
1409
1647
    def __getattribute__(self, name):
1410
 
        if(name == '_pipe'):
 
1648
        if name == '_pipe':
1411
1649
            return super(ProxyClient, self).__getattribute__(name)
1412
1650
        self._pipe.send(('getattr', name))
1413
1651
        data = self._pipe.recv()
1420
1658
            return func
1421
1659
    
1422
1660
    def __setattr__(self, name, value):
1423
 
        if(name == '_pipe'):
 
1661
        if name == '_pipe':
1424
1662
            return super(ProxyClient, self).__setattr__(name, value)
1425
1663
        self._pipe.send(('setattr', name, value))
1426
1664
 
1427
1665
 
1428
 
class ClientDBusTransitional(ClientDBus):
1429
 
    __metaclass__ = AlternateDBusNamesMetaclass
1430
 
 
1431
 
 
1432
1666
class ClientHandler(socketserver.BaseRequestHandler, object):
1433
1667
    """A class to handle client connections.
1434
1668
    
1470
1704
            logger.debug("Protocol version: %r", line)
1471
1705
            try:
1472
1706
                if int(line.strip().split()[0]) > 1:
1473
 
                    raise RuntimeError
 
1707
                    raise RuntimeError(line)
1474
1708
            except (ValueError, IndexError, RuntimeError) as error:
1475
1709
                logger.error("Unknown protocol version: %s", error)
1476
1710
                return
1495
1729
                    logger.warning("Bad certificate: %s", error)
1496
1730
                    return
1497
1731
                logger.debug("Fingerprint: %s", fpr)
1498
 
                if self.server.use_dbus:
1499
 
                    # Emit D-Bus signal
1500
 
                    client.NewRequest(str(self.client_address))
1501
1732
                
1502
1733
                try:
1503
1734
                    client = ProxyClient(child_pipe, fpr,
1519
1750
                            client.Rejected("Disabled")
1520
1751
                        return
1521
1752
                    
1522
 
                    if client._approved or not client.approval_delay:
 
1753
                    if client.approved or not client.approval_delay:
1523
1754
                        #We are approved or approval is disabled
1524
1755
                        break
1525
 
                    elif client._approved is None:
 
1756
                    elif client.approved is None:
1526
1757
                        logger.info("Client %s needs approval",
1527
1758
                                    client.name)
1528
1759
                        if self.server.use_dbus:
1541
1772
                    #wait until timeout or approved
1542
1773
                    time = datetime.datetime.now()
1543
1774
                    client.changedstate.acquire()
1544
 
                    (client.changedstate.wait
1545
 
                     (float(client._timedelta_to_milliseconds(delay)
1546
 
                            / 1000)))
 
1775
                    client.changedstate.wait(
 
1776
                        float(timedelta_to_milliseconds(delay)
 
1777
                              / 1000))
1547
1778
                    client.changedstate.release()
1548
1779
                    time2 = datetime.datetime.now()
1549
1780
                    if (time2 - time) >= delay:
1565
1796
                    try:
1566
1797
                        sent = session.send(client.secret[sent_size:])
1567
1798
                    except gnutls.errors.GNUTLSError as error:
1568
 
                        logger.warning("gnutls send failed")
 
1799
                        logger.warning("gnutls send failed",
 
1800
                                       exc_info=error)
1569
1801
                        return
1570
1802
                    logger.debug("Sent: %d, remaining: %d",
1571
1803
                                 sent, len(client.secret)
1574
1806
                
1575
1807
                logger.info("Sending secret to %s", client.name)
1576
1808
                # bump the timeout using extended_timeout
1577
 
                client.checked_ok(client.extended_timeout)
 
1809
                client.bump_timeout(client.extended_timeout)
1578
1810
                if self.server.use_dbus:
1579
1811
                    # Emit D-Bus signal
1580
1812
                    client.GotSecret()
1585
1817
                try:
1586
1818
                    session.bye()
1587
1819
                except gnutls.errors.GNUTLSError as error:
1588
 
                    logger.warning("GnuTLS bye failed")
 
1820
                    logger.warning("GnuTLS bye failed",
 
1821
                                   exc_info=error)
1589
1822
    
1590
1823
    @staticmethod
1591
1824
    def peer_certificate(session):
1656
1889
    def sub_process_main(self, request, address):
1657
1890
        try:
1658
1891
            self.finish_request(request, address)
1659
 
        except:
 
1892
        except Exception:
1660
1893
            self.handle_error(request, address)
1661
1894
        self.close_request(request)
1662
1895
    
1663
1896
    def process_request(self, request, address):
1664
1897
        """Start a new process to process the request."""
1665
1898
        proc = multiprocessing.Process(target = self.sub_process_main,
1666
 
                                       args = (request,
1667
 
                                               address))
 
1899
                                       args = (request, address))
1668
1900
        proc.start()
1669
1901
        return proc
1670
1902
 
1685
1917
    
1686
1918
    def add_pipe(self, parent_pipe, proc):
1687
1919
        """Dummy function; override as necessary"""
1688
 
        raise NotImplementedError
 
1920
        raise NotImplementedError()
1689
1921
 
1690
1922
 
1691
1923
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1698
1930
        use_ipv6:       Boolean; to use IPv6 or not
1699
1931
    """
1700
1932
    def __init__(self, server_address, RequestHandlerClass,
1701
 
                 interface=None, use_ipv6=True):
 
1933
                 interface=None, use_ipv6=True, socketfd=None):
 
1934
        """If socketfd is set, use that file descriptor instead of
 
1935
        creating a new one with socket.socket().
 
1936
        """
1702
1937
        self.interface = interface
1703
1938
        if use_ipv6:
1704
1939
            self.address_family = socket.AF_INET6
 
1940
        if socketfd is not None:
 
1941
            # Save the file descriptor
 
1942
            self.socketfd = socketfd
 
1943
            # Save the original socket.socket() function
 
1944
            self.socket_socket = socket.socket
 
1945
            # To implement --socket, we monkey patch socket.socket.
 
1946
            # 
 
1947
            # (When socketserver.TCPServer is a new-style class, we
 
1948
            # could make self.socket into a property instead of monkey
 
1949
            # patching socket.socket.)
 
1950
            # 
 
1951
            # Create a one-time-only replacement for socket.socket()
 
1952
            @functools.wraps(socket.socket)
 
1953
            def socket_wrapper(*args, **kwargs):
 
1954
                # Restore original function so subsequent calls are
 
1955
                # not affected.
 
1956
                socket.socket = self.socket_socket
 
1957
                del self.socket_socket
 
1958
                # This time only, return a new socket object from the
 
1959
                # saved file descriptor.
 
1960
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1961
            # Replace socket.socket() function with wrapper
 
1962
            socket.socket = socket_wrapper
 
1963
        # The socketserver.TCPServer.__init__ will call
 
1964
        # socket.socket(), which might be our replacement,
 
1965
        # socket_wrapper(), if socketfd was set.
1705
1966
        socketserver.TCPServer.__init__(self, server_address,
1706
1967
                                        RequestHandlerClass)
 
1968
    
1707
1969
    def server_bind(self):
1708
1970
        """This overrides the normal server_bind() function
1709
1971
        to bind to an interface if one was specified, and also NOT to
1717
1979
                try:
1718
1980
                    self.socket.setsockopt(socket.SOL_SOCKET,
1719
1981
                                           SO_BINDTODEVICE,
1720
 
                                           str(self.interface
1721
 
                                               + '\0'))
 
1982
                                           str(self.interface + '\0'))
1722
1983
                except socket.error as error:
1723
 
                    if error[0] == errno.EPERM:
1724
 
                        logger.error("No permission to"
1725
 
                                     " bind to interface %s",
1726
 
                                     self.interface)
1727
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1984
                    if error.errno == errno.EPERM:
 
1985
                        logger.error("No permission to bind to"
 
1986
                                     " interface %s", self.interface)
 
1987
                    elif error.errno == errno.ENOPROTOOPT:
1728
1988
                        logger.error("SO_BINDTODEVICE not available;"
1729
1989
                                     " cannot bind to interface %s",
1730
1990
                                     self.interface)
 
1991
                    elif error.errno == errno.ENODEV:
 
1992
                        logger.error("Interface %s does not exist,"
 
1993
                                     " cannot bind", self.interface)
1731
1994
                    else:
1732
1995
                        raise
1733
1996
        # Only bind(2) the socket if we really need to.
1736
1999
                if self.address_family == socket.AF_INET6:
1737
2000
                    any_address = "::" # in6addr_any
1738
2001
                else:
1739
 
                    any_address = socket.INADDR_ANY
 
2002
                    any_address = "0.0.0.0" # INADDR_ANY
1740
2003
                self.server_address = (any_address,
1741
2004
                                       self.server_address[1])
1742
2005
            elif not self.server_address[1]:
1763
2026
    """
1764
2027
    def __init__(self, server_address, RequestHandlerClass,
1765
2028
                 interface=None, use_ipv6=True, clients=None,
1766
 
                 gnutls_priority=None, use_dbus=True):
 
2029
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1767
2030
        self.enabled = False
1768
2031
        self.clients = clients
1769
2032
        if self.clients is None:
1773
2036
        IPv6_TCPServer.__init__(self, server_address,
1774
2037
                                RequestHandlerClass,
1775
2038
                                interface = interface,
1776
 
                                use_ipv6 = use_ipv6)
 
2039
                                use_ipv6 = use_ipv6,
 
2040
                                socketfd = socketfd)
1777
2041
    def server_activate(self):
1778
2042
        if self.enabled:
1779
2043
            return socketserver.TCPServer.server_activate(self)
1792
2056
    
1793
2057
    def handle_ipc(self, source, condition, parent_pipe=None,
1794
2058
                   proc = None, client_object=None):
1795
 
        condition_names = {
1796
 
            gobject.IO_IN: "IN",   # There is data to read.
1797
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1798
 
                                    # blocking).
1799
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1800
 
            gobject.IO_ERR: "ERR", # Error condition.
1801
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1802
 
                                    # broken, usually for pipes and
1803
 
                                    # sockets).
1804
 
            }
1805
 
        conditions_string = ' | '.join(name
1806
 
                                       for cond, name in
1807
 
                                       condition_names.iteritems()
1808
 
                                       if cond & condition)
1809
2059
        # error, or the other end of multiprocessing.Pipe has closed
1810
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2060
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1811
2061
            # Wait for other process to exit
1812
2062
            proc.join()
1813
2063
            return False
1871
2121
        return True
1872
2122
 
1873
2123
 
 
2124
def rfc3339_duration_to_delta(duration):
 
2125
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2126
    
 
2127
    >>> rfc3339_duration_to_delta("P7D")
 
2128
    datetime.timedelta(7)
 
2129
    >>> rfc3339_duration_to_delta("PT60S")
 
2130
    datetime.timedelta(0, 60)
 
2131
    >>> rfc3339_duration_to_delta("PT60M")
 
2132
    datetime.timedelta(0, 3600)
 
2133
    >>> rfc3339_duration_to_delta("PT24H")
 
2134
    datetime.timedelta(1)
 
2135
    >>> rfc3339_duration_to_delta("P1W")
 
2136
    datetime.timedelta(7)
 
2137
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2138
    datetime.timedelta(0, 330)
 
2139
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2140
    datetime.timedelta(1, 200)
 
2141
    """
 
2142
    
 
2143
    # Parsing an RFC 3339 duration with regular expressions is not
 
2144
    # possible - there would have to be multiple places for the same
 
2145
    # values, like seconds.  The current code, while more esoteric, is
 
2146
    # cleaner without depending on a parsing library.  If Python had a
 
2147
    # built-in library for parsing we would use it, but we'd like to
 
2148
    # avoid excessive use of external libraries.
 
2149
    
 
2150
    # New type for defining tokens, syntax, and semantics all-in-one
 
2151
    Token = collections.namedtuple("Token",
 
2152
                                   ("regexp", # To match token; if
 
2153
                                              # "value" is not None,
 
2154
                                              # must have a "group"
 
2155
                                              # containing digits
 
2156
                                    "value",  # datetime.timedelta or
 
2157
                                              # None
 
2158
                                    "followers")) # Tokens valid after
 
2159
                                                  # this token
 
2160
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2161
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2162
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2163
    token_second = Token(re.compile(r"(\d+)S"),
 
2164
                         datetime.timedelta(seconds=1),
 
2165
                         frozenset((token_end,)))
 
2166
    token_minute = Token(re.compile(r"(\d+)M"),
 
2167
                         datetime.timedelta(minutes=1),
 
2168
                         frozenset((token_second, token_end)))
 
2169
    token_hour = Token(re.compile(r"(\d+)H"),
 
2170
                       datetime.timedelta(hours=1),
 
2171
                       frozenset((token_minute, token_end)))
 
2172
    token_time = Token(re.compile(r"T"),
 
2173
                       None,
 
2174
                       frozenset((token_hour, token_minute,
 
2175
                                  token_second)))
 
2176
    token_day = Token(re.compile(r"(\d+)D"),
 
2177
                      datetime.timedelta(days=1),
 
2178
                      frozenset((token_time, token_end)))
 
2179
    token_month = Token(re.compile(r"(\d+)M"),
 
2180
                        datetime.timedelta(weeks=4),
 
2181
                        frozenset((token_day, token_end)))
 
2182
    token_year = Token(re.compile(r"(\d+)Y"),
 
2183
                       datetime.timedelta(weeks=52),
 
2184
                       frozenset((token_month, token_end)))
 
2185
    token_week = Token(re.compile(r"(\d+)W"),
 
2186
                       datetime.timedelta(weeks=1),
 
2187
                       frozenset((token_end,)))
 
2188
    token_duration = Token(re.compile(r"P"), None,
 
2189
                           frozenset((token_year, token_month,
 
2190
                                      token_day, token_time,
 
2191
                                      token_week))),
 
2192
    # Define starting values
 
2193
    value = datetime.timedelta() # Value so far
 
2194
    found_token = None
 
2195
    followers = frozenset(token_duration,) # Following valid tokens
 
2196
    s = duration                # String left to parse
 
2197
    # Loop until end token is found
 
2198
    while found_token is not token_end:
 
2199
        # Search for any currently valid tokens
 
2200
        for token in followers:
 
2201
            match = token.regexp.match(s)
 
2202
            if match is not None:
 
2203
                # Token found
 
2204
                if token.value is not None:
 
2205
                    # Value found, parse digits
 
2206
                    factor = int(match.group(1), 10)
 
2207
                    # Add to value so far
 
2208
                    value += factor * token.value
 
2209
                # Strip token from string
 
2210
                s = token.regexp.sub("", s, 1)
 
2211
                # Go to found token
 
2212
                found_token = token
 
2213
                # Set valid next tokens
 
2214
                followers = found_token.followers
 
2215
                break
 
2216
        else:
 
2217
            # No currently valid tokens were found
 
2218
            raise ValueError("Invalid RFC 3339 duration")
 
2219
    # End token found
 
2220
    return value
 
2221
 
 
2222
 
1874
2223
def string_to_delta(interval):
1875
2224
    """Parse a string and return a datetime.timedelta
1876
2225
    
1887
2236
    >>> string_to_delta('5m 30s')
1888
2237
    datetime.timedelta(0, 330)
1889
2238
    """
 
2239
    
 
2240
    try:
 
2241
        return rfc3339_duration_to_delta(interval)
 
2242
    except ValueError:
 
2243
        pass
 
2244
    
1890
2245
    timevalue = datetime.timedelta(0)
1891
2246
    for s in interval.split():
1892
2247
        try:
1903
2258
            elif suffix == "w":
1904
2259
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1905
2260
            else:
1906
 
                raise ValueError("Unknown suffix %r" % suffix)
1907
 
        except (ValueError, IndexError) as e:
 
2261
                raise ValueError("Unknown suffix {0!r}"
 
2262
                                 .format(suffix))
 
2263
        except IndexError as e:
1908
2264
            raise ValueError(*(e.args))
1909
2265
        timevalue += delta
1910
2266
    return timevalue
1923
2279
        sys.exit()
1924
2280
    if not noclose:
1925
2281
        # Close all standard open file descriptors
1926
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2282
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1927
2283
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1928
2284
            raise OSError(errno.ENODEV,
1929
 
                          "%s not a character device"
1930
 
                          % os.path.devnull)
 
2285
                          "{0} not a character device"
 
2286
                          .format(os.devnull))
1931
2287
        os.dup2(null, sys.stdin.fileno())
1932
2288
        os.dup2(null, sys.stdout.fileno())
1933
2289
        os.dup2(null, sys.stderr.fileno())
1942
2298
    
1943
2299
    parser = argparse.ArgumentParser()
1944
2300
    parser.add_argument("-v", "--version", action="version",
1945
 
                        version = "%%(prog)s %s" % version,
 
2301
                        version = "%(prog)s {0}".format(version),
1946
2302
                        help="show version number and exit")
1947
2303
    parser.add_argument("-i", "--interface", metavar="IF",
1948
2304
                        help="Bind to interface IF")
1954
2310
                        help="Run self-test")
1955
2311
    parser.add_argument("--debug", action="store_true",
1956
2312
                        help="Debug mode; run in foreground and log"
1957
 
                        " to terminal")
 
2313
                        " to terminal", default=None)
1958
2314
    parser.add_argument("--debuglevel", metavar="LEVEL",
1959
2315
                        help="Debug level for stdout output")
1960
2316
    parser.add_argument("--priority", help="GnuTLS"
1967
2323
                        " files")
1968
2324
    parser.add_argument("--no-dbus", action="store_false",
1969
2325
                        dest="use_dbus", help="Do not provide D-Bus"
1970
 
                        " system bus interface")
 
2326
                        " system bus interface", default=None)
1971
2327
    parser.add_argument("--no-ipv6", action="store_false",
1972
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2328
                        dest="use_ipv6", help="Do not use IPv6",
 
2329
                        default=None)
1973
2330
    parser.add_argument("--no-restore", action="store_false",
1974
2331
                        dest="restore", help="Do not restore stored"
1975
 
                        " state")
 
2332
                        " state", default=None)
 
2333
    parser.add_argument("--socket", type=int,
 
2334
                        help="Specify a file descriptor to a network"
 
2335
                        " socket to use instead of creating one")
1976
2336
    parser.add_argument("--statedir", metavar="DIR",
1977
2337
                        help="Directory to save/restore state in")
 
2338
    parser.add_argument("--foreground", action="store_true",
 
2339
                        help="Run in foreground", default=None)
 
2340
    parser.add_argument("--no-zeroconf", action="store_false",
 
2341
                        dest="zeroconf", help="Do not use Zeroconf",
 
2342
                        default=None)
1978
2343
    
1979
2344
    options = parser.parse_args()
1980
2345
    
1981
2346
    if options.check:
1982
2347
        import doctest
1983
 
        doctest.testmod()
1984
 
        sys.exit()
 
2348
        fail_count, test_count = doctest.testmod()
 
2349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
1985
2350
    
1986
2351
    # Default values for config file for server-global settings
1987
2352
    server_defaults = { "interface": "",
1989
2354
                        "port": "",
1990
2355
                        "debug": "False",
1991
2356
                        "priority":
1992
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2357
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1993
2358
                        "servicename": "Mandos",
1994
2359
                        "use_dbus": "True",
1995
2360
                        "use_ipv6": "True",
1996
2361
                        "debuglevel": "",
1997
2362
                        "restore": "True",
1998
 
                        "statedir": "/var/lib/mandos"
 
2363
                        "socket": "",
 
2364
                        "statedir": "/var/lib/mandos",
 
2365
                        "foreground": "False",
 
2366
                        "zeroconf": "True",
1999
2367
                        }
2000
2368
    
2001
2369
    # Parse config file for server-global settings
2006
2374
    # Convert the SafeConfigParser object to a dict
2007
2375
    server_settings = server_config.defaults()
2008
2376
    # Use the appropriate methods on the non-string config options
2009
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2377
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2010
2378
        server_settings[option] = server_config.getboolean("DEFAULT",
2011
2379
                                                           option)
2012
2380
    if server_settings["port"]:
2013
2381
        server_settings["port"] = server_config.getint("DEFAULT",
2014
2382
                                                       "port")
 
2383
    if server_settings["socket"]:
 
2384
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2385
                                                         "socket")
 
2386
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2387
        # over with an opened os.devnull.  But we don't want this to
 
2388
        # happen with a supplied network socket.
 
2389
        if 0 <= server_settings["socket"] <= 2:
 
2390
            server_settings["socket"] = os.dup(server_settings
 
2391
                                               ["socket"])
2015
2392
    del server_config
2016
2393
    
2017
2394
    # Override the settings from the config file with command line
2019
2396
    for option in ("interface", "address", "port", "debug",
2020
2397
                   "priority", "servicename", "configdir",
2021
2398
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2022
 
                   "statedir"):
 
2399
                   "statedir", "socket", "foreground", "zeroconf"):
2023
2400
        value = getattr(options, option)
2024
2401
        if value is not None:
2025
2402
            server_settings[option] = value
2028
2405
    for option in server_settings.keys():
2029
2406
        if type(server_settings[option]) is str:
2030
2407
            server_settings[option] = unicode(server_settings[option])
 
2408
    # Force all boolean options to be boolean
 
2409
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2410
                   "foreground", "zeroconf"):
 
2411
        server_settings[option] = bool(server_settings[option])
 
2412
    # Debug implies foreground
 
2413
    if server_settings["debug"]:
 
2414
        server_settings["foreground"] = True
2031
2415
    # Now we have our good server settings in "server_settings"
2032
2416
    
2033
2417
    ##################################################################
2034
2418
    
 
2419
    if (not server_settings["zeroconf"] and
 
2420
        not (server_settings["port"]
 
2421
             or server_settings["socket"] != "")):
 
2422
            parser.error("Needs port or socket to work without"
 
2423
                         " Zeroconf")
 
2424
    
2035
2425
    # For convenience
2036
2426
    debug = server_settings["debug"]
2037
2427
    debuglevel = server_settings["debuglevel"]
2039
2429
    use_ipv6 = server_settings["use_ipv6"]
2040
2430
    stored_state_path = os.path.join(server_settings["statedir"],
2041
2431
                                     stored_state_file)
 
2432
    foreground = server_settings["foreground"]
 
2433
    zeroconf = server_settings["zeroconf"]
2042
2434
    
2043
2435
    if debug:
2044
 
        initlogger(logging.DEBUG)
 
2436
        initlogger(debug, logging.DEBUG)
2045
2437
    else:
2046
2438
        if not debuglevel:
2047
 
            initlogger()
 
2439
            initlogger(debug)
2048
2440
        else:
2049
2441
            level = getattr(logging, debuglevel.upper())
2050
 
            initlogger(level)
 
2442
            initlogger(debug, level)
2051
2443
    
2052
2444
    if server_settings["servicename"] != "Mandos":
2053
2445
        syslogger.setFormatter(logging.Formatter
2054
 
                               ('Mandos (%s) [%%(process)d]:'
2055
 
                                ' %%(levelname)s: %%(message)s'
2056
 
                                % server_settings["servicename"]))
 
2446
                               ('Mandos ({0}) [%(process)d]:'
 
2447
                                ' %(levelname)s: %(message)s'
 
2448
                                .format(server_settings
 
2449
                                        ["servicename"])))
2057
2450
    
2058
2451
    # Parse config file with clients
2059
 
    client_defaults = { "timeout": "5m",
2060
 
                        "extended_timeout": "15m",
2061
 
                        "interval": "2m",
2062
 
                        "checker": "fping -q -- %%(host)s",
2063
 
                        "host": "",
2064
 
                        "approval_delay": "0s",
2065
 
                        "approval_duration": "1s",
2066
 
                        }
2067
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2452
    client_config = configparser.SafeConfigParser(Client
 
2453
                                                  .client_defaults)
2068
2454
    client_config.read(os.path.join(server_settings["configdir"],
2069
2455
                                    "clients.conf"))
2070
2456
    
2071
2457
    global mandos_dbus_service
2072
2458
    mandos_dbus_service = None
2073
2459
    
 
2460
    socketfd = None
 
2461
    if server_settings["socket"] != "":
 
2462
        socketfd = server_settings["socket"]
2074
2463
    tcp_server = MandosServer((server_settings["address"],
2075
2464
                               server_settings["port"]),
2076
2465
                              ClientHandler,
2079
2468
                              use_ipv6=use_ipv6,
2080
2469
                              gnutls_priority=
2081
2470
                              server_settings["priority"],
2082
 
                              use_dbus=use_dbus)
2083
 
    if not debug:
2084
 
        pidfilename = "/var/run/mandos.pid"
 
2471
                              use_dbus=use_dbus,
 
2472
                              socketfd=socketfd)
 
2473
    if not foreground:
 
2474
        pidfilename = "/run/mandos.pid"
 
2475
        if not os.path.isdir("/run/."):
 
2476
            pidfilename = "/var/run/mandos.pid"
 
2477
        pidfile = None
2085
2478
        try:
2086
2479
            pidfile = open(pidfilename, "w")
2087
 
        except IOError:
2088
 
            logger.error("Could not open file %r", pidfilename)
 
2480
        except IOError as e:
 
2481
            logger.error("Could not open file %r", pidfilename,
 
2482
                         exc_info=e)
2089
2483
    
2090
 
    try:
2091
 
        uid = pwd.getpwnam("_mandos").pw_uid
2092
 
        gid = pwd.getpwnam("_mandos").pw_gid
2093
 
    except KeyError:
 
2484
    for name in ("_mandos", "mandos", "nobody"):
2094
2485
        try:
2095
 
            uid = pwd.getpwnam("mandos").pw_uid
2096
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2486
            uid = pwd.getpwnam(name).pw_uid
 
2487
            gid = pwd.getpwnam(name).pw_gid
 
2488
            break
2097
2489
        except KeyError:
2098
 
            try:
2099
 
                uid = pwd.getpwnam("nobody").pw_uid
2100
 
                gid = pwd.getpwnam("nobody").pw_gid
2101
 
            except KeyError:
2102
 
                uid = 65534
2103
 
                gid = 65534
 
2490
            continue
 
2491
    else:
 
2492
        uid = 65534
 
2493
        gid = 65534
2104
2494
    try:
2105
2495
        os.setgid(gid)
2106
2496
        os.setuid(uid)
2107
2497
    except OSError as error:
2108
 
        if error[0] != errno.EPERM:
2109
 
            raise error
 
2498
        if error.errno != errno.EPERM:
 
2499
            raise
2110
2500
    
2111
2501
    if debug:
2112
2502
        # Enable all possible GnuTLS debugging
2123
2513
         .gnutls_global_set_log_function(debug_gnutls))
2124
2514
        
2125
2515
        # Redirect stdin so all checkers get /dev/null
2126
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2516
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2127
2517
        os.dup2(null, sys.stdin.fileno())
2128
2518
        if null > 2:
2129
2519
            os.close(null)
2130
 
    else:
2131
 
        # No console logging
2132
 
        logger.removeHandler(console)
2133
2520
    
2134
2521
    # Need to fork before connecting to D-Bus
2135
 
    if not debug:
 
2522
    if not foreground:
2136
2523
        # Close all input and output, do double fork, etc.
2137
2524
        daemon()
2138
2525
    
 
2526
    # multiprocessing will use threads, so before we use gobject we
 
2527
    # need to inform gobject that threads will be used.
 
2528
    gobject.threads_init()
 
2529
    
2139
2530
    global main_loop
2140
2531
    # From the Avahi example code
2141
 
    DBusGMainLoop(set_as_default=True )
 
2532
    DBusGMainLoop(set_as_default=True)
2142
2533
    main_loop = gobject.MainLoop()
2143
2534
    bus = dbus.SystemBus()
2144
2535
    # End of Avahi example code
2150
2541
                            ("se.bsnet.fukt.Mandos", bus,
2151
2542
                             do_not_queue=True))
2152
2543
        except dbus.exceptions.NameExistsException as e:
2153
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2544
            logger.error("Disabling D-Bus:", exc_info=e)
2154
2545
            use_dbus = False
2155
2546
            server_settings["use_dbus"] = False
2156
2547
            tcp_server.use_dbus = False
2157
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2158
 
    service = AvahiServiceToSyslog(name =
2159
 
                                   server_settings["servicename"],
2160
 
                                   servicetype = "_mandos._tcp",
2161
 
                                   protocol = protocol, bus = bus)
2162
 
    if server_settings["interface"]:
2163
 
        service.interface = (if_nametoindex
2164
 
                             (str(server_settings["interface"])))
 
2548
    if zeroconf:
 
2549
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2550
        service = AvahiServiceToSyslog(name =
 
2551
                                       server_settings["servicename"],
 
2552
                                       servicetype = "_mandos._tcp",
 
2553
                                       protocol = protocol, bus = bus)
 
2554
        if server_settings["interface"]:
 
2555
            service.interface = (if_nametoindex
 
2556
                                 (str(server_settings["interface"])))
2165
2557
    
2166
2558
    global multiprocessing_manager
2167
2559
    multiprocessing_manager = multiprocessing.Manager()
2168
2560
    
2169
2561
    client_class = Client
2170
2562
    if use_dbus:
2171
 
        client_class = functools.partial(ClientDBusTransitional,
2172
 
                                         bus = bus)
2173
 
    
2174
 
    special_settings = {
2175
 
        # Some settings need to be accessd by special methods;
2176
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2177
 
        "approved_by_default":
2178
 
            lambda section:
2179
 
            client_config.getboolean(section, "approved_by_default"),
2180
 
        }
2181
 
    # Construct a new dict of client settings of this form:
2182
 
    # { client_name: {setting_name: value, ...}, ...}
2183
 
    # with exceptions for any special settings as defined above
2184
 
    client_settings = dict((clientname,
2185
 
                           dict((setting,
2186
 
                                 (value
2187
 
                                  if setting not in special_settings
2188
 
                                  else special_settings[setting]
2189
 
                                  (clientname)))
2190
 
                                for setting, value in
2191
 
                                client_config.items(clientname)))
2192
 
                          for clientname in client_config.sections())
2193
 
    
 
2563
        client_class = functools.partial(ClientDBus, bus = bus)
 
2564
    
 
2565
    client_settings = Client.config_parser(client_config)
2194
2566
    old_client_settings = {}
2195
 
    clients_data = []
 
2567
    clients_data = {}
 
2568
    
 
2569
    # This is used to redirect stdout and stderr for checker processes
 
2570
    global wnull
 
2571
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2572
    # Only used if server is running in foreground but not in debug
 
2573
    # mode
 
2574
    if debug or not foreground:
 
2575
        wnull.close()
2196
2576
    
2197
2577
    # Get client data and settings from last running state.
2198
2578
    if server_settings["restore"]:
2202
2582
                                                     (stored_state))
2203
2583
            os.remove(stored_state_path)
2204
2584
        except IOError as e:
2205
 
            logger.warning("Could not load persistent state: {0}"
2206
 
                           .format(e))
2207
 
            if e.errno != errno.ENOENT:
 
2585
            if e.errno == errno.ENOENT:
 
2586
                logger.warning("Could not load persistent state: {0}"
 
2587
                                .format(os.strerror(e.errno)))
 
2588
            else:
 
2589
                logger.critical("Could not load persistent state:",
 
2590
                                exc_info=e)
2208
2591
                raise
 
2592
        except EOFError as e:
 
2593
            logger.warning("Could not load persistent state: "
 
2594
                           "EOFError:", exc_info=e)
2209
2595
    
2210
 
    with Crypto() as crypt:
2211
 
        for client in clients_data:
2212
 
            client_name = client["name"]
 
2596
    with PGPEngine() as pgp:
 
2597
        for client_name, client in clients_data.iteritems():
 
2598
            # Skip removed clients
 
2599
            if client_name not in client_settings:
 
2600
                continue
2213
2601
            
2214
2602
            # Decide which value to use after restoring saved state.
2215
2603
            # We have three different values: Old config file,
2224
2612
                    if (name != "secret" and
2225
2613
                        value != old_client_settings[client_name]
2226
2614
                        [name]):
2227
 
                        setattr(client, name, value)
 
2615
                        client[name] = value
2228
2616
                except KeyError:
2229
2617
                    pass
2230
2618
            
2231
2619
            # Clients who has passed its expire date can still be
2232
 
            # enabled if its last checker was sucessful.  Clients
2233
 
            # whose checker failed before we stored its state is
2234
 
            # assumed to have failed all checkers during downtime.
2235
 
            if client["enabled"] and client["last_checked_ok"]:
2236
 
                if ((datetime.datetime.utcnow()
2237
 
                     - client["last_checked_ok"])
2238
 
                    > client["interval"]):
2239
 
                    if client["last_checker_status"] != 0:
 
2620
            # enabled if its last checker was successful.  Clients
 
2621
            # whose checker succeeded before we stored its state is
 
2622
            # assumed to have successfully run all checkers during
 
2623
            # downtime.
 
2624
            if client["enabled"]:
 
2625
                if datetime.datetime.utcnow() >= client["expires"]:
 
2626
                    if not client["last_checked_ok"]:
 
2627
                        logger.warning(
 
2628
                            "disabling client {0} - Client never "
 
2629
                            "performed a successful checker"
 
2630
                            .format(client_name))
 
2631
                        client["enabled"] = False
 
2632
                    elif client["last_checker_status"] != 0:
 
2633
                        logger.warning(
 
2634
                            "disabling client {0} - Client "
 
2635
                            "last checker failed with error code {1}"
 
2636
                            .format(client_name,
 
2637
                                    client["last_checker_status"]))
2240
2638
                        client["enabled"] = False
2241
2639
                    else:
2242
2640
                        client["expires"] = (datetime.datetime
2243
2641
                                             .utcnow()
2244
2642
                                             + client["timeout"])
2245
 
            
2246
 
            client["changedstate"] = (multiprocessing_manager
2247
 
                                      .Condition
2248
 
                                      (multiprocessing_manager
2249
 
                                       .Lock()))
2250
 
            if use_dbus:
2251
 
                new_client = (ClientDBusTransitional.__new__
2252
 
                              (ClientDBusTransitional))
2253
 
                tcp_server.clients[client_name] = new_client
2254
 
                new_client.bus = bus
2255
 
                for name, value in client.iteritems():
2256
 
                    setattr(new_client, name, value)
2257
 
                client_object_name = unicode(client_name).translate(
2258
 
                    {ord("."): ord("_"),
2259
 
                     ord("-"): ord("_")})
2260
 
                new_client.dbus_object_path = (dbus.ObjectPath
2261
 
                                               ("/clients/"
2262
 
                                                + client_object_name))
2263
 
                DBusObjectWithProperties.__init__(new_client,
2264
 
                                                  new_client.bus,
2265
 
                                                  new_client
2266
 
                                                  .dbus_object_path)
2267
 
            else:
2268
 
                tcp_server.clients[client_name] = (Client.__new__
2269
 
                                                   (Client))
2270
 
                for name, value in client.iteritems():
2271
 
                    setattr(tcp_server.clients[client_name],
2272
 
                            name, value)
2273
 
            
 
2643
                        logger.debug("Last checker succeeded,"
 
2644
                                     " keeping {0} enabled"
 
2645
                                     .format(client_name))
2274
2646
            try:
2275
 
                tcp_server.clients[client_name].secret = (
2276
 
                    crypt.decrypt(tcp_server.clients[client_name]
2277
 
                                  .encrypted_secret,
2278
 
                                  client_settings[client_name]
2279
 
                                  ["secret"]))
2280
 
            except CryptoError:
 
2647
                client["secret"] = (
 
2648
                    pgp.decrypt(client["encrypted_secret"],
 
2649
                                client_settings[client_name]
 
2650
                                ["secret"]))
 
2651
            except PGPError:
2281
2652
                # If decryption fails, we use secret from new settings
2282
 
                tcp_server.clients[client_name].secret = (
 
2653
                logger.debug("Failed to decrypt {0} old secret"
 
2654
                             .format(client_name))
 
2655
                client["secret"] = (
2283
2656
                    client_settings[client_name]["secret"])
2284
2657
    
2285
 
    # Create/remove clients based on new changes made to config
2286
 
    for clientname in set(old_client_settings) - set(client_settings):
2287
 
        del tcp_server.clients[clientname]
2288
 
    for clientname in set(client_settings) - set(old_client_settings):
2289
 
        tcp_server.clients[clientname] = (client_class(name
2290
 
                                                       = clientname,
2291
 
                                                       config =
2292
 
                                                       client_settings
2293
 
                                                       [clientname]))
 
2658
    # Add/remove clients based on new changes made to config
 
2659
    for client_name in (set(old_client_settings)
 
2660
                        - set(client_settings)):
 
2661
        del clients_data[client_name]
 
2662
    for client_name in (set(client_settings)
 
2663
                        - set(old_client_settings)):
 
2664
        clients_data[client_name] = client_settings[client_name]
 
2665
    
 
2666
    # Create all client objects
 
2667
    for client_name, client in clients_data.iteritems():
 
2668
        tcp_server.clients[client_name] = client_class(
 
2669
            name = client_name, settings = client,
 
2670
            server_settings = server_settings)
2294
2671
    
2295
2672
    if not tcp_server.clients:
2296
2673
        logger.warning("No clients defined")
2297
 
        
2298
 
    if not debug:
2299
 
        try:
2300
 
            with pidfile:
2301
 
                pid = os.getpid()
2302
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2303
 
            del pidfile
2304
 
        except IOError:
2305
 
            logger.error("Could not write to file %r with PID %d",
2306
 
                         pidfilename, pid)
2307
 
        except NameError:
2308
 
            # "pidfile" was never created
2309
 
            pass
 
2674
    
 
2675
    if not foreground:
 
2676
        if pidfile is not None:
 
2677
            try:
 
2678
                with pidfile:
 
2679
                    pid = os.getpid()
 
2680
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2681
            except IOError:
 
2682
                logger.error("Could not write to file %r with PID %d",
 
2683
                             pidfilename, pid)
 
2684
        del pidfile
2310
2685
        del pidfilename
2311
 
        
2312
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2313
2686
    
2314
2687
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2315
2688
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2316
2689
    
2317
2690
    if use_dbus:
2318
 
        class MandosDBusService(dbus.service.Object):
 
2691
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2692
                                        "se.bsnet.fukt.Mandos"})
 
2693
        class MandosDBusService(DBusObjectWithProperties):
2319
2694
            """A D-Bus proxy object"""
2320
2695
            def __init__(self):
2321
2696
                dbus.service.Object.__init__(self, bus, "/")
2322
2697
            _interface = "se.recompile.Mandos"
2323
2698
            
 
2699
            @dbus_interface_annotations(_interface)
 
2700
            def _foo(self):
 
2701
                return { "org.freedesktop.DBus.Property"
 
2702
                         ".EmitsChangedSignal":
 
2703
                             "false"}
 
2704
            
2324
2705
            @dbus.service.signal(_interface, signature="o")
2325
2706
            def ClientAdded(self, objpath):
2326
2707
                "D-Bus signal"
2368
2749
            
2369
2750
            del _interface
2370
2751
        
2371
 
        class MandosDBusServiceTransitional(MandosDBusService):
2372
 
            __metaclass__ = AlternateDBusNamesMetaclass
2373
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2752
        mandos_dbus_service = MandosDBusService()
2374
2753
    
2375
2754
    def cleanup():
2376
2755
        "Cleanup function; run on exit"
2377
 
        service.cleanup()
 
2756
        if zeroconf:
 
2757
            service.cleanup()
2378
2758
        
2379
2759
        multiprocessing.active_children()
 
2760
        wnull.close()
2380
2761
        if not (tcp_server.clients or client_settings):
2381
2762
            return
2382
2763
        
2383
2764
        # Store client before exiting. Secrets are encrypted with key
2384
2765
        # based on what config file has. If config file is
2385
2766
        # removed/edited, old secret will thus be unrecovable.
2386
 
        clients = []
2387
 
        with Crypto() as crypt:
 
2767
        clients = {}
 
2768
        with PGPEngine() as pgp:
2388
2769
            for client in tcp_server.clients.itervalues():
2389
2770
                key = client_settings[client.name]["secret"]
2390
 
                client.encrypted_secret = crypt.encrypt(client.secret,
2391
 
                                                        key)
 
2771
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2772
                                                      key)
2392
2773
                client_dict = {}
2393
2774
                
2394
 
                # A list of attributes that will not be stored when
2395
 
                # shutting down.
2396
 
                exclude = set(("bus", "changedstate", "secret"))
 
2775
                # A list of attributes that can not be pickled
 
2776
                # + secret.
 
2777
                exclude = set(("bus", "changedstate", "secret",
 
2778
                               "checker", "server_settings"))
2397
2779
                for name, typ in (inspect.getmembers
2398
2780
                                  (dbus.service.Object)):
2399
2781
                    exclude.add(name)
2404
2786
                    if attr not in exclude:
2405
2787
                        client_dict[attr] = getattr(client, attr)
2406
2788
                
2407
 
                clients.append(client_dict)
 
2789
                clients[client.name] = client_dict
2408
2790
                del client_settings[client.name]["secret"]
2409
2791
        
2410
2792
        try:
2411
 
            with os.fdopen(os.open(stored_state_path,
2412
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2413
 
                                   0600), "wb") as stored_state:
 
2793
            with (tempfile.NamedTemporaryFile
 
2794
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2795
                   dir=os.path.dirname(stored_state_path),
 
2796
                   delete=False)) as stored_state:
2414
2797
                pickle.dump((clients, client_settings), stored_state)
 
2798
                tempname=stored_state.name
 
2799
            os.rename(tempname, stored_state_path)
2415
2800
        except (IOError, OSError) as e:
2416
 
            logger.warning("Could not save persistent state: {0}"
2417
 
                           .format(e))
2418
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2801
            if not debug:
 
2802
                try:
 
2803
                    os.remove(tempname)
 
2804
                except NameError:
 
2805
                    pass
 
2806
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2807
                logger.warning("Could not save persistent state: {0}"
 
2808
                               .format(os.strerror(e.errno)))
 
2809
            else:
 
2810
                logger.warning("Could not save persistent state:",
 
2811
                               exc_info=e)
2419
2812
                raise
2420
2813
        
2421
2814
        # Delete all clients, and settings from config
2446
2839
    tcp_server.server_activate()
2447
2840
    
2448
2841
    # Find out what port we got
2449
 
    service.port = tcp_server.socket.getsockname()[1]
 
2842
    if zeroconf:
 
2843
        service.port = tcp_server.socket.getsockname()[1]
2450
2844
    if use_ipv6:
2451
2845
        logger.info("Now listening on address %r, port %d,"
2452
 
                    " flowinfo %d, scope_id %d"
2453
 
                    % tcp_server.socket.getsockname())
 
2846
                    " flowinfo %d, scope_id %d",
 
2847
                    *tcp_server.socket.getsockname())
2454
2848
    else:                       # IPv4
2455
 
        logger.info("Now listening on address %r, port %d"
2456
 
                    % tcp_server.socket.getsockname())
 
2849
        logger.info("Now listening on address %r, port %d",
 
2850
                    *tcp_server.socket.getsockname())
2457
2851
    
2458
2852
    #service.interface = tcp_server.socket.getsockname()[3]
2459
2853
    
2460
2854
    try:
2461
 
        # From the Avahi example code
2462
 
        try:
2463
 
            service.activate()
2464
 
        except dbus.exceptions.DBusException as error:
2465
 
            logger.critical("DBusException: %s", error)
2466
 
            cleanup()
2467
 
            sys.exit(1)
2468
 
        # End of Avahi example code
 
2855
        if zeroconf:
 
2856
            # From the Avahi example code
 
2857
            try:
 
2858
                service.activate()
 
2859
            except dbus.exceptions.DBusException as error:
 
2860
                logger.critical("D-Bus Exception", exc_info=error)
 
2861
                cleanup()
 
2862
                sys.exit(1)
 
2863
            # End of Avahi example code
2469
2864
        
2470
2865
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2471
2866
                             lambda *args, **kwargs:
2475
2870
        logger.debug("Starting main loop")
2476
2871
        main_loop.run()
2477
2872
    except AvahiError as error:
2478
 
        logger.critical("AvahiError: %s", error)
 
2873
        logger.critical("Avahi Error", exc_info=error)
2479
2874
        cleanup()
2480
2875
        sys.exit(1)
2481
2876
    except KeyboardInterrupt:
2486
2881
    # Must run before the D-Bus bus name gets deregistered
2487
2882
    cleanup()
2488
2883
 
2489
 
 
2490
2884
if __name__ == '__main__':
2491
2885
    main()