/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-11-26 19:17:31 UTC
  • mto: (518.2.5 persistent-state-gpgme)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126191731-738srhvt9wdkxbbc
* mandos: Break long lines and fix some more white space.

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