/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-05-12 13:14:57 UTC
  • mfrom: (237.4.43 release)
  • Revision ID: teddy@recompile.se-20140512131457-yupek8sqkke2ini8
Merge from release branch.

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"
89
 
 
90
 
stored_state_path = "/var/lib/mandos/clients.pickle"
91
 
 
92
 
#logger = logging.getLogger('mandos')
93
 
logger = logging.Logger('mandos')
94
 
syslogger = (logging.handlers.SysLogHandler
95
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
96
 
              address = str("/dev/log")))
97
 
syslogger.setFormatter(logging.Formatter
98
 
                       ('Mandos [%(process)d]: %(levelname)s:'
99
 
                        ' %(message)s'))
100
 
logger.addHandler(syslogger)
101
 
 
102
 
console = logging.StreamHandler()
103
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
104
 
                                       ' %(levelname)s:'
105
 
                                       ' %(message)s'))
106
 
logger.addHandler(console)
 
91
version = "1.6.5"
 
92
stored_state_file = "clients.pickle"
 
93
 
 
94
logger = logging.getLogger()
 
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
 
221
 
107
222
 
108
223
class AvahiError(Exception):
109
224
    def __init__(self, value, *args, **kwargs):
127
242
               Used to optionally bind to the specified interface.
128
243
    name: string; Example: 'Mandos'
129
244
    type: string; Example: '_mandos._tcp'.
130
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
245
     See <https://www.iana.org/assignments/service-names-port-numbers>
131
246
    port: integer; what port to announce
132
247
    TXT: list of strings; TXT record for the service
133
248
    domain: string; Domain to publish on, default to .local if empty.
139
254
    server: D-Bus Server
140
255
    bus: dbus.SystemBus()
141
256
    """
 
257
    
142
258
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
143
259
                 servicetype = None, port = None, TXT = None,
144
260
                 domain = "", host = "", max_renames = 32768,
157
273
        self.server = None
158
274
        self.bus = bus
159
275
        self.entry_group_state_changed_match = None
 
276
    
160
277
    def rename(self):
161
278
        """Derived from the Avahi example code"""
162
279
        if self.rename_count >= self.max_renames:
168
285
                            .GetAlternativeServiceName(self.name))
169
286
        logger.info("Changing Zeroconf service name to %r ...",
170
287
                    self.name)
171
 
        syslogger.setFormatter(logging.Formatter
172
 
                               ('Mandos (%s) [%%(process)d]:'
173
 
                                ' %%(levelname)s: %%(message)s'
174
 
                                % self.name))
175
288
        self.remove()
176
289
        try:
177
290
            self.add()
178
291
        except dbus.exceptions.DBusException as error:
179
 
            logger.critical("DBusException: %s", error)
 
292
            logger.critical("D-Bus Exception", exc_info=error)
180
293
            self.cleanup()
181
294
            os._exit(1)
182
295
        self.rename_count += 1
 
296
    
183
297
    def remove(self):
184
298
        """Derived from the Avahi example code"""
185
299
        if self.entry_group_state_changed_match is not None:
187
301
            self.entry_group_state_changed_match = None
188
302
        if self.group is not None:
189
303
            self.group.Reset()
 
304
    
190
305
    def add(self):
191
306
        """Derived from the Avahi example code"""
192
307
        self.remove()
197
312
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
198
313
        self.entry_group_state_changed_match = (
199
314
            self.group.connect_to_signal(
200
 
                'StateChanged', self .entry_group_state_changed))
 
315
                'StateChanged', self.entry_group_state_changed))
201
316
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
202
317
                     self.name, self.type)
203
318
        self.group.AddService(
209
324
            dbus.UInt16(self.port),
210
325
            avahi.string_array_to_txt_array(self.TXT))
211
326
        self.group.Commit()
 
327
    
212
328
    def entry_group_state_changed(self, state, error):
213
329
        """Derived from the Avahi example code"""
214
330
        logger.debug("Avahi entry group state change: %i", state)
221
337
        elif state == avahi.ENTRY_GROUP_FAILURE:
222
338
            logger.critical("Avahi: Error in group state changed %s",
223
339
                            unicode(error))
224
 
            raise AvahiGroupError("State changed: %s"
225
 
                                  % unicode(error))
 
340
            raise AvahiGroupError("State changed: {0!s}"
 
341
                                  .format(error))
 
342
    
226
343
    def cleanup(self):
227
344
        """Derived from the Avahi example code"""
228
345
        if self.group is not None:
229
346
            try:
230
347
                self.group.Free()
231
348
            except (dbus.exceptions.UnknownMethodException,
232
 
                    dbus.exceptions.DBusException) as e:
 
349
                    dbus.exceptions.DBusException):
233
350
                pass
234
351
            self.group = None
235
352
        self.remove()
 
353
    
236
354
    def server_state_changed(self, state, error=None):
237
355
        """Derived from the Avahi example code"""
238
356
        logger.debug("Avahi server state change: %i", state)
257
375
                logger.debug("Unknown state: %r", state)
258
376
            else:
259
377
                logger.debug("Unknown state: %r: %r", state, error)
 
378
    
260
379
    def activate(self):
261
380
        """Derived from the Avahi example code"""
262
381
        if self.server is None:
270
389
        self.server_state_changed(self.server.GetState())
271
390
 
272
391
 
273
 
def _timedelta_to_milliseconds(td):
 
392
class AvahiServiceToSyslog(AvahiService):
 
393
    def rename(self):
 
394
        """Add the new name to the syslog messages"""
 
395
        ret = AvahiService.rename(self)
 
396
        syslogger.setFormatter(logging.Formatter
 
397
                               ('Mandos ({0}) [%(process)d]:'
 
398
                                ' %(levelname)s: %(message)s'
 
399
                                .format(self.name)))
 
400
        return ret
 
401
 
 
402
 
 
403
def timedelta_to_milliseconds(td):
274
404
    "Convert a datetime.timedelta() to milliseconds"
275
405
    return ((td.days * 24 * 60 * 60 * 1000)
276
406
            + (td.seconds * 1000)
277
407
            + (td.microseconds // 1000))
278
 
        
 
408
 
 
409
 
279
410
class Client(object):
280
411
    """A representation of a client host served by this server.
281
412
    
282
413
    Attributes:
283
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
414
    approved:   bool(); 'None' if not yet approved/disapproved
284
415
    approval_delay: datetime.timedelta(); Time to wait for approval
285
416
    approval_duration: datetime.timedelta(); Duration of one approval
286
417
    checker:    subprocess.Popen(); a running checker process used
304
435
    interval:   datetime.timedelta(); How often to start a new checker
305
436
    last_approval_request: datetime.datetime(); (UTC) or None
306
437
    last_checked_ok: datetime.datetime(); (UTC) or None
307
 
    Last_checker_status: integer between 0 and 255 reflecting exit status
308
 
                         of last checker. -1 reflect crashed checker.
309
 
    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
310
442
    name:       string; from the config file, used in log messages and
311
443
                        D-Bus identifiers
312
444
    secret:     bytestring; sent verbatim (over TLS) to client
313
445
    timeout:    datetime.timedelta(); How long from last_checked_ok
314
446
                                      until this client is disabled
315
 
    extended_timeout:   extra long timeout when password has been sent
 
447
    extended_timeout:   extra long timeout when secret has been sent
316
448
    runtime_expansions: Allowed attributes for runtime expansion.
317
449
    expires:    datetime.datetime(); time (UTC) when a client will be
318
450
                disabled, or None
 
451
    server_settings: The server_settings dict from main()
319
452
    """
320
453
    
321
454
    runtime_expansions = ("approval_delay", "approval_duration",
322
 
                          "created", "enabled", "fingerprint",
323
 
                          "host", "interval", "last_checked_ok",
 
455
                          "created", "enabled", "expires",
 
456
                          "fingerprint", "host", "interval",
 
457
                          "last_approval_request", "last_checked_ok",
324
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
                        }
325
469
    
326
470
    def timeout_milliseconds(self):
327
471
        "Return the 'timeout' attribute in milliseconds"
328
 
        return _timedelta_to_milliseconds(self.timeout)
 
472
        return timedelta_to_milliseconds(self.timeout)
329
473
    
330
474
    def extended_timeout_milliseconds(self):
331
475
        "Return the 'extended_timeout' attribute in milliseconds"
332
 
        return _timedelta_to_milliseconds(self.extended_timeout)
 
476
        return timedelta_to_milliseconds(self.extended_timeout)
333
477
    
334
478
    def interval_milliseconds(self):
335
479
        "Return the 'interval' attribute in milliseconds"
336
 
        return _timedelta_to_milliseconds(self.interval)
 
480
        return timedelta_to_milliseconds(self.interval)
337
481
    
338
482
    def approval_delay_milliseconds(self):
339
 
        return _timedelta_to_milliseconds(self.approval_delay)
340
 
    
341
 
    def __init__(self, name = None, config=None):
342
 
        """Note: the 'checker' key in 'config' sets the
