/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-12-30 18:26:04 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111230182604-9p8e7u03xd0n1u0c
* network-hooks.d/wireless.conf: Better example code.

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