/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: Björn Påhlsson
  • Date: 2011-11-09 17:16:03 UTC
  • mfrom: (518.1.1 mandos-persistent)
  • Revision ID: belorn@fukt.bsnet.se-20111109171603-srz21uoclpldp5ve
merge persistent state

Show diffs side-by-side

added added

removed removed

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