343
 
        'checker_command' attribute and *not* the 'checker'
344
 
        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):
345
533
        self.name = name
346
 
        if config is None:
347
 
            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
        
348
551
        logger.debug("Creating client %r", self.name)
349
552
        # Uppercase and remove spaces from fingerprint for later
350
553
        # comparison purposes with return value from the fingerprint()
351
554
        # function
352
 
        self.fingerprint = (config["fingerprint"].upper()
353
 
                            .replace(" ", ""))
354
555
        logger.debug("  Fingerprint: %s", self.fingerprint)
355
 
        if "secret" in config:
356
 
            self.secret = config["secret"].decode("base64")
357
 
        elif "secfile" in config:
358
 
            with open(os.path.expanduser(os.path.expandvars
359
 
                                         (config["secfile"])),
360
 
                      "rb") as secfile:
361
 
                self.secret = secfile.read()
362
 
        else:
363
 
            raise TypeError("No secret or secfile for client %s"
364
 
                            % self.name)
365
 
        self.host = config.get("host", "")
366
 
        self.created = datetime.datetime.utcnow()
367
 
        self.enabled = True
368
 
        self.last_approval_request = None
369
 
        self.last_enabled = datetime.datetime.utcnow()
370
 
        self.last_checked_ok = None
371
 
        self.last_checker_status = 0
372
 
        self.timeout = string_to_delta(config["timeout"])
373
 
        self.extended_timeout = string_to_delta(config
374
 
                                                ["extended_timeout"])
375
 
        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
376
560
        self.checker = None
377
561
        self.checker_initiator_tag = None
378
562
        self.disable_initiator_tag = None
379
 
        self.expires = datetime.datetime.utcnow() + self.timeout
380
563
        self.checker_callback_tag = None
381
 
        self.checker_command = config["checker"]
382
564
        self.current_checker_command = None
383
 
        self._approved = None
384
 
        self.approved_by_default = config.get("approved_by_default",
385
 
                                              True)
 
565
        self.approved = None
386
566
        self.approvals_pending = 0
387
 
        self.approval_delay = string_to_delta(
388
 
            config["approval_delay"])
389
 
        self.approval_duration = string_to_delta(
390
 
            config["approval_duration"])
391
567
        self.changedstate = (multiprocessing_manager
392
568
                             .Condition(multiprocessing_manager
393
569
                                        .Lock()))
394
 
        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("_")]
395
573
        self.client_structure.append("client_structure")
396
 
 
397
 
 
 
574
        
398
575
        for name, t in inspect.getmembers(type(self),
399
 
                                          lambda obj: isinstance(obj, property)):
 
576
                                          lambda obj:
 
577
                                              isinstance(obj,
 
578
                                                         property)):
400
579
            if not name.startswith("_"):
401
580
                self.client_structure.append(name)
402
581
    
403
 
    
 
582
    # Send notice to process children that client state has changed
404
583
    def send_changedstate(self):
405
 
        self.changedstate.acquire()
406
 
        self.changedstate.notify_all()
407
 
        self.changedstate.release()
 
584
        with self.changedstate:
 
585
            self.changedstate.notify_all()
408
586
    
409
587
    def enable(self):
410
588
        """Start this client's checker and timeout hooks"""
411
589
        if getattr(self, "enabled", False):
412
590
            # Already enabled
413
591
            return
414
 
        self.send_changedstate()
415
592
        self.expires = datetime.datetime.utcnow() + self.timeout
416
593
        self.enabled = True
417
594
        self.last_enabled = datetime.datetime.utcnow()
418
595
        self.init_checker()
 
596
        self.send_changedstate()
419
597
    
420
598
    def disable(self, quiet=True):
421
599
        """Disable this client."""
422
600
        if not getattr(self, "enabled", False):
423
601
            return False
424
602
        if not quiet:
425
 
            self.send_changedstate()
426
 
        if not quiet:
427
603
            logger.info("Disabling client %s", self.name)
428
 
        if getattr(self, "disable_initiator_tag", False):
 
604
        if getattr(self, "disable_initiator_tag", None) is not None:
429
605
            gobject.source_remove(self.disable_initiator_tag)
430
606
            self.disable_initiator_tag = None
431
607
        self.expires = None
432
 
        if getattr(self, "checker_initiator_tag", False):
 
608
        if getattr(self, "checker_initiator_tag", None) is not None:
433
609
            gobject.source_remove(self.checker_initiator_tag)
434
610
            self.checker_initiator_tag = None
435
611
        self.stop_checker()
436
612
        self.enabled = False
 
613
        if not quiet:
 
614
            self.send_changedstate()
437
615
        # Do not run this again if called by a gobject.timeout_add
438
616
        return False
439
617
    
440
618
    def __del__(self):
441
619
        self.disable()
442
 
 
 
620
    
443
621
    def init_checker(self):
444
622
        # Schedule a new checker to be started an 'interval' from now,
445
623
        # and every interval from then on.
 
624
        if self.checker_initiator_tag is not None:
 
625
            gobject.source_remove(self.checker_initiator_tag)
446
626
        self.checker_initiator_tag = (gobject.timeout_add
447
627
                                      (self.interval_milliseconds(),
448
628
                                       self.start_checker))
449
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)
450
632
        self.disable_initiator_tag = (gobject.timeout_add
451
633
                                   (self.timeout_milliseconds(),
452
634
                                    self.disable))
453
635
        # Also start a new checker *right now*.
454
636
        self.start_checker()
455
 
 
456
 
        
 
637
    
457
638
    def checker_callback(self, pid, condition, command):
458
639
        """The checker has completed, so take appropriate actions."""
459
640
        self.checker_callback_tag = None
460
641
        self.checker = None
461
642
        if os.WIFEXITED(condition):
462
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
643
            self.last_checker_status = os.WEXITSTATUS(condition)
463
644
            if self.last_checker_status == 0:
464
645
                logger.info("Checker for %(name)s succeeded",
465
646
                            vars(self))
472
653
            logger.warning("Checker for %(name)s crashed?",
473
654
                           vars(self))
474
655
    
475
 
    def checked_ok(self, timeout=None):
476
 
        """Bump up the timeout for this client.
477
 
        
478
 
        This should only be called when the client has been seen,
479
 
        alive and well.
480
 
        """
 
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."""
481
664
        if timeout is None:
482
665
            timeout = self.timeout
483
 
        self.last_checked_ok = datetime.datetime.utcnow()
484
666
        if self.disable_initiator_tag is not None:
485
667
            gobject.source_remove(self.disable_initiator_tag)
 
668
            self.disable_initiator_tag = None
486
669
        if getattr(self, "enabled", False):
487
670
            self.disable_initiator_tag = (gobject.timeout_add
488
 
                                          (_timedelta_to_milliseconds
 
671
                                          (timedelta_to_milliseconds
489
672
                                           (timeout), self.disable))
490
673
            self.expires = datetime.datetime.utcnow() + timeout
491
674
    
498
681
        If a checker already exists, leave it running and do
499
682
        nothing."""
500
683
        # The reason for not killing a running checker is that if we
501
 
        # did that, then if a checker (for some reason) started
502
 
        # running slowly and taking more than 'interval' time, the
503
 
        # client would inevitably timeout, since no checker would get
504
 
        # 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
505
688
        # checkers alone, the checker would have to take more time
506
689
        # than 'timeout' for the client to be disabled, which is as it
507
690
        # should be.
509
692
        # If a checker exists, make sure it is not a zombie
510
693
        try:
511
694
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
512
 
        except (AttributeError, OSError) as error:
513
 
            if (isinstance(error, OSError)
514
 
                and error.errno != errno.ECHILD):
515
 
                raise error
 
695
        except AttributeError:
 
696
            pass
 
697
        except OSError as error:
 
698
            if error.errno != errno.ECHILD:
 
699
                raise
516
700
        else:
517
701
            if pid:
518
702
                logger.warning("Checker was a zombie")
521
705
                                      self.current_checker_command)
522
706
        # Start a new checker if needed
523
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)
524
713
            try:
525
 
                # In case checker_command has exactly one % operator
526
 
                command = self.checker_command % self.host
527
 
            except TypeError:
528
 
                # Escape attributes for the shell
