/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: 2015-07-09 20:36:29 UTC
  • Revision ID: teddy@recompile.se-20150709203629-439gfk6812u1azp3
Rename the "client-dhparams.pem" file to simply "dhparams.pem".

* debian/mandos-client.postinst: Rename the "client-dhparams.pem" file
                                 to "dhparams.pem".
* initramfs-tools-hook: - '' -
* plugins.d/mandos-client.c (main): - '' -

Show diffs side-by-side

added added

removed removed

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