/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

Change "fukt.bsnet.se" to "recompile.se" throughout.

* README: - '' -
* debian/control: - '' -
* debian/copyright: - '' -
* debian/mandos-client.README.Debian: - '' - and some rewriting.
* debian/mandos.README.Debian: - '' -
* debian/watch: Change "fukt.bsnet.se" to "recompile.se".
* init.d-mandos: - '' -
* intro.xml: - '' -
* mandos: - '' -
* mandos-clients.conf.xml: - '' -
* mandos-ctl: - '' -
* mandos-ctl.xml: - '' -
* mandos-keygen: - '' -
* mandos-keygen.xml: - '' -
* mandos-monitor: - '' -
* mandos-monitor.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.lsm: - '' -
* mandos.xml: - '' -
* plugin-runner.c: - '' -
* plugin-runner.xml: - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/askpass-fifo.xml: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugins.d/plymouth.c: - '' -
* plugins.d/plymouth.xml: - '' -
* plugins.d/splashy.c: - '' -
* plugins.d/splashy.xml: - '' -
* plugins.d/usplash.c: - '' -
* plugins.d/usplash.xml: - '' -

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