529
 
                escaped_attrs = dict(
530
 
                    (attr,
531
 
                     re.escape(unicode(str(getattr(self, attr, "")),
532
 
                                       errors=
533
 
                                       'replace')))
534
 
                    for attr in
535
 
                    self.runtime_expansions)
536
 
                
537
 
                try:
538
 
                    command = self.checker_command % escaped_attrs
539
 
                except TypeError as error:
540
 
                    logger.error('Could not format string "%s":'
541
 
                                 ' %s', self.checker_command, error)
542
 
                    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
543
719
            self.current_checker_command = command
544
720
            try:
545
721
                logger.info("Starting checker %r for %s",
548
724
                # in normal mode, that is already done by daemon(),
549
725
                # and in debug mode we don't want to.  (Stdin is
550
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 })
551
735
                self.checker = subprocess.Popen(command,
552
736
                                                close_fds=True,
553
 
                                                shell=True, cwd="/")
554
 
                self.checker_callback_tag = (gobject.child_watch_add
555
 
                                             (self.checker.pid,
556
 
                                              self.checker_callback,
557
 
                                              data=command))
558
 
                # The checker may have completed before the gobject
559
 
                # 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:
560
750
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
561
 
                if pid:
562
 
                    gobject.source_remove(self.checker_callback_tag)
563
 
                    self.checker_callback(pid, status, command)
564
751
            except OSError as error:
565
 
                logger.error("Failed to start subprocess: %s",
566
 
                             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)
567
761
        # Re-run this periodically if run by gobject.timeout_add
568
762
        return True
569
763
    
576
770
            return
577
771
        logger.debug("Stopping checker for %(name)s", vars(self))
578
772
        try:
579
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
773
            self.checker.terminate()
580
774
            #time.sleep(0.5)
581
775
            #if self.checker.poll() is None:
582
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
776
            #    self.checker.kill()
583
777
        except OSError as error:
584
778
            if error.errno != errno.ESRCH: # No such process
585
779
                raise
586
780
        self.checker = None
587
781
 
588
 
    # Encrypts a client secret and stores it in a varible encrypted_secret
589
 
    def encrypt_secret(self, key):
590
 
        # Encryption-key need to be specific size, so we hash inputed key
591
 
        hasheng = hashlib.sha256()
592
 
        hasheng.update(key)
593
 
        encryptionkey = hasheng.digest()
594
 
 
595
 
        # Create validation hash so we know at decryption if it was sucessful
596
 
        hasheng = hashlib.sha256()
597
 
        hasheng.update(self.secret)
598
 
        validationhash = hasheng.digest()
599
 
 
600
 
        # Encrypt secret
601
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
602
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
603
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
604
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
605
 
        self.encrypted_secret = (ciphertext, iv)
606
 
 
607
 
    # Decrypt a encrypted client secret
608
 
    def decrypt_secret(self, key):
609
 
        # Decryption-key need to be specific size, so we hash inputed key
610
 
        hasheng = hashlib.sha256()
611
 
        hasheng.update(key)
612
 
        encryptionkey = hasheng.digest()
613
 
 
614
 
        # Decrypt encrypted secret
615
 
        ciphertext, iv = self.encrypted_secret
616
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
617
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
618
 
        plain = ciphereng.decrypt(ciphertext)
619
 
 
620
 
        # Validate decrypted secret to know if it was succesful
621
 
        hasheng = hashlib.sha256()
622
 
        validationhash = plain[:hasheng.digest_size]
623
 
        secret = plain[hasheng.digest_size:]
624
 
        hasheng.update(secret)
625
 
 
626
 
        # if validation fails, we use key as new secret. Otherwhise, we use
627
 
        # the decrypted secret
628
 
        if hasheng.digest() == validationhash:
629
 
            self.secret = secret
630
 
        else:
631
 
            self.secret = key
632
 
        del self.encrypted_secret
633
 
 
634
782
 
635
783
def dbus_service_property(dbus_interface, signature="v",
636
784
                          access="readwrite", byte_arrays=False):
648
796
    # "Set" method, so we fail early here:
649
797
    if byte_arrays and signature != "ay":
650
798
        raise ValueError("Byte arrays not supported for non-'ay'"
651
 
                         " signature %r" % signature)
 
799
                         " signature {0!r}".format(signature))
652
800
    def decorator(func):
653
801
        func._dbus_is_property = True
654
802
        func._dbus_interface = dbus_interface
662
810
    return decorator
663
811
 
664
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
 
665
850
class DBusPropertyException(dbus.exceptions.DBusException):
666
851
    """A base class for D-Bus property-related exceptions
667
852
    """
690
875
    """
691
876
    
692
877
    @staticmethod
693
 
    def _is_dbus_property(obj):
694
 
        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)
695
886
    
696
 
    def _get_all_dbus_properties(self):
 
887
    def _get_all_dbus_things(self, thing):
697
888
        """Returns a generator of (name, attribute) pairs
698
889
        """
699
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
890
        return ((getattr(athing.__get__(self), "_dbus_name",
 
891
                         name),
 
892
                 athing.__get__(self))
700
893
                for cls in self.__class__.__mro__
701
 
                for name, prop in
702
 
                inspect.getmembers(cls, self._is_dbus_property))
 
894
                for name, athing in
 
895
                inspect.getmembers(cls,
 
896
                                   self._is_dbus_thing(thing)))
703
897
    
704
898
    def _get_dbus_property(self, interface_name, property_name):
705
899
        """Returns a bound method if one exists which is a D-Bus
707
901
        """
708
902
        for cls in  self.__class__.__mro__:
709
903
            for name, value in (inspect.getmembers
710
 
                                (cls, self._is_dbus_property)):
 
904
                                (cls,
 
905
                                 self._is_dbus_thing("property"))):
711
906
                if (value._dbus_name == property_name
712
907
                    and value._dbus_interface == interface_name):
713
908
                    return value.__get__(self)
741
936
            # The byte_arrays option is not supported yet on
742
937
            # signatures other than "ay".
743
938
            if prop._dbus_signature != "ay":
744
 
                raise ValueError
745
 
            value = dbus.ByteArray(''.join(unichr(byte)
746
 
                                           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))
747
944
        prop(value)
748
945
    
749
946
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
754
951
        
755
952
        Note: Will not include properties with access="write".
756
953
        """
757
 
        all = {}
758
 
        for name, prop in self._get_all_dbus_properties():
 
954
        properties = {}
 
955
        for name, prop in self._get_all_dbus_things("property"):
759
956
            if (interface_name
760
957
                and interface_name != prop._dbus_interface):
761
958
                # Interface non-empty but did not match
765
962
                continue
766
963
            value = prop()
767
964
            if not hasattr(value, "variant_level"):
768
 
                all[name] = value
 
965
                properties[name] = value
769
966
                continue
770
 
            all[name] = type(value)(value, variant_level=
771
 
                                    value.variant_level+1)
772
 
        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")
773
970
    
774
971
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
775
972
                         out_signature="s",
776
973
                         path_keyword='object_path',
777
974
                         connection_keyword='connection')
778
975
    def Introspect(self, object_path, connection):
779
 
        """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.
780
979
        """
781
980
        xmlstring = dbus.service.Object.Introspect(self, object_path,
782
981
                                                   connection)
789
988
                e.setAttribute("access", prop._dbus_access)
790
989
                return e
791
990
            for if_tag in document.getElementsByTagName("interface"):
 
991
                # Add property tags
792
992
                for tag in (make_tag(document, name, prop)
793
993
                            for name, prop
794
 
                            in self._get_all_dbus_properties()
 
994
                            in self._get_all_dbus_things("property")
795
995
                            if prop._dbus_interface
796
996
                            == if_tag.getAttribute("name")):
797
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)
798
1029
                # Add the names to the return values for the
799
1030
                # "org.freedesktop.DBus.Properties" methods
800
1031
                if (if_tag.getAttribute("name")
815
1046
        except (AttributeError, xml.dom.DOMException,
816
1047
                xml.parsers.expat.ExpatError) as error:
817
1048
            logger.error("Failed to override Introspection method",
818
 
                         error)
 
1049
                         exc_info=error)
819
1050
        return xmlstring
820
1051
 
821
1052
 
822
 
def datetime_to_dbus (dt, variant_level=0):
 
1053
def datetime_to_dbus(dt, variant_level=0):
823
1054
    """Convert a UTC datetime.datetime() to a D-Bus type."""
824
1055
    if dt is None:
825
1056
        return dbus.String("", variant_level = variant_level)
826
1057
    return dbus.String(dt.isoformat(),
827
1058
                       variant_level=variant_level)
828
1059
 
