/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: 2012-02-21 21:27:14 UTC
  • mfrom: (237.6.1 nmu)
  • mto: (237.4.31 release)
  • mto: This revision was merged to the branch mainline in revision 560.
  • Revision ID: teddy@recompile.se-20120221212714-40iub281d4yvrk9r
Tags: version-1.5.3-1.1
Merge NMU change.

Show diffs side-by-side

added added

removed removed

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