/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2014-03-01 09:39:25 UTC
  • Revision ID: teddy@recompile.se-20140301093925-0x6nwf21f0zljk6e
* debian/copyright: Change year to "2014".
* mandos-ctl: - '' -
* mandos-monitor: - '' -
* plugins.d/mandos-client.xml: - '' -

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