829
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
830
 
                                  .__metaclass__):
831
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
832
 
    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).
833
1083
    """
834
 
    def __new__(mcs, name, bases, attr):
835
 
        # Go through all the base classes which could have D-Bus
836
 
        # methods, signals, or properties in them
837
 
        for base in (b for b in bases
838
 
                     if issubclass(b, dbus.service.Object)):
839
 
            # Go though all attributes of the base class
840
 
            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):
841
1091
                # Ignore non-D-Bus attributes, and D-Bus attributes
842
1092
                # with the wrong interface name
843
1093
                if (not hasattr(attribute, "_dbus_interface")
844
1094
                    or not attribute._dbus_interface
845
 
                    .startswith("se.recompile.Mandos")):
 
1095
                    .startswith(orig_interface_name)):
846
1096
                    continue
847
1097
                # Create an alternate D-Bus interface name based on
848
1098
                # the current name
849
1099
                alt_interface = (attribute._dbus_interface
850
 
                                 .replace("se.recompile.Mandos",
851
 
                                          "se.bsnet.fukt.Mandos"))
 
1100
                                 .replace(orig_interface_name,
 
1101
                                          alt_interface_name))
 
1102
                interface_names.add(alt_interface)
852
1103
                # Is this a D-Bus signal?
853
1104
                if getattr(attribute, "_dbus_is_signal", False):
854
 
                    # Extract the original non-method function by
855
 
                    # black magic
 
1105
                    # Extract the original non-method undecorated
 
1106
                    # function by black magic
856
1107
                    nonmethod_func = (dict(
857
1108
                            zip(attribute.func_code.co_freevars,
858
1109
                                attribute.__closure__))["func"]
869
1120
                                nonmethod_func.func_name,
870
1121
                                nonmethod_func.func_defaults,
871
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
872
1129
                    # Define a creator of a function to call both the
873
 
                    # old and new functions, so both the old and new
874
 
                    # 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
875
1133
                    def fixscope(func1, func2):
876
1134
                        """This function is a scope container to pass
877
1135
                        func1 and func2 to the "call_both" function
884
1142
                        return call_both
885
1143
                    # Create the "call_both" function and add it to
886
1144
                    # the class
887
 
                    attr[attrname] = fixscope(attribute,
888
 
                                              new_function)
 
1145
                    attr[attrname] = fixscope(attribute, new_function)
889
1146
                # Is this a D-Bus method?
890
1147
                elif getattr(attribute, "_dbus_is_method", False):
891
1148
                    # Create a new, but exactly alike, function
902
1159
                                        attribute.func_name,
903
1160
                                        attribute.func_defaults,
904
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
905
1168
                # Is this a D-Bus property?
906
1169
                elif getattr(attribute, "_dbus_is_property", False):
907
1170
                    # Create a new, but exactly alike, function
921
1184
                                        attribute.func_name,
922
1185
                                        attribute.func_defaults,
923
1186
                                        attribute.func_closure)))
924
 
        return type.__new__(mcs, name, bases, attr)
925
 
 
 
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"})
926
1232
class ClientDBus(Client, DBusObjectWithProperties):
927
1233
    """A Client class using D-Bus
928
1234
    
939
1245
    def __init__(self, bus = None, *args, **kwargs):
940
1246
        self.bus = bus
941
1247
        Client.__init__(self, *args, **kwargs)
942
 
 
943
 
        self._approvals_pending = 0
944
1248
        # Only now, when this client is initialized, can it show up on
945
1249
        # the D-Bus
946
1250
        client_object_name = unicode(self.name).translate(
950
1254
                                 ("/clients/" + client_object_name))
951
1255
        DBusObjectWithProperties.__init__(self, self.bus,
952
1256
                                          self.dbus_object_path)
953
 
        
 
1257
    
954
1258
    def notifychangeproperty(transform_func,
955
1259
                             dbus_name, type_func=lambda x: x,
956
1260
                             variant_level=1):
957
1261
        """ Modify a variable so that it's a property which announces
958
1262
        its changes to DBus.
959
 
 
 
1263
        
960
1264
        transform_fun: Function that takes a value and a variant_level
961
1265
                       and transforms it to a D-Bus type.
962
1266
        dbus_name: D-Bus name of the variable
979
1283
        
980
1284
        return property(lambda self: getattr(self, attrname), setter)
981
1285
    
982
 
    
983
1286
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
984
1287
    approvals_pending = notifychangeproperty(dbus.Boolean,
985
1288
                                             "ApprovalPending",
992
1295
                                       checker is not None)
993
1296
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
994
1297
                                           "LastCheckedOK")
 
1298
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1299
                                               "LastCheckerStatus")
995
1300
    last_approval_request = notifychangeproperty(
996
1301
        datetime_to_dbus, "LastApprovalRequest")
997
1302
    approved_by_default = notifychangeproperty(dbus.Boolean,
998
1303
                                               "ApprovedByDefault")
999
 
    approval_delay = notifychangeproperty(dbus.UInt16,
 
1304
    approval_delay = notifychangeproperty(dbus.UInt64,
1000
1305
                                          "ApprovalDelay",
1001
1306
                                          type_func =
1002
 
                                          _timedelta_to_milliseconds)
 
1307
                                          timedelta_to_milliseconds)
1003
1308
    approval_duration = notifychangeproperty(
1004
 
        dbus.UInt16, "ApprovalDuration",
1005
 
        type_func = _timedelta_to_milliseconds)
 
1309
        dbus.UInt64, "ApprovalDuration",
 
1310
        type_func = timedelta_to_milliseconds)
1006
1311
    host = notifychangeproperty(dbus.String, "Host")
1007
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
1312
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1008
1313
                                   type_func =
1009
 
                                   _timedelta_to_milliseconds)
 
1314
                                   timedelta_to_milliseconds)
1010
1315
    extended_timeout = notifychangeproperty(
1011
 
        dbus.UInt16, "ExtendedTimeout",
1012
 
        type_func = _timedelta_to_milliseconds)
1013
 
    interval = notifychangeproperty(dbus.UInt16,
 
1316
        dbus.UInt64, "ExtendedTimeout",
 
1317
        type_func = timedelta_to_milliseconds)
 
1318
    interval = notifychangeproperty(dbus.UInt64,
1014
1319
                                    "Interval",
1015
1320
                                    type_func =
1016
 
                                    _timedelta_to_milliseconds)
 
1321
                                    timedelta_to_milliseconds)
1017
1322
    checker_command = notifychangeproperty(dbus.String, "Checker")
1018
1323
    
1019
1324
    del notifychangeproperty
1047
1352
                                       *args, **kwargs)
1048
1353
    
1049
1354
    def start_checker(self, *args, **kwargs):
1050
 
        old_checker = self.checker
1051
 
        if self.checker is not None:
1052
 
            old_checker_pid = self.checker.pid
1053
 
        else:
1054
 
            old_checker_pid = None
 
1355
        old_checker_pid = getattr(self.checker, "pid", None)
1055
1356
        r = Client.start_checker(self, *args, **kwargs)
1056
1357
        # Only if new checker process was started
1057
1358
        if (self.checker is not None
1061
1362
        return r
1062
1363
    
1063
1364
    def _reset_approved(self):
1064
 
        self._approved = None
 
1365
        self.approved = None
1065
1366
        return False
1066
1367
    
1067
1368
    def approve(self, value=True):
1068
 
        self.send_changedstate()
1069
 
        self._approved = value
1070
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1369
        self.approved = value
 
1370
        gobject.timeout_add(timedelta_to_milliseconds
1071
1371
                            (self.approval_duration),
1072
1372
                            self._reset_approved)
1073
 
    
 
1373
        self.send_changedstate()
1074
1374
    
1075
1375
    ## D-Bus methods, signals & properties
1076
1376
    _interface = "se.recompile.Mandos.Client"
1077
1377
    
 
1378
    ## Interfaces
 
1379
    
 
1380
    @dbus_interface_annotations(_interface)
 
1381
    def _foo(self):
 
1382
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1383
                     "false"}
 
1384
    
1078
1385
    ## Signals
1079
1386
    
1080
1387
    # CheckerCompleted - signal
1179
1486
                           access="readwrite")
1180
1487
    def ApprovalDuration_dbus_property(self, value=None):
1181
1488
        if value is None:       # get
1182
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1489
            return dbus.UInt64(timedelta_to_milliseconds(
1183
1490
                    self.approval_duration))
1184
1491
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1185
1492
    
1199
1506
    def Host_dbus_property(self, value=None):
1200
1507
        if value is None:       # get
1201
1508
            return dbus.String(self.host)
