/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-08-10 09:00:23 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150810090023-fz6vjqr7zf33e2tf
Support the standard org.freedesktop.DBus.ObjectManager interface.

Now that the D-Bus standard has an interface to keep track of new and
removed objects, use that instead of our own methods.  This deprecates
our D-Bus methods "GetAllClients" and "GetAllClientsWithProperties"
and the signals "ClientAdded" and "ClientRemoved", all on the server
interface "se.recompile.Mandos".

* DBUS-API: Removed references to deprecated methods and signals;
  insert reference to the org.freedesktop.DBus.ObjectManager
  interface.
* mandos (DBusObjectWithProperties._get_all_interface_names): New.
  (dbus.OBJECT_MANAGER_IFACE): If not present, monkey patch.
  (DBusObjectWithObjectManager): New.
  (main/MandosDBusService): Inherit from DBusObjectWithObjectManager.
  (main/MandosDBusService.ClientRemoved): Annotate as deprecated.
  (main/MandosDBusService.GetAllClients): - '' -
  (main/MandosDBusService.GetAllClientsWithProperties): Annotate as
                                                        deprecated.
                                                        Also only
                                                        return
                                                        properties on
                                                        client
                                                        interface.
  (main/MandosDBusService.RemoveClient): Call client_removed_signal
                                         instead of ClientRemoved.
  (main/MandosDBusService.GetManagedObjects): New.
  (main/MandosDBusService.client_added_signal): New.
  (main/MandosDBusService.client_removed_signal): - '' -
  (main/cleanup): Call "client_removed_signal" instead of sending
                  "ClientRemoved" signal directly.
  (main): Call "client_added_signal" instead of sending "ClientAdded"
          signal directly.
* mandos-ctl: Use GetManagedObjects instead of
              GetAllClientsWithProperties.  Also, show better error
              message in case of failure to connect to the D-Bus

* mandos-monitor (MandosClientPropertyCache.properties_changed):
  Bug fix; only update properties on client interface.
  (UserInterface.find_and_remove_client): Change to accept arguments
                                          from InterfacesRemoved
                                          signal.  Also, bug fix:
                                          working error message when
                                          removing unknown client.
  (UserInterface.add_new_client): Change to accept arguments from
                                  InterfacesRemoved signal.  Pass
                                  properties to MandosClientWidget
                                  constructor.
  (UserInterface.run): Connect find_and_remove_client method to
                       InterfacesRemoved signal and the add_new_client
                       method to the InterfacesAdded signal.

Show diffs side-by-side

added added

removed removed

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