/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-27 14:15:40 UTC
  • Revision ID: teddy@recompile.se-20111227141540-ajrabf33q59jfa7t
Reorder TODO entries

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