1202
 
        self.host = value
 
1509
        self.host = unicode(value)
1203
1510
    
1204
1511
    # Created - property
1205
1512
    @dbus_service_property(_interface, signature="s", access="read")
1206
1513
    def Created_dbus_property(self):
1207
 
        return dbus.String(datetime_to_dbus(self.created))
 
1514
        return datetime_to_dbus(self.created)
1208
1515
    
1209
1516
    # LastEnabled - property
1210
1517
    @dbus_service_property(_interface, signature="s", access="read")
1231
1538
            return
1232
1539
        return datetime_to_dbus(self.last_checked_ok)
1233
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
    
1234
1547
    # Expires - property
1235
1548
    @dbus_service_property(_interface, signature="s", access="read")
1236
1549
    def Expires_dbus_property(self):
1247
1560
    def Timeout_dbus_property(self, value=None):
1248
1561
        if value is None:       # get
1249
1562
            return dbus.UInt64(self.timeout_milliseconds())
 
1563
        old_timeout = self.timeout
1250
1564
        self.timeout = datetime.timedelta(0, 0, 0, value)
1251
 
        if getattr(self, "disable_initiator_tag", None) is None:
1252
 
            return
1253
 
        # Reschedule timeout
1254
 
        gobject.source_remove(self.disable_initiator_tag)
1255
 
        self.disable_initiator_tag = None
1256
 
        self.expires = None
1257
 
        time_to_die = _timedelta_to_milliseconds((self
1258
 
                                                  .last_checked_ok
1259
 
                                                  + self.timeout)
1260
 
                                                 - datetime.datetime
1261
 
                                                 .utcnow())
1262
 
        if time_to_die <= 0:
1263
 
            # The timeout has passed
1264
 
            self.disable()
1265
 
        else:
1266
 
            self.expires = (datetime.datetime.utcnow()
1267
 
                            + datetime.timedelta(milliseconds =
1268
 
                                                 time_to_die))
1269
 
            self.disable_initiator_tag = (gobject.timeout_add
1270
 
                                          (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))
1271
1581
    
1272
1582
    # ExtendedTimeout - property
1273
1583
    @dbus_service_property(_interface, signature="t",
1286
1596
        self.interval = datetime.timedelta(0, 0, 0, value)
1287
1597
        if getattr(self, "checker_initiator_tag", None) is None:
1288
1598
            return
1289
 
        # Reschedule checker run
1290
 
        gobject.source_remove(self.checker_initiator_tag)
1291
 
        self.checker_initiator_tag = (gobject.timeout_add
1292
 
                                      (value, self.start_checker))
1293
 
        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
1294
1605
    
1295
1606
    # Checker - property
1296
1607
    @dbus_service_property(_interface, signature="s",
1298
1609
    def Checker_dbus_property(self, value=None):
1299
1610
        if value is None:       # get
1300
1611
            return dbus.String(self.checker_command)
1301
 
        self.checker_command = value
 
1612
        self.checker_command = unicode(value)
1302
1613
    
1303
1614
    # CheckerRunning - property
1304
1615
    @dbus_service_property(_interface, signature="b",
1333
1644
            raise KeyError()
1334
1645
    
1335
1646
    def __getattribute__(self, name):
1336
 
        if(name == '_pipe'):
 
1647
        if name == '_pipe':
1337
1648
            return super(ProxyClient, self).__getattribute__(name)
1338
1649
        self._pipe.send(('getattr', name))
1339
1650
        data = self._pipe.recv()
1346
1657
            return func
1347
1658
    
1348
1659
    def __setattr__(self, name, value):
1349
 
        if(name == '_pipe'):
 
1660
        if name == '_pipe':
1350
1661
            return super(ProxyClient, self).__setattr__(name, value)
1351
1662
        self._pipe.send(('setattr', name, value))
1352
1663
 
1353
 
class ClientDBusTransitional(ClientDBus):
1354
 
    __metaclass__ = AlternateDBusNamesMetaclass
1355
1664
 
1356
1665
class ClientHandler(socketserver.BaseRequestHandler, object):
1357
1666
    """A class to handle client connections.
1394
1703
            logger.debug("Protocol version: %r", line)
1395
1704
            try:
1396
1705
                if int(line.strip().split()[0]) > 1:
1397
 
                    raise RuntimeError
 
1706
                    raise RuntimeError(line)
1398
1707
            except (ValueError, IndexError, RuntimeError) as error:
1399
1708
                logger.error("Unknown protocol version: %s", error)
1400
1709
                return
1440
1749
                            client.Rejected("Disabled")
1441
1750
                        return
1442
1751
                    
1443
 
                    if client._approved or not client.approval_delay:
 
1752
                    if client.approved or not client.approval_delay:
1444
1753
                        #We are approved or approval is disabled
1445
1754
                        break
1446
 
                    elif client._approved is None:
 
1755
                    elif client.approved is None:
1447
1756
                        logger.info("Client %s needs approval",
1448
1757
                                    client.name)
1449
1758
                        if self.server.use_dbus:
1462
1771
                    #wait until timeout or approved
1463
1772
                    time = datetime.datetime.now()
1464
1773
                    client.changedstate.acquire()
1465
 
                    (client.changedstate.wait
1466
 
                     (float(client._timedelta_to_milliseconds(delay)
1467
 
                            / 1000)))
 
1774
                    client.changedstate.wait(
 
1775
                        float(timedelta_to_milliseconds(delay)
 
1776
                              / 1000))
1468
1777
                    client.changedstate.release()
1469
1778
                    time2 = datetime.datetime.now()
1470
1779
                    if (time2 - time) >= delay:
1486
1795
                    try:
1487
1796
                        sent = session.send(client.secret[sent_size:])
1488
1797
                    except gnutls.errors.GNUTLSError as error:
1489
 
                        logger.warning("gnutls send failed")
 
1798
                        logger.warning("gnutls send failed",
 
1799
                                       exc_info=error)
1490
1800
                        return
1491
1801
                    logger.debug("Sent: %d, remaining: %d",
1492
1802
                                 sent, len(client.secret)
1495
1805
                
1496
1806
                logger.info("Sending secret to %s", client.name)
1497
1807
                # bump the timeout using extended_timeout
1498
 
                client.checked_ok(client.extended_timeout)
 
1808
                client.bump_timeout(client.extended_timeout)
1499
1809
                if self.server.use_dbus:
1500
1810
                    # Emit D-Bus signal
1501
1811
                    client.GotSecret()
1506
1816
                try:
1507
1817
                    session.bye()
1508
1818
                except gnutls.errors.GNUTLSError as error:
1509
 
                    logger.warning("GnuTLS bye failed")
 
1819
                    logger.warning("GnuTLS bye failed",
 
1820
                                   exc_info=error)
1510
1821
    
1511
1822
    @staticmethod
1512
1823
    def peer_certificate(session):
1568
1879
        # Convert the buffer to a Python bytestring
1569
1880
        fpr = ctypes.string_at(buf, buf_len.value)
1570
1881
        # Convert the bytestring to hexadecimal notation
1571
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1882
        hex_fpr = binascii.hexlify(fpr).upper()
1572
1883
        return hex_fpr
1573
1884
 
1574
1885
 
1577
1888
    def sub_process_main(self, request, address):
1578
1889
        try:
1579
1890
            self.finish_request(request, address)
1580
 
        except:
 
1891
        except Exception:
1581
1892
            self.handle_error(request, address)
1582
1893
        self.close_request(request)
1583
1894
    
1584
1895
    def process_request(self, request, address):
1585
1896
        """Start a new process to process the request."""
1586
1897
        proc = multiprocessing.Process(target = self.sub_process_main,
1587
 
                                       args = (request,
1588
 
                                               address))
 
1898
                                       args = (request, address))
1589
1899
        proc.start()
1590
1900
        return proc
1591
1901
 
1606
1916
    
1607
1917
    def add_pipe(self, parent_pipe, proc):
1608
1918
        """Dummy function; override as necessary"""
1609
 
        raise NotImplementedError
 
1919
        raise NotImplementedError()
1610
1920
 
1611
1921
 
1612
1922
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1619
1929
        use_ipv6:       Boolean; to use IPv6 or not
1620
1930
    """
1621
1931
    def __init__(self, server_address, RequestHandlerClass,
1622
 
                 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
        """
1623
1936
        self.interface = interface
1624
1937
        if use_ipv6:
1625
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.
1626
1965
        socketserver.TCPServer.__init__(self, server_address,
1627
1966
                                        RequestHandlerClass)
 
1967
    
1628
1968
    def server_bind(self):
1629
1969
        """This overrides the normal server_bind() function
1630
1970
        to bind to an interface if one was specified, and also NOT to
1638
1978
                try:
1639
1979
                    self.socket.setsockopt(socket.SOL_SOCKET,
1640
1980
                                           SO_BINDTODEVICE,
1641
 
                                           str(self.interface
1642
 
                                               + '\0'))
 
1981
                                           str(self.interface + '\0'))
1643
1982
                except socket.error as error:
1644
 
                    if error[0] == errno.EPERM:
1645
 
                        logger.error("No permission to"
1646
 
                                     " bind to interface %s",
1647
 
                                     self.interface)
1648
 
                    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:
1649
1987
                        logger.error("SO_BINDTODEVICE not available;"
1650
1988
                                     " cannot bind to interface %s",
1651
1989
                                     self.interface)
 
1990
                    elif error.errno == errno.ENODEV:
 
1991
                        logger.error("Interface %s does not exist,"
 
1992
                                     " cannot bind", self.interface)
1652
1993
                    else:
1653
1994
                        raise
1654
1995
        # Only bind(2) the socket if we really need to.
1657
1998
                if self.address_family == socket.AF_INET6:
1658
1999
                    any_address = "::" # in6addr_any
1659
2000
                else:
1660
 
                    any_address = socket.INADDR_ANY
 
2001
                    any_address = "0.0.0.0" # INADDR_ANY
1661
2002
                self.server_address = (any_address,
1662
2003
                                       self.server_address[1])
1663
2004
            elif not self.server_address[1]:
1684
2025
    """
1685
2026
    def __init__(self, server_address, RequestHandlerClass,
1686
2027
                 interface=None, use_ipv6=True, clients=None,
1687
 
                 gnutls_priority=None, use_dbus=True):
 
2028
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1688
2029
        self.enabled = False
1689
2030
        self.clients = clients
1690
2031
        if self.clients is None:
1694
2035
        IPv6_TCPServer.__init__(self, server_address,
1695
2036
                                RequestHandlerClass,
1696
2037
                                interface = interface,
1697
 
                                use_ipv6 = use_ipv6)
 
2038
                                use_ipv6 = use_ipv6,
 
2039
                                socketfd = socketfd)
1698
2040
    def server_activate(self):
1699
2041
        if self.enabled:
1700
2042
            return socketserver.TCPServer.server_activate(self)
1713
2055
    
1714
2056
    def handle_ipc(self, source, condition, parent_pipe=None,
1715
2057
                   proc = None, client_object=None):
1716
 
        condition_names = {
1717
 
            gobject.IO_IN: "IN",   # There is data to read.
1718
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1719
 
                                    # blocking).
1720
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1721
 
            gobject.IO_ERR: "ERR", # Error condition.
1722
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1723
 
                                    # broken, usually for pipes and
1724
 
                                    # sockets).
1725
 
            }
1726
 
        conditions_string = ' | '.join(name
1727
 
                                       for cond, name in
1728
 
                                       condition_names.iteritems()
1729
 
                                       if cond & condition)
1730
2058
        # error, or the other end of multiprocessing.Pipe has closed
1731
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2059
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1732
2060
            # Wait for other process to exit
1733
2061
            proc.join()
1734
2062
            return False
1792
2120
        return True
1793
2121
 
1794
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
 
1795
2222
def string_to_delta(interval):
1796
2223
    """Parse a string and return a datetime.timedelta
1797
2224
    
1808
2235
    >>> string_to_delta('5m 30s')
1809
2236
    datetime.timedelta(0, 330)
1810
2237
    """
 
2238
    
 
2239
    try:
 
2240
        return rfc3339_duration_to_delta(interval)
 
2241
    except ValueError:
 
2242
        pass
 
2243
    
1811
2244
    timevalue = datetime.timedelta(0)
1812
2245
    for s in interval.split():
1813
2246
        try:
1824
2257
            elif suffix == "w":
1825
2258
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1826
2259
            else:
1827
 
                raise ValueError("Unknown suffix %r" % suffix)
1828
 
        except (ValueError, IndexError) as e:
 
2260
                raise ValueError("Unknown suffix {0!r}"
 
2261
                                 .format(suffix))
 
2262
        except IndexError as e:
1829
2263
            raise ValueError(*(e.args))
1830
2264
        timevalue += delta
1831
2265
    return timevalue
1832
2266
 
1833
2267
 
1834
 
def if_nametoindex(interface):
1835
 
    """Call the C function if_nametoindex(), or equivalent
1836
 
    
1837
 
    Note: This function cannot accept a unicode string."""
1838
 
    global if_nametoindex
1839
 
    try:
1840
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1841
 
                          (ctypes.util.find_library("c"))
1842
 
                          .if_nametoindex)
1843
 
    except (OSError, AttributeError):
1844
 
        logger.warning("Doing if_nametoindex the hard way")
1845
 
        def if_nametoindex(interface):
1846
 
            "Get an interface index the hard way, i.e. using fcntl()"
1847
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1848
 
            with contextlib.closing(socket.socket()) as s:
1849
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1850
 
                                    struct.pack(str("16s16x"),
1851
 
                                                interface))
1852
 
            interface_index = struct.unpack(str("I"),
1853
 
                                            ifreq[16:20])[0]
1854
 
            return interface_index
1855
 
    return if_nametoindex(interface)
1856
 
 
1857
 
 
1858
2268
def daemon(nochdir = False, noclose = False):
1859
2269
    """See daemon(3).  Standard BSD Unix function.
1860
2270
    
1868
2278
        sys.exit()
1869
2279
    if not noclose:
1870
2280
        # Close all standard open file descriptors
1871
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2281
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1872
2282
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1873
2283
            raise OSError(errno.ENODEV,
1874
 
                          "%s not a character device"
1875
 
                          % os.path.devnull)
 
2284
                          "{0} not a character device"
 
2285
                          .format(os.devnull))
1876
2286
        os.dup2(null, sys.stdin.fileno())
1877
2287
        os.dup2(null, sys.stdout.fileno())
1878
2288
        os.dup2(null, sys.stderr.fileno())
1887
2297
    
1888
2298
    parser = argparse.ArgumentParser()
1889
2299
    parser.add_argument("-v", "--version", action="version",
1890
 
                        version = "%%(prog)s %s" % version,
 
2300
                        version = "%(prog)s {0}".format(version),
1891
2301
                        help="show version number and exit")
1892
2302
    parser.add_argument("-i", "--interface", metavar="IF",
1893
2303
                        help="Bind to interface IF")
1899
2309
                        help="Run self-test")
1900
2310
    parser.add_argument("--debug", action="store_true",
1901
2311
                        help="Debug mode; run in foreground and log"
1902
 
                        " to terminal")
 
2312
                        " to terminal", default=None)
1903
2313
    parser.add_argument("--debuglevel", metavar="LEVEL",
1904
2314
                        help="Debug level for stdout output")
1905
2315
    parser.add_argument("--priority", help="GnuTLS"
1912
2322
                        " files")
1913
2323
    parser.add_argument("--no-dbus", action="store_false",
1914
2324
                        dest="use_dbus", help="Do not provide D-Bus"
1915
 
                        " system bus interface")
 
2325
                        " system bus interface", default=None)
1916
2326
    parser.add_argument("--no-ipv6", action="store_false",
1917
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2327
                        dest="use_ipv6", help="Do not use IPv6",
 
2328
                        default=None)
1918
2329
    parser.add_argument("--no-restore", action="store_false",
1919
 
                        dest="restore", help="Do not restore old state",
1920
 
                        default=True)
1921
 
 
 
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
    
1922
2340
    options = parser.parse_args()
1923
2341
    
1924
2342
    if options.check:
1925
2343
        import doctest
1926
 
        doctest.testmod()
1927
 
        sys.exit()
 
2344
        fail_count, test_count = doctest.testmod()
 
2345
        sys.exit(os.EX_OK if fail_count == 0 else 1)
1928
2346
    
1929
2347
    # Default values for config file for server-global settings
1930
2348
    server_defaults = { "interface": "",
1932
2350
                        "port": "",
1933
2351
                        "debug": "False",
1934
2352
                        "priority":
1935
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2353
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1936
2354
                        "servicename": "Mandos",
1937
2355
                        "use_dbus": "True",
1938
2356
                        "use_ipv6": "True",
1939
2357
                        "debuglevel": "",
 
2358
                        "restore": "True",
 
2359
                        "socket": "",
 
2360
                        "statedir": "/var/lib/mandos",
 
2361
                        "foreground": "False",
1940
2362
                        }
1941
2363
    
1942
2364
    # Parse config file for server-global settings
1947
2369
    # Convert the SafeConfigParser object to a dict
1948
2370
    server_settings = server_config.defaults()
1949
2371
    # Use the appropriate methods on the non-string config options
1950
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2372
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1951
2373
        server_settings[option] = server_config.getboolean("DEFAULT",
1952
2374
                                                           option)
1953
2375
    if server_settings["port"]:
1954
2376
        server_settings["port"] = server_config.getint("DEFAULT",
1955
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"])
1956
2387
    del server_config
1957
2388
    
1958
2389
    # Override the settings from the config file with command line
1959
2390
    # options, if set.
1960
2391
    for option in ("interface", "address", "port", "debug",
1961
2392
                   "priority", "servicename", "configdir",
1962
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2393
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2394
                   "statedir", "socket", "foreground"):
1963
2395
        value = getattr(options, option)
1964
2396
        if value is not None:
1965
2397
            server_settings[option] = value
1968
2400
    for option in server_settings.keys():
1969
2401
        if type(server_settings[option]) is str:
1970
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
1971
2410
    # Now we have our good server settings in "server_settings"
1972
2411
    
1973
2412
    ##################################################################
1977
2416
    debuglevel = server_settings["debuglevel"]
1978
2417
    use_dbus = server_settings["use_dbus"]
1979
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)
1980
2431
    
1981
2432
    if server_settings["servicename"] != "Mandos":
1982
2433
        syslogger.setFormatter(logging.Formatter
1983
 
                               ('Mandos (%s) [%%(process)d]:'
1984
 
                                ' %%(levelname)s: %%(message)s'
1985
 
                                % server_settings["servicename"]))
 
2434
                               ('Mandos ({0}) [%(process)d]:'
 
2435
                                ' %(levelname)s: %(message)s'
 
2436
                                .format(server_settings
 
2437
                                        ["servicename"])))
1986
2438
    
1987
2439
    # Parse config file with clients
1988
 
    client_defaults = { "timeout": "5m",
1989
 
                        "extended_timeout": "15m",
1990
 
                        "interval": "2m",
1991
 
                        "checker": "fping -q -- %%(host)s",
1992
 
                        "host": "",
1993
 
                        "approval_delay": "0s",
1994
 
                        "approval_duration": "1s",
1995
 
                        }
1996
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2440
    client_config = configparser.SafeConfigParser(Client
 
2441
                                                  .client_defaults)
1997
2442
    client_config.read(os.path.join(server_settings["configdir"],
1998
2443
                                    "clients.conf"))
1999
2444
    
2008
2453
                              use_ipv6=use_ipv6,
2009
2454
                              gnutls_priority=
2010
2455
                              server_settings["priority"],
2011
 
                              use_dbus=use_dbus)
2012
 
    if not debug:
2013
 
        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
2014
2464
        try:
2015
2465
            pidfile = open(pidfilename, "w")
2016
 
        except IOError:
2017
 
            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)
2018
2469
    
2019
 
    try:
2020
 
        uid = pwd.getpwnam("_mandos").pw_uid
2021
 
        gid = pwd.getpwnam("_mandos").pw_gid
2022
 
    except KeyError:
 
2470
    for name in ("_mandos", "mandos", "nobody"):
2023
2471
        try:
2024
 
            uid = pwd.getpwnam("mandos").pw_uid
2025
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2472
            uid = pwd.getpwnam(name).pw_uid
 
2473
            gid = pwd.getpwnam(name).pw_gid
 
2474
            break
2026
2475
        except KeyError:
2027
 
            try:
2028
 
                uid = pwd.getpwnam("nobody").pw_uid
2029
 
                gid = pwd.getpwnam("nobody").pw_gid
2030
 
            except KeyError:
2031
 
                uid = 65534
2032
 
                gid = 65534
 
2476
            continue
 
2477
    else:
 
2478
        uid = 65534
 
2479
        gid = 65534
2033
2480
    try:
2034
2481
        os.setgid(gid)
2035
2482
        os.setuid(uid)
2036
2483
    except OSError as error:
2037
 
        if error[0] != errno.EPERM:
2038
 
            raise error
2039
 
    
2040
 
    if not debug and not debuglevel:
2041
 
        syslogger.setLevel(logging.WARNING)
2042
 
        console.setLevel(logging.WARNING)
2043
 
    if debuglevel:
2044
 
        level = getattr(logging, debuglevel.upper())
2045
 
        syslogger.setLevel(level)
2046
 
        console.setLevel(level)
 
2484
        if error.errno != errno.EPERM:
 
2485
            raise
2047
2486
    
2048
2487
    if debug:
2049
2488
        # Enable all possible GnuTLS debugging
2060
2499
         .gnutls_global_set_log_function(debug_gnutls))
2061
2500
        
2062
2501
        # Redirect stdin so all checkers get /dev/null
2063
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2502
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2064
2503
        os.dup2(null, sys.stdin.fileno())
2065
2504
        if null > 2:
2066
2505
            os.close(null)
2067
 
    else:
2068
 
        # No console logging
2069
 
        logger.removeHandler(console)
2070
2506
    
2071
2507
    # Need to fork before connecting to D-Bus
2072
 
    if not debug:
 
2508
    if not foreground:
2073
2509
        # Close all input and output, do double fork, etc.
2074
2510
        daemon()
2075
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
    
2076
2516
    global main_loop
2077
2517
    # From the Avahi example code
2078
 
    DBusGMainLoop(set_as_default=True )
 
2518
    DBusGMainLoop(set_as_default=True)
2079
2519
    main_loop = gobject.MainLoop()
2080
2520
    bus = dbus.SystemBus()
2081
2521
    # End of Avahi example code
2087
2527
                            ("se.bsnet.fukt.Mandos", bus,
2088
2528
                             do_not_queue=True))
2089
2529
        except dbus.exceptions.NameExistsException as e:
2090
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2530
            logger.error("Disabling D-Bus:", exc_info=e)
2091
2531
            use_dbus = False
2092
2532
            server_settings["use_dbus"] = False
2093
2533
            tcp_server.use_dbus = False
2094
2534
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2095
 
    service = AvahiService(name = server_settings["servicename"],
2096
 
                           servicetype = "_mandos._tcp",
2097
 
                           protocol = protocol, bus = bus)
 
2535
    service = AvahiServiceToSyslog(name =
 
2536
                                   server_settings["servicename"],
 
2537
                                   servicetype = "_mandos._tcp",
 
2538
                                   protocol = protocol, bus = bus)
2098
2539
    if server_settings["interface"]:
2099
2540
        service.interface = (if_nametoindex
2100
2541
                             (str(server_settings["interface"])))
2104
2545
    
2105
2546
    client_class = Client
2106
2547
    if use_dbus:
2107
 
        client_class = functools.partial(ClientDBusTransitional,
2108
 
                                         bus = bus)
2109
 
    
2110
 
    special_settings = {
2111
 
        # Some settings need to be accessd by special methods;
2112
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2113
 
        "approved_by_default":
2114
 
            lambda section:
2115
 
            client_config.getboolean(section, "approved_by_default"),
2116
 
        }
2117
 
    # Construct a new dict of client settings of this form:
2118
 
    # { client_name: {setting_name: value, ...}, ...}
2119
 
    # with exceptions for any special settings as defined above
2120
 
    client_settings = dict((clientname,
2121
 
                           dict((setting,
2122
 
                                 (value if setting not in special_settings
2123
 
                                  else special_settings[setting](clientname)))
2124
 
                                for setting, value in client_config.items(clientname)))
2125
 
                          for clientname in client_config.sections())
2126
 
    
 
2548
        client_class = functools.partial(ClientDBus, bus = bus)
 
2549
    
 
2550
    client_settings = Client.config_parser(client_config)
2127
2551
    old_client_settings = {}
2128
 
    clients_data = []
2129
 
 
 
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.
2130
2563
    if server_settings["restore"]:
2131
2564
        try:
2132
2565
            with open(stored_state_path, "rb") as stored_state:
2133
 
                clients_data, old_client_settings = pickle.load(stored_state)
 
2566
                clients_data, old_client_settings = (pickle.load
 
2567
                                                     (stored_state))
2134
2568
            os.remove(stored_state_path)
2135
2569
        except IOError as e:
2136
 
            logger.warning("Could not load persistant state: {0}".format(e))
2137
 
            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)
2138
2576
                raise
2139
 
 
2140
 
    for client in clients_data:
2141
 
        client_name = client["name"]
2142
 
        
2143
 
        # Decide which value to use after restoring saved state.
2144
 
        # We have three different values: Old config file,
2145
 
        # new config file, and saved state.
2146
 
        # New config value takes precedence if it differs from old
2147
 
        # config value, otherwise use saved state.
2148
 
        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))
2149
2631
            try:
2150
 
                # For each value in new config, check if it differs
2151
 
                # from the old config value (Except for the "secret"
2152
 
                # attribute)
2153
 
                if name != "secret" and value != old_client_settings[client_name][name]:
2154
 
                    setattr(client, name, value)
2155
 
            except KeyError:
2156
 
                pass
2157
 
 
2158
 
        # Clients who has passed its expire date, can still be enabled if its
2159
 
        # last checker was sucessful. Clients who checkers failed before we
2160
 
        # stored it state is asumed to had failed checker during downtime.
2161
 
        if client["enabled"] and client["last_checked_ok"]:
2162
 
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2163
 
                > client["interval"]):
2164
 
                if client["last_checker_status"] != 0:
2165
 
                    client["enabled"] = False
2166
 
                else:
2167
 
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2168
 
 
2169
 
        client["changedstate"] = (multiprocessing_manager
2170
 
                                  .Condition(multiprocessing_manager
2171
 
                                             .Lock()))
2172
 
        if use_dbus:
2173
 
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2174
 
            tcp_server.clients[client_name] = new_client
2175
 
            new_client.bus = bus
2176
 
            for name, value in client.iteritems():
2177
 
                setattr(new_client, name, value)
2178
 
            client_object_name = unicode(client_name).translate(
2179
 
                {ord("."): ord("_"),
2180
 
                 ord("-"): ord("_")})
2181
 
            new_client.dbus_object_path = (dbus.ObjectPath
2182
 
                                     ("/clients/" + client_object_name))
2183
 
            DBusObjectWithProperties.__init__(new_client,
2184
 
                                              new_client.bus,
2185
 
                                              new_client.dbus_object_path)
2186
 
        else:
2187
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2188
 
            for name, value in client.iteritems():
2189
 
                setattr(tcp_server.clients[client_name], name, value)
2190
 
                
2191
 
        tcp_server.clients[client_name].decrypt_secret(
2192
 
            client_settings[client_name]["secret"])            
2193
 
        
2194
 
    # Create/remove clients based on new changes made to config
2195
 
    for clientname in set(old_client_settings) - set(client_settings):
2196
 
        del tcp_server.clients[clientname]
2197
 
    for clientname in set(client_settings) - set(old_client_settings):
2198
 
        tcp_server.clients[clientname] = (client_class(name = clientname,
2199
 
                                                       config =
2200
 
                                                       client_settings
2201
 
                                                       [clientname]))
2202
 
    
2203
 
 
 
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
    
2204
2657
    if not tcp_server.clients:
2205
2658
        logger.warning("No clients defined")
2206
 
        
2207
 
    if not debug:
2208
 
        try:
2209
 
            with pidfile:
2210
 
                pid = os.getpid()
2211
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2212
 
            del pidfile
2213
 
        except IOError:
2214
 
            logger.error("Could not write to file %r with PID %d",
2215
 
                         pidfilename, pid)
2216
 
        except NameError:
2217
 
            # "pidfile" was never created
2218
 
            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
2219
2670
        del pidfilename
2220
 
        
2221
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2222
2671
    
2223
2672
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2224
2673
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2225
2674
    
2226
2675
    if use_dbus:
2227
 
        class MandosDBusService(dbus.service.Object):
 
2676
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2677
                                        "se.bsnet.fukt.Mandos"})
 
2678
        class MandosDBusService(DBusObjectWithProperties):
2228
2679
            """A D-Bus proxy object"""
2229
2680
            def __init__(self):
2230
2681
                dbus.service.Object.__init__(self, bus, "/")
2231
2682
            _interface = "se.recompile.Mandos"
2232
2683
            
 
2684
            @dbus_interface_annotations(_interface)
 
2685
            def _foo(self):
 
2686
                return { "org.freedesktop.DBus.Property"
 
2687
                         ".EmitsChangedSignal":
 
2688
                             "false"}
 
2689
            
2233
2690
            @dbus.service.signal(_interface, signature="o")
2234
2691
            def ClientAdded(self, objpath):
2235
2692
                "D-Bus signal"
2277
2734
            
2278
2735
            del _interface
2279
2736
        
2280
 
        class MandosDBusServiceTransitional(MandosDBusService):
2281
 
            __metaclass__ = AlternateDBusNamesMetaclass
2282
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2737
        mandos_dbus_service = MandosDBusService()
2283
2738
    
2284
2739
    def cleanup():
2285
2740
        "Cleanup function; run on exit"
2286
2741
        service.cleanup()
2287
2742
        
2288
2743
        multiprocessing.active_children()
 
2744
        wnull.close()
2289
2745
        if not (tcp_server.clients or client_settings):
2290
2746
            return
2291
 
 
2292
 
        # Store client before exiting. Secrets are encrypted with key based
2293
 
        # on what config file has. If config file is removed/edited, old
2294
 
        # secret will thus be unrecovable.
2295
 
        clients = []
2296
 
        for client in tcp_server.clients.itervalues():
2297
 
            client.encrypt_secret(client_settings[client.name]["secret"])
2298
 
 
2299
 
            client_dict = {}
2300
 
 
2301
 
            # A list of attributes that will not be stored when shuting down.
2302
 
            exclude = set(("bus", "changedstate", "secret"))            
2303
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2304
 
                exclude.add(name)
2305
 
                
2306
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2307
 
            for attr in client.client_structure:
2308
 
                if attr not in exclude:
2309
 
                    client_dict[attr] = getattr(client, attr)
2310
 
 
2311
 
            clients.append(client_dict) 
2312
 
            del client_settings[client.name]["secret"]
2313
 
            
 
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
        
2314
2776
        try:
2315
 
            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:
2316
2781
                pickle.dump((clients, client_settings), stored_state)
2317
 
        except IOError as e:
2318
 
            logger.warning("Could not save persistant state: {0}".format(e))
2319
 
            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)
2320
2796
                raise
2321
 
 
 
2797
        
2322
2798
        # Delete all clients, and settings from config
2323
2799
        while tcp_server.clients:
2324
2800
            name, client = tcp_server.clients.popitem()
2329
2805
            if use_dbus:
2330
2806
                # Emit D-Bus signal
2331
2807
                mandos_dbus_service.ClientRemoved(client
2332
 
                                              .dbus_object_path,
2333
 
                                              client.name)
 
2808
                                                  .dbus_object_path,
 
2809
                                                  client.name)
2334
2810
        client_settings.clear()
2335
2811
    
2336
2812
    atexit.register(cleanup)
2342
2818
        # Need to initiate checking of clients
2343
2819
        if client.enabled:
2344
2820
            client.init_checker()
2345
 
 
2346
2821
    
2347
2822
    tcp_server.enable()
2348
2823
    tcp_server.server_activate()
2351
2826
    service.port = tcp_server.socket.getsockname()[1]
2352
2827
    if use_ipv6:
2353
2828
        logger.info("Now listening on address %r, port %d,"
2354
 
                    " flowinfo %d, scope_id %d"
2355
 
                    % tcp_server.socket.getsockname())
 
2829
                    " flowinfo %d, scope_id %d",
 
2830
                    *tcp_server.socket.getsockname())
2356
2831
    else:                       # IPv4
2357
 
        logger.info("Now listening on address %r, port %d"
2358
 
                    % tcp_server.socket.getsockname())
 
2832
        logger.info("Now listening on address %r, port %d",
 
2833
                    *tcp_server.socket.getsockname())
2359
2834
    
2360
2835
    #service.interface = tcp_server.socket.getsockname()[3]
2361
2836
    
2364
2839
        try:
2365
2840
            service.activate()
2366
2841
        except dbus.exceptions.DBusException as error:
2367
 
            logger.critical("DBusException: %s", error)
 
2842
            logger.critical("D-Bus Exception", exc_info=error)
2368
2843
            cleanup()
2369
2844
            sys.exit(1)
2370
2845
        # End of Avahi example code
2377
2852
        logger.debug("Starting main loop")
2378
2853
        main_loop.run()
2379
2854
    except AvahiError as error:
2380
 
        logger.critical("AvahiError: %s", error)
 
2855
        logger.critical("Avahi Error", exc_info=error)
2381
2856
        cleanup()
2382
2857
        sys.exit(1)
2383
2858
    except KeyboardInterrupt:
2388
2863
    # Must run before the D-Bus bus name gets deregistered
2389
2864
    cleanup()
2390
2865
 
2391
 
 
2392
2866
if __name__ == '__main__':
2393
2867
    main()