/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: 2011-12-30 18:48:49 UTC
  • mto: (237.7.89 trunk)
  • mto: This revision was merged to the branch mainline in revision 290.
  • Revision ID: teddy@recompile.se-20111230184849-fvec587apz6j54pn
* plugins.d/mandos-client.c (run_network_hooks): Bug fix: setenv()
                                                 takes three
                                                 arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python3 -bI
2
 
# -*- coding: utf-8; lexical-binding: t -*-
3
 
#
 
1
#!/usr/bin/python
 
2
# -*- mode: python; coding: utf-8 -*-
 
3
4
4
# Mandos server - give out binary blobs to connecting clients.
5
 
#
 
5
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
12
 
#
 
12
13
13
# Everything else is
14
 
# Copyright © 2008-2022 Teddy Hogeborn
15
 
# Copyright © 2008-2022 Björn Påhlsson
16
 
#
17
 
# This file is part of Mandos.
18
 
#
19
 
# Mandos is free software: you can redistribute it and/or modify it
20
 
# under the terms of the GNU General Public License as published by
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
 
16
 
17
# This program is free software: you can redistribute it and/or modify
 
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
23
21
#
24
 
#     Mandos is distributed in the hope that it will be useful, but
25
 
#     WITHOUT ANY WARRANTY; without even the implied warranty of
 
22
#     This program is distributed in the hope that it will be useful,
 
23
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
27
25
#     GNU General Public License for more details.
28
 
#
 
26
29
27
# You should have received a copy of the GNU General Public License
30
 
# along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
31
 
#
 
28
# along with this program.  If not, see
 
29
# <http://www.gnu.org/licenses/>.
 
30
32
31
# Contact the authors at <mandos@recompile.se>.
33
 
#
 
32
 
33
 
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
try:
38
 
    from future_builtins import *
39
 
except ImportError:
40
 
    pass
41
 
 
42
 
import sys
43
 
import unittest
 
37
import SocketServer as socketserver
 
38
import socket
44
39
import argparse
45
 
import logging
46
 
import os
47
 
try:
48
 
    import SocketServer as socketserver
49
 
except ImportError:
50
 
    import socketserver
51
 
import socket
52
40
import datetime
53
41
import errno
54
 
try:
55
 
    import ConfigParser as configparser
56
 
except ImportError:
57
 
    import configparser
 
42
import gnutls.crypto
 
43
import gnutls.connection
 
44
import gnutls.errors
 
45
import gnutls.library.functions
 
46
import gnutls.library.constants
 
47
import gnutls.library.types
 
48
import ConfigParser as configparser
 
49
import sys
58
50
import re
 
51
import os
59
52
import signal
60
53
import subprocess
61
54
import atexit
62
55
import stat
 
56
import logging
63
57
import logging.handlers
64
58
import pwd
65
59
import contextlib
66
60
import struct
67
61
import fcntl
68
62
import functools
69
 
try:
70
 
    import cPickle as pickle
71
 
except ImportError:
72
 
    import pickle
 
63
import cPickle as pickle
73
64
import multiprocessing
74
65
import types
75
66
import binascii
76
67
import tempfile
77
 
import itertools
78
 
import collections
79
 
import codecs
80
 
import random
81
 
import shlex
82
68
 
83
69
import dbus
84
70
import dbus.service
85
 
import gi
86
 
from gi.repository import GLib
 
71
import gobject
 
72
import avahi
87
73
from dbus.mainloop.glib import DBusGMainLoop
88
74
import ctypes
89
75
import ctypes.util
90
76
import xml.dom.minidom
91
77
import inspect
92
 
 
93
 
if sys.version_info.major == 2:
94
 
    __metaclass__ = type
95
 
    str = unicode
96
 
    input = raw_input
97
 
 
98
 
# Add collections.abc.Callable if it does not exist
99
 
try:
100
 
    collections.abc.Callable
101
 
except AttributeError:
102
 
    class abc:
103
 
        Callable = collections.Callable
104
 
    collections.abc = abc
105
 
    del abc
106
 
 
107
 
# Add shlex.quote if it does not exist
108
 
try:
109
 
    shlex.quote
110
 
except AttributeError:
111
 
    shlex.quote = re.escape
112
 
 
113
 
# Show warnings by default
114
 
if not sys.warnoptions:
115
 
    import warnings
116
 
    warnings.simplefilter("default")
117
 
 
118
 
# Try to find the value of SO_BINDTODEVICE:
119
 
try:
120
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
121
 
    # newer, and it is also the most natural place for it:
 
78
import GnuPGInterface
 
79
 
 
80
try:
122
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
123
82
except AttributeError:
124
83
    try:
125
 
        # This is where SO_BINDTODEVICE was up to and including Python
126
 
        # 2.6, and also 3.2:
127
84
        from IN import SO_BINDTODEVICE
128
85
    except ImportError:
129
 
        # In Python 2.7 it seems to have been removed entirely.
130
 
        # Try running the C preprocessor:
131
 
        try:
132
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
133
 
                                   "/dev/stdin"],
134
 
                                  stdin=subprocess.PIPE,
135
 
                                  stdout=subprocess.PIPE)
136
 
            stdout = cc.communicate(
137
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
138
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
139
 
        except (OSError, ValueError, IndexError):
140
 
            # No value found
141
 
            SO_BINDTODEVICE = None
142
 
 
143
 
if sys.version_info < (3, 2):
144
 
    configparser.Configparser = configparser.SafeConfigParser
145
 
 
146
 
version = "1.8.15"
 
86
        SO_BINDTODEVICE = None
 
87
 
 
88
version = "1.4.1"
147
89
stored_state_file = "clients.pickle"
148
90
 
149
 
log = logging.getLogger(os.path.basename(sys.argv[0]))
150
 
logging.captureWarnings(True)   # Show warnings via the logging system
151
 
syslogger = None
 
91
logger = logging.getLogger()
 
92
syslogger = (logging.handlers.SysLogHandler
 
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
94
              address = str("/dev/log")))
152
95
 
153
96
try:
154
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
155
 
        ctypes.util.find_library("c")).if_nametoindex
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
156
100
except (OSError, AttributeError):
157
 
 
158
101
    def if_nametoindex(interface):
159
102
        "Get an interface index the hard way, i.e. using fcntl()"
160
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
161
104
        with contextlib.closing(socket.socket()) as s:
162
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
163
 
                                struct.pack(b"16s16x", interface))
164
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
165
110
        return interface_index
166
111
 
167
112
 
168
 
def copy_function(func):
169
 
    """Make a copy of a function"""
170
 
    if sys.version_info.major == 2:
171
 
        return types.FunctionType(func.func_code,
172
 
                                  func.func_globals,
173
 
                                  func.func_name,
174
 
                                  func.func_defaults,
175
 
                                  func.func_closure)
176
 
    else:
177
 
        return types.FunctionType(func.__code__,
178
 
                                  func.__globals__,
179
 
                                  func.__name__,
180
 
                                  func.__defaults__,
181
 
                                  func.__closure__)
182
 
 
183
 
 
184
113
def initlogger(debug, level=logging.WARNING):
185
114
    """init logger and add loglevel"""
186
 
 
187
 
    global syslogger
188
 
    syslogger = (logging.handlers.SysLogHandler(
189
 
        facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
 
        address="/dev/log"))
 
115
    
191
116
    syslogger.setFormatter(logging.Formatter
192
 
                           ("Mandos [%(process)d]: %(levelname)s:"
193
 
                            " %(message)s"))
194
 
    log.addHandler(syslogger)
195
 
 
 
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
118
                            ' %(message)s'))
 
119
    logger.addHandler(syslogger)
 
120
    
196
121
    if debug:
197
122
        console = logging.StreamHandler()
198
 
        console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
199
 
                                               " [%(process)d]:"
200
 
                                               " %(levelname)s:"
201
 
                                               " %(message)s"))
202
 
        log.addHandler(console)
203
 
    log.setLevel(level)
 
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                               ' [%(process)d]:'
 
125
                                               ' %(levelname)s:'
 
126
                                               ' %(message)s'))
 
127
        logger.addHandler(console)
 
128
    logger.setLevel(level)
204
129
 
205
130
 
206
131
class PGPError(Exception):
208
133
    pass
209
134
 
210
135
 
211
 
class PGPEngine:
 
136
class PGPEngine(object):
212
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
213
 
 
214
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
215
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
216
 
        self.gpg = "gpg"
217
 
        try:
218
 
            output = subprocess.check_output(["gpgconf"])
219
 
            for line in output.splitlines():
220
 
                name, text, path = line.split(b":")
221
 
                if name == b"gpg":
222
 
                    self.gpg = path
223
 
                    break
224
 
        except OSError as e:
225
 
            if e.errno != errno.ENOENT:
226
 
                raise
227
 
        self.gnupgargs = ["--batch",
228
 
                          "--homedir", self.tempdir,
229
 
                          "--force-mdc",
230
 
                          "--quiet"]
231
 
        # Only GPG version 1 has the --no-use-agent option.
232
 
        if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
233
 
            self.gnupgargs.append("--no-use-agent")
234
 
 
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet'])
 
146
    
235
147
    def __enter__(self):
236
148
        return self
237
 
 
238
 
    def __exit__(self, exc_type, exc_value, traceback):
 
149
    
 
150
    def __exit__ (self, exc_type, exc_value, traceback):
239
151
        self._cleanup()
240
152
        return False
241
 
 
 
153
    
242
154
    def __del__(self):
243
155
        self._cleanup()
244
 
 
 
156
    
245
157
    def _cleanup(self):
246
158
        if self.tempdir is not None:
247
159
            # Delete contents of tempdir
248
160
            for root, dirs, files in os.walk(self.tempdir,
249
 
                                             topdown=False):
 
161
                                             topdown = False):
250
162
                for filename in files:
251
163
                    os.remove(os.path.join(root, filename))
252
164
                for dirname in dirs:
254
166
            # Remove tempdir
255
167
            os.rmdir(self.tempdir)
256
168
            self.tempdir = None
257
 
 
 
169
    
258
170
    def password_encode(self, password):
259
171
        # Passphrase can not be empty and can not contain newlines or
260
172
        # NUL bytes.  So we prefix it and hex encode it.
261
 
        encoded = b"mandos" + binascii.hexlify(password)
262
 
        if len(encoded) > 2048:
263
 
            # GnuPG can't handle long passwords, so encode differently
264
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
265
 
                       .replace(b"\n", b"\\n")
266
 
                       .replace(b"\0", b"\\x00"))
267
 
        return encoded
268
 
 
 
173
        return b"mandos" + binascii.hexlify(password)
 
174
    
269
175
    def encrypt(self, data, password):
270
 
        passphrase = self.password_encode(password)
271
 
        with tempfile.NamedTemporaryFile(
272
 
                dir=self.tempdir) as passfile:
273
 
            passfile.write(passphrase)
274
 
            passfile.flush()
275
 
            proc = subprocess.Popen([self.gpg, "--symmetric",
276
 
                                     "--passphrase-file",
277
 
                                     passfile.name]
278
 
                                    + self.gnupgargs,
279
 
                                    stdin=subprocess.PIPE,
280
 
                                    stdout=subprocess.PIPE,
281
 
                                    stderr=subprocess.PIPE)
282
 
            ciphertext, err = proc.communicate(input=data)
283
 
        if proc.returncode != 0:
284
 
            raise PGPError(err)
 
176
        self.gnupg.passphrase = self.password_encode(password)
 
177
        with open(os.devnull) as devnull:
 
178
            try:
 
179
                proc = self.gnupg.run(['--symmetric'],
 
180
                                      create_fhs=['stdin', 'stdout'],
 
181
                                      attach_fhs={'stderr': devnull})
 
182
                with contextlib.closing(proc.handles['stdin']) as f:
 
183
                    f.write(data)
 
184
                with contextlib.closing(proc.handles['stdout']) as f:
 
185
                    ciphertext = f.read()
 
186
                proc.wait()
 
187
            except IOError as e:
 
188
                raise PGPError(e)
 
189
        self.gnupg.passphrase = None
285
190
        return ciphertext
286
 
 
 
191
    
287
192
    def decrypt(self, data, password):
288
 
        passphrase = self.password_encode(password)
289
 
        with tempfile.NamedTemporaryFile(
290
 
                dir=self.tempdir) as passfile:
291
 
            passfile.write(passphrase)
292
 
            passfile.flush()
293
 
            proc = subprocess.Popen([self.gpg, "--decrypt",
294
 
                                     "--passphrase-file",
295
 
                                     passfile.name]
296
 
                                    + self.gnupgargs,
297
 
                                    stdin=subprocess.PIPE,
298
 
                                    stdout=subprocess.PIPE,
299
 
                                    stderr=subprocess.PIPE)
300
 
            decrypted_plaintext, err = proc.communicate(input=data)
301
 
        if proc.returncode != 0:
302
 
            raise PGPError(err)
 
193
        self.gnupg.passphrase = self.password_encode(password)
 
194
        with open(os.devnull) as devnull:
 
195
            try:
 
196
                proc = self.gnupg.run(['--decrypt'],
 
197
                                      create_fhs=['stdin', 'stdout'],
 
198
                                      attach_fhs={'stderr': devnull})
 
199
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
200
                    f.write(data)
 
201
                with contextlib.closing(proc.handles['stdout']) as f:
 
202
                    decrypted_plaintext = f.read()
 
203
                proc.wait()
 
204
            except IOError as e:
 
205
                raise PGPError(e)
 
206
        self.gnupg.passphrase = None
303
207
        return decrypted_plaintext
304
208
 
305
209
 
306
 
# Pretend that we have an Avahi module
307
 
class avahi:
308
 
    """This isn't so much a class as it is a module-like namespace."""
309
 
    IF_UNSPEC = -1               # avahi-common/address.h
310
 
    PROTO_UNSPEC = -1            # avahi-common/address.h
311
 
    PROTO_INET = 0               # avahi-common/address.h
312
 
    PROTO_INET6 = 1              # avahi-common/address.h
313
 
    DBUS_NAME = "org.freedesktop.Avahi"
314
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
 
    DBUS_PATH_SERVER = "/"
317
 
 
318
 
    @staticmethod
319
 
    def string_array_to_txt_array(t):
320
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
 
                           for s in t), signature="ay")
322
 
    ENTRY_GROUP_ESTABLISHED = 2  # avahi-common/defs.h
323
 
    ENTRY_GROUP_COLLISION = 3    # avahi-common/defs.h
324
 
    ENTRY_GROUP_FAILURE = 4      # avahi-common/defs.h
325
 
    SERVER_INVALID = 0           # avahi-common/defs.h
326
 
    SERVER_REGISTERING = 1       # avahi-common/defs.h
327
 
    SERVER_RUNNING = 2           # avahi-common/defs.h
328
 
    SERVER_COLLISION = 3         # avahi-common/defs.h
329
 
    SERVER_FAILURE = 4           # avahi-common/defs.h
330
 
 
331
210
 
332
211
class AvahiError(Exception):
333
212
    def __init__(self, value, *args, **kwargs):
334
213
        self.value = value
335
 
        return super(AvahiError, self).__init__(value, *args,
336
 
                                                **kwargs)
337
 
 
 
214
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
215
    def __unicode__(self):
 
216
        return unicode(repr(self.value))
338
217
 
339
218
class AvahiServiceError(AvahiError):
340
219
    pass
341
220
 
342
 
 
343
221
class AvahiGroupError(AvahiError):
344
222
    pass
345
223
 
346
224
 
347
 
class AvahiService:
 
225
class AvahiService(object):
348
226
    """An Avahi (Zeroconf) service.
349
 
 
 
227
    
350
228
    Attributes:
351
229
    interface: integer; avahi.IF_UNSPEC or an interface index.
352
230
               Used to optionally bind to the specified interface.
353
 
    name: string; Example: "Mandos"
354
 
    type: string; Example: "_mandos._tcp".
355
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
231
    name: string; Example: 'Mandos'
 
232
    type: string; Example: '_mandos._tcp'.
 
233
                  See <http://www.dns-sd.org/ServiceTypes.html>
356
234
    port: integer; what port to announce
357
235
    TXT: list of strings; TXT record for the service
358
236
    domain: string; Domain to publish on, default to .local if empty.
364
242
    server: D-Bus Server
365
243
    bus: dbus.SystemBus()
366
244
    """
367
 
 
368
 
    def __init__(self,
369
 
                 interface=avahi.IF_UNSPEC,
370
 
                 name=None,
371
 
                 servicetype=None,
372
 
                 port=None,
373
 
                 TXT=None,
374
 
                 domain="",
375
 
                 host="",
376
 
                 max_renames=32768,
377
 
                 protocol=avahi.PROTO_UNSPEC,
378
 
                 bus=None):
 
245
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
246
                 servicetype = None, port = None, TXT = None,
 
247
                 domain = "", host = "", max_renames = 32768,
 
248
                 protocol = avahi.PROTO_UNSPEC, bus = None):
379
249
        self.interface = interface
380
250
        self.name = name
381
251
        self.type = servicetype
390
260
        self.server = None
391
261
        self.bus = bus
392
262
        self.entry_group_state_changed_match = None
393
 
 
394
 
    def rename(self, remove=True):
 
263
    def rename(self):
395
264
        """Derived from the Avahi example code"""
396
265
        if self.rename_count >= self.max_renames:
397
 
            log.critical("No suitable Zeroconf service name found"
398
 
                         " after %i retries, exiting.",
399
 
                         self.rename_count)
 
266
            logger.critical("No suitable Zeroconf service name found"
 
267
                            " after %i retries, exiting.",
 
268
                            self.rename_count)
400
269
            raise AvahiServiceError("Too many renames")
401
 
        self.name = str(
402
 
            self.server.GetAlternativeServiceName(self.name))
 
270
        self.name = unicode(self.server
 
271
                            .GetAlternativeServiceName(self.name))
 
272
        logger.info("Changing Zeroconf service name to %r ...",
 
273
                    self.name)
 
274
        self.remove()
 
275
        try:
 
276
            self.add()
 
277
        except dbus.exceptions.DBusException as error:
 
278
            logger.critical("DBusException: %s", error)
 
279
            self.cleanup()
 
280
            os._exit(1)
403
281
        self.rename_count += 1
404
 
        log.info("Changing Zeroconf service name to %r ...",
405
 
                 self.name)
406
 
        if remove:
407
 
            self.remove()
408
 
        try:
409
 
            self.add()
410
 
        except dbus.exceptions.DBusException as error:
411
 
            if (error.get_dbus_name()
412
 
                == "org.freedesktop.Avahi.CollisionError"):
413
 
                log.info("Local Zeroconf service name collision.")
414
 
                return self.rename(remove=False)
415
 
            else:
416
 
                log.critical("D-Bus Exception", exc_info=error)
417
 
                self.cleanup()
418
 
                os._exit(1)
419
 
 
420
282
    def remove(self):
421
283
        """Derived from the Avahi example code"""
422
284
        if self.entry_group_state_changed_match is not None:
424
286
            self.entry_group_state_changed_match = None
425
287
        if self.group is not None:
426
288
            self.group.Reset()
427
 
 
428
289
    def add(self):
429
290
        """Derived from the Avahi example code"""
430
291
        self.remove()
435
296
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
297
        self.entry_group_state_changed_match = (
437
298
            self.group.connect_to_signal(
438
 
                "StateChanged", self.entry_group_state_changed))
439
 
        log.debug("Adding Zeroconf service '%s' of type '%s' ...",
440
 
                  self.name, self.type)
 
299
                'StateChanged', self.entry_group_state_changed))
 
300
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
301
                     self.name, self.type)
441
302
        self.group.AddService(
442
303
            self.interface,
443
304
            self.protocol,
447
308
            dbus.UInt16(self.port),
448
309
            avahi.string_array_to_txt_array(self.TXT))
449
310
        self.group.Commit()
450
 
 
451
311
    def entry_group_state_changed(self, state, error):
452
312
        """Derived from the Avahi example code"""
453
 
        log.debug("Avahi entry group state change: %i", state)
454
 
 
 
313
        logger.debug("Avahi entry group state change: %i", state)
 
314
        
455
315
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
456
 
            log.debug("Zeroconf service established.")
 
316
            logger.debug("Zeroconf service established.")
457
317
        elif state == avahi.ENTRY_GROUP_COLLISION:
458
 
            log.info("Zeroconf service name collision.")
 
318
            logger.info("Zeroconf service name collision.")
459
319
            self.rename()
460
320
        elif state == avahi.ENTRY_GROUP_FAILURE:
461
 
            log.critical("Avahi: Error in group state changed %s",
462
 
                         str(error))
463
 
            raise AvahiGroupError("State changed: {!s}".format(error))
464
 
 
 
321
            logger.critical("Avahi: Error in group state changed %s",
 
322
                            unicode(error))
 
323
            raise AvahiGroupError("State changed: %s"
 
324
                                  % unicode(error))
465
325
    def cleanup(self):
466
326
        """Derived from the Avahi example code"""
467
327
        if self.group is not None:
472
332
                pass
473
333
            self.group = None
474
334
        self.remove()
475
 
 
476
335
    def server_state_changed(self, state, error=None):
477
336
        """Derived from the Avahi example code"""
478
 
        log.debug("Avahi server state change: %i", state)
479
 
        bad_states = {
480
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
481
 
            avahi.SERVER_REGISTERING: None,
482
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
483
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
484
 
        }
 
337
        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" }
485
345
        if state in bad_states:
486
346
            if bad_states[state] is not None:
487
347
                if error is None:
488
 
                    log.error(bad_states[state])
 
348
                    logger.error(bad_states[state])
489
349
                else:
490
 
                    log.error(bad_states[state] + ": %r", error)
 
350
                    logger.error(bad_states[state] + ": %r", error)
491
351
            self.cleanup()
492
352
        elif state == avahi.SERVER_RUNNING:
493
 
            try:
494
 
                self.add()
495
 
            except dbus.exceptions.DBusException as error:
496
 
                if (error.get_dbus_name()
497
 
                    == "org.freedesktop.Avahi.CollisionError"):
498
 
                    log.info("Local Zeroconf service name collision.")
499
 
                    return self.rename(remove=False)
500
 
                else:
501
 
                    log.critical("D-Bus Exception", exc_info=error)
502
 
                    self.cleanup()
503
 
                    os._exit(1)
 
353
            self.add()
504
354
        else:
505
355
            if error is None:
506
 
                log.debug("Unknown state: %r", state)
 
356
                logger.debug("Unknown state: %r", state)
507
357
            else:
508
 
                log.debug("Unknown state: %r: %r", state, error)
509
 
 
 
358
                logger.debug("Unknown state: %r: %r", state, error)
510
359
    def activate(self):
511
360
        """Derived from the Avahi example code"""
512
361
        if self.server is None:
516
365
                                    follow_name_owner_changes=True),
517
366
                avahi.DBUS_INTERFACE_SERVER)
518
367
        self.server.connect_to_signal("StateChanged",
519
 
                                      self.server_state_changed)
 
368
                                 self.server_state_changed)
520
369
        self.server_state_changed(self.server.GetState())
521
370
 
522
 
 
523
371
class AvahiServiceToSyslog(AvahiService):
524
 
    def rename(self, *args, **kwargs):
 
372
    def rename(self):
525
373
        """Add the new name to the syslog messages"""
526
 
        ret = super(AvahiServiceToSyslog, self).rename(*args,
527
 
                                                       **kwargs)
528
 
        syslogger.setFormatter(logging.Formatter(
529
 
            "Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
530
 
            .format(self.name)))
 
374
        ret = AvahiService.rename(self)
 
375
        syslogger.setFormatter(logging.Formatter
 
376
                               ('Mandos (%s) [%%(process)d]:'
 
377
                                ' %%(levelname)s: %%(message)s'
 
378
                                % self.name))
531
379
        return ret
532
380
 
533
 
 
534
 
# Pretend that we have a GnuTLS module
535
 
class gnutls:
536
 
    """This isn't so much a class as it is a module-like namespace."""
537
 
 
538
 
    library = ctypes.util.find_library("gnutls")
539
 
    if library is None:
540
 
        library = ctypes.util.find_library("gnutls-deb0")
541
 
    _library = ctypes.cdll.LoadLibrary(library)
542
 
    del library
543
 
 
544
 
    # Unless otherwise indicated, the constants and types below are
545
 
    # all from the gnutls/gnutls.h C header file.
546
 
 
547
 
    # Constants
548
 
    E_SUCCESS = 0
549
 
    E_INTERRUPTED = -52
550
 
    E_AGAIN = -28
551
 
    CRT_OPENPGP = 2
552
 
    CRT_RAWPK = 3
553
 
    CLIENT = 2
554
 
    SHUT_RDWR = 0
555
 
    CRD_CERTIFICATE = 1
556
 
    E_NO_CERTIFICATE_FOUND = -49
557
 
    X509_FMT_DER = 0
558
 
    NO_TICKETS = 1<<10
559
 
    ENABLE_RAWPK = 1<<18
560
 
    CTYPE_PEERS = 3
561
 
    KEYID_USE_SHA256 = 1        # gnutls/x509.h
562
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
563
 
 
564
 
    # Types
565
 
    class _session_int(ctypes.Structure):
566
 
        _fields_ = []
567
 
    session_t = ctypes.POINTER(_session_int)
568
 
 
569
 
    class certificate_credentials_st(ctypes.Structure):
570
 
        _fields_ = []
571
 
    certificate_credentials_t = ctypes.POINTER(
572
 
        certificate_credentials_st)
573
 
    certificate_type_t = ctypes.c_int
574
 
 
575
 
    class datum_t(ctypes.Structure):
576
 
        _fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
 
                    ("size", ctypes.c_uint)]
578
 
 
579
 
    class _openpgp_crt_int(ctypes.Structure):
580
 
        _fields_ = []
581
 
    openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
 
    openpgp_crt_fmt_t = ctypes.c_int  # gnutls/openpgp.h
583
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
 
    credentials_type_t = ctypes.c_int
585
 
    transport_ptr_t = ctypes.c_void_p
586
 
    close_request_t = ctypes.c_int
587
 
 
588
 
    # Exceptions
589
 
    class Error(Exception):
590
 
        def __init__(self, message=None, code=None, args=()):
591
 
            # Default usage is by a message string, but if a return
592
 
            # code is passed, convert it to a string with
593
 
            # gnutls.strerror()
594
 
            self.code = code
595
 
            if message is None and code is not None:
596
 
                message = gnutls.strerror(code).decode(
597
 
                    "utf-8", errors="replace")
598
 
            return super(gnutls.Error, self).__init__(
599
 
                message, *args)
600
 
 
601
 
    class CertificateSecurityError(Error):
602
 
        pass
603
 
 
604
 
    class PointerTo:
605
 
        def __init__(self, cls):
606
 
            self.cls = cls
607
 
 
608
 
        def from_param(self, obj):
609
 
            if not isinstance(obj, self.cls):
610
 
                raise TypeError("Not of type {}: {!r}"
611
 
                                .format(self.cls.__name__, obj))
612
 
            return ctypes.byref(obj.from_param(obj))
613
 
 
614
 
    class CastToVoidPointer:
615
 
        def __init__(self, cls):
616
 
            self.cls = cls
617
 
 
618
 
        def from_param(self, obj):
619
 
            if not isinstance(obj, self.cls):
620
 
                raise TypeError("Not of type {}: {!r}"
621
 
                                .format(self.cls.__name__, obj))
622
 
            return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
623
 
 
624
 
    class With_from_param:
625
 
        @classmethod
626
 
        def from_param(cls, obj):
627
 
            return obj._as_parameter_
628
 
 
629
 
    # Classes
630
 
    class Credentials(With_from_param):
631
 
        def __init__(self):
632
 
            self._as_parameter_ = gnutls.certificate_credentials_t()
633
 
            gnutls.certificate_allocate_credentials(self)
634
 
            self.type = gnutls.CRD_CERTIFICATE
635
 
 
636
 
        def __del__(self):
637
 
            gnutls.certificate_free_credentials(self)
638
 
 
639
 
    class ClientSession(With_from_param):
640
 
        def __init__(self, socket, credentials=None):
641
 
            self._as_parameter_ = gnutls.session_t()
642
 
            gnutls_flags = gnutls.CLIENT
643
 
            if gnutls.check_version(b"3.5.6"):
644
 
                gnutls_flags |= gnutls.NO_TICKETS
645
 
            if gnutls.has_rawpk:
646
 
                gnutls_flags |= gnutls.ENABLE_RAWPK
647
 
            gnutls.init(self, gnutls_flags)
648
 
            del gnutls_flags
649
 
            gnutls.set_default_priority(self)
650
 
            gnutls.transport_set_ptr(self, socket.fileno())
651
 
            gnutls.handshake_set_private_extensions(self, True)
652
 
            self.socket = socket
653
 
            if credentials is None:
654
 
                credentials = gnutls.Credentials()
655
 
            gnutls.credentials_set(self, credentials.type,
656
 
                                   credentials)
657
 
            self.credentials = credentials
658
 
 
659
 
        def __del__(self):
660
 
            gnutls.deinit(self)
661
 
 
662
 
        def handshake(self):
663
 
            return gnutls.handshake(self)
664
 
 
665
 
        def send(self, data):
666
 
            data = bytes(data)
667
 
            data_len = len(data)
668
 
            while data_len > 0:
669
 
                data_len -= gnutls.record_send(self, data[-data_len:],
670
 
                                               data_len)
671
 
 
672
 
        def bye(self):
673
 
            return gnutls.bye(self, gnutls.SHUT_RDWR)
674
 
 
675
 
    # Error handling functions
676
 
    def _error_code(result):
677
 
        """A function to raise exceptions on errors, suitable
678
 
        for the "restype" attribute on ctypes functions"""
679
 
        if result >= gnutls.E_SUCCESS:
680
 
            return result
681
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
 
            raise gnutls.CertificateSecurityError(code=result)
683
 
        raise gnutls.Error(code=result)
684
 
 
685
 
    def _retry_on_error(result, func, arguments,
686
 
                        _error_code=_error_code):
687
 
        """A function to retry on some errors, suitable
688
 
        for the "errcheck" attribute on ctypes functions"""
689
 
        while result < gnutls.E_SUCCESS:
690
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
 
                return _error_code(result)
692
 
            result = func(*arguments)
693
 
        return result
694
 
 
695
 
    # Unless otherwise indicated, the function declarations below are
696
 
    # all from the gnutls/gnutls.h C header file.
697
 
 
698
 
    # Functions
699
 
    priority_set_direct = _library.gnutls_priority_set_direct
700
 
    priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
701
 
                                    ctypes.POINTER(ctypes.c_char_p)]
702
 
    priority_set_direct.restype = _error_code
703
 
 
704
 
    init = _library.gnutls_init
705
 
    init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
706
 
    init.restype = _error_code
707
 
 
708
 
    set_default_priority = _library.gnutls_set_default_priority
709
 
    set_default_priority.argtypes = [ClientSession]
710
 
    set_default_priority.restype = _error_code
711
 
 
712
 
    record_send = _library.gnutls_record_send
713
 
    record_send.argtypes = [ClientSession, ctypes.c_void_p,
714
 
                            ctypes.c_size_t]
715
 
    record_send.restype = ctypes.c_ssize_t
716
 
    record_send.errcheck = _retry_on_error
717
 
 
718
 
    certificate_allocate_credentials = (
719
 
        _library.gnutls_certificate_allocate_credentials)
720
 
    certificate_allocate_credentials.argtypes = [
721
 
        PointerTo(Credentials)]
722
 
    certificate_allocate_credentials.restype = _error_code
723
 
 
724
 
    certificate_free_credentials = (
725
 
        _library.gnutls_certificate_free_credentials)
726
 
    certificate_free_credentials.argtypes = [Credentials]
727
 
    certificate_free_credentials.restype = None
728
 
 
729
 
    handshake_set_private_extensions = (
730
 
        _library.gnutls_handshake_set_private_extensions)
731
 
    handshake_set_private_extensions.argtypes = [ClientSession,
732
 
                                                 ctypes.c_int]
733
 
    handshake_set_private_extensions.restype = None
734
 
 
735
 
    credentials_set = _library.gnutls_credentials_set
736
 
    credentials_set.argtypes = [ClientSession, credentials_type_t,
737
 
                                CastToVoidPointer(Credentials)]
738
 
    credentials_set.restype = _error_code
739
 
 
740
 
    strerror = _library.gnutls_strerror
741
 
    strerror.argtypes = [ctypes.c_int]
742
 
    strerror.restype = ctypes.c_char_p
743
 
 
744
 
    certificate_type_get = _library.gnutls_certificate_type_get
745
 
    certificate_type_get.argtypes = [ClientSession]
746
 
    certificate_type_get.restype = _error_code
747
 
 
748
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
749
 
    certificate_get_peers.argtypes = [ClientSession,
750
 
                                      ctypes.POINTER(ctypes.c_uint)]
751
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
752
 
 
753
 
    global_set_log_level = _library.gnutls_global_set_log_level
754
 
    global_set_log_level.argtypes = [ctypes.c_int]
755
 
    global_set_log_level.restype = None
756
 
 
757
 
    global_set_log_function = _library.gnutls_global_set_log_function
758
 
    global_set_log_function.argtypes = [log_func]
759
 
    global_set_log_function.restype = None
760
 
 
761
 
    deinit = _library.gnutls_deinit
762
 
    deinit.argtypes = [ClientSession]
763
 
    deinit.restype = None
764
 
 
765
 
    handshake = _library.gnutls_handshake
766
 
    handshake.argtypes = [ClientSession]
767
 
    handshake.restype = ctypes.c_int
768
 
    handshake.errcheck = _retry_on_error
769
 
 
770
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
771
 
    transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
772
 
    transport_set_ptr.restype = None
773
 
 
774
 
    bye = _library.gnutls_bye
775
 
    bye.argtypes = [ClientSession, close_request_t]
776
 
    bye.restype = ctypes.c_int
777
 
    bye.errcheck = _retry_on_error
778
 
 
779
 
    check_version = _library.gnutls_check_version
780
 
    check_version.argtypes = [ctypes.c_char_p]
781
 
    check_version.restype = ctypes.c_char_p
782
 
 
783
 
    _need_version = b"3.3.0"
784
 
    if check_version(_need_version) is None:
785
 
        raise self.Error("Needs GnuTLS {} or later"
786
 
                         .format(_need_version))
787
 
 
788
 
    _tls_rawpk_version = b"3.6.6"
789
 
    has_rawpk = bool(check_version(_tls_rawpk_version))
790
 
 
791
 
    if has_rawpk:
792
 
        # Types
793
 
        class pubkey_st(ctypes.Structure):
794
 
            _fields = []
795
 
        pubkey_t = ctypes.POINTER(pubkey_st)
796
 
 
797
 
        x509_crt_fmt_t = ctypes.c_int
798
 
 
799
 
        # All the function declarations below are from
800
 
        # gnutls/abstract.h
801
 
        pubkey_init = _library.gnutls_pubkey_init
802
 
        pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
 
        pubkey_init.restype = _error_code
804
 
 
805
 
        pubkey_import = _library.gnutls_pubkey_import
806
 
        pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
807
 
                                  x509_crt_fmt_t]
808
 
        pubkey_import.restype = _error_code
809
 
 
810
 
        pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
811
 
        pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
812
 
                                      ctypes.POINTER(ctypes.c_ubyte),
813
 
                                      ctypes.POINTER(ctypes.c_size_t)]
814
 
        pubkey_get_key_id.restype = _error_code
815
 
 
816
 
        pubkey_deinit = _library.gnutls_pubkey_deinit
817
 
        pubkey_deinit.argtypes = [pubkey_t]
818
 
        pubkey_deinit.restype = None
819
 
    else:
820
 
        # All the function declarations below are from
821
 
        # gnutls/openpgp.h
822
 
 
823
 
        openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
 
        openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
825
 
        openpgp_crt_init.restype = _error_code
826
 
 
827
 
        openpgp_crt_import = _library.gnutls_openpgp_crt_import
828
 
        openpgp_crt_import.argtypes = [openpgp_crt_t,
829
 
                                       ctypes.POINTER(datum_t),
830
 
                                       openpgp_crt_fmt_t]
831
 
        openpgp_crt_import.restype = _error_code
832
 
 
833
 
        openpgp_crt_verify_self = \
834
 
            _library.gnutls_openpgp_crt_verify_self
835
 
        openpgp_crt_verify_self.argtypes = [
836
 
            openpgp_crt_t,
837
 
            ctypes.c_uint,
838
 
            ctypes.POINTER(ctypes.c_uint),
839
 
        ]
840
 
        openpgp_crt_verify_self.restype = _error_code
841
 
 
842
 
        openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
843
 
        openpgp_crt_deinit.argtypes = [openpgp_crt_t]
844
 
        openpgp_crt_deinit.restype = None
845
 
 
846
 
        openpgp_crt_get_fingerprint = (
847
 
            _library.gnutls_openpgp_crt_get_fingerprint)
848
 
        openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
849
 
                                                ctypes.c_void_p,
850
 
                                                ctypes.POINTER(
851
 
                                                    ctypes.c_size_t)]
852
 
        openpgp_crt_get_fingerprint.restype = _error_code
853
 
 
854
 
    if check_version(b"3.6.4"):
855
 
        certificate_type_get2 = _library.gnutls_certificate_type_get2
856
 
        certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
857
 
        certificate_type_get2.restype = _error_code
858
 
 
859
 
    # Remove non-public functions
860
 
    del _error_code, _retry_on_error
861
 
 
862
 
 
863
 
def call_pipe(connection,       # : multiprocessing.Connection
864
 
              func, *args, **kwargs):
865
 
    """This function is meant to be called by multiprocessing.Process
866
 
 
867
 
    This function runs func(*args, **kwargs), and writes the resulting
868
 
    return value on the provided multiprocessing.Connection.
869
 
    """
870
 
    connection.send(func(*args, **kwargs))
871
 
    connection.close()
872
 
 
873
 
 
874
 
class Client:
 
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
        
 
387
class Client(object):
875
388
    """A representation of a client host served by this server.
876
 
 
 
389
    
877
390
    Attributes:
878
 
    approved:   bool(); None if not yet approved/disapproved
 
391
    approved:   bool(); 'None' if not yet approved/disapproved
879
392
    approval_delay: datetime.timedelta(); Time to wait for approval
880
393
    approval_duration: datetime.timedelta(); Duration of one approval
881
 
    checker: multiprocessing.Process(); a running checker process used
882
 
             to see if the client lives. None if no process is
883
 
             running.
884
 
    checker_callback_tag: a GLib event source tag, or None
 
394
    checker:    subprocess.Popen(); a running checker process used
 
395
                                    to see if the client lives.
 
396
                                    'None' if no process is running.
 
397
    checker_callback_tag: a gobject event source tag, or None
885
398
    checker_command: string; External command which is run to check
886
399
                     if client lives.  %() expansions are done at
887
400
                     runtime with vars(self) as dict, so that for
888
401
                     instance %(name)s can be used in the command.
889
 
    checker_initiator_tag: a GLib event source tag, or None
 
402
    checker_initiator_tag: a gobject event source tag, or None
890
403
    created:    datetime.datetime(); (UTC) object creation
891
404
    client_structure: Object describing what attributes a client has
892
405
                      and is used for storing the client at exit
893
406
    current_checker_command: string; current running checker_command
894
 
    disable_initiator_tag: a GLib event source tag, or None
 
407
    disable_initiator_tag: a gobject event source tag, or None
895
408
    enabled:    bool()
896
409
    fingerprint: string (40 or 32 hexadecimal digits); used to
897
 
                 uniquely identify an OpenPGP client
898
 
    key_id: string (64 hexadecimal digits); used to uniquely identify
899
 
            a client using raw public keys
 
410
                 uniquely identify the client
900
411
    host:       string; available for use by the checker command
901
412
    interval:   datetime.timedelta(); How often to start a new checker
902
413
    last_approval_request: datetime.datetime(); (UTC) or None
903
414
    last_checked_ok: datetime.datetime(); (UTC) or None
904
415
    last_checker_status: integer between 0 and 255 reflecting exit
905
416
                         status of last checker. -1 reflects crashed
906
 
                         checker, -2 means no checker completed yet.
907
 
    last_checker_signal: The signal which killed the last checker, if
908
 
                         last_checker_status is -1
 
417
                         checker, or None.
909
418
    last_enabled: datetime.datetime(); (UTC) or None
910
419
    name:       string; from the config file, used in log messages and
911
420
                        D-Bus identifiers
912
421
    secret:     bytestring; sent verbatim (over TLS) to client
913
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
914
423
                                      until this client is disabled
915
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
916
425
    runtime_expansions: Allowed attributes for runtime expansion.
917
426
    expires:    datetime.datetime(); time (UTC) when a client will be
918
427
                disabled, or None
919
 
    server_settings: The server_settings dict from main()
920
428
    """
921
 
 
 
429
    
922
430
    runtime_expansions = ("approval_delay", "approval_duration",
923
 
                          "created", "enabled", "expires", "key_id",
924
 
                          "fingerprint", "host", "interval",
925
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
926
433
                          "last_enabled", "name", "timeout")
927
 
    client_defaults = {
928
 
        "timeout": "PT5M",
929
 
        "extended_timeout": "PT15M",
930
 
        "interval": "PT2M",
931
 
        "checker": "fping -q -- %%(host)s",
932
 
        "host": "",
933
 
        "approval_delay": "PT0S",
934
 
        "approval_duration": "PT1S",
935
 
        "approved_by_default": "True",
936
 
        "enabled": "True",
937
 
    }
 
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)
938
459
 
939
460
    @staticmethod
940
461
    def config_parser(config):
941
 
        """Construct a new dict of client settings of this form:
 
462
        """ Construct a new dict of client settings of this form:
942
463
        { client_name: {setting_name: value, ...}, ...}
943
 
        with exceptions for any special settings as defined above.
944
 
        NOTE: Must be a pure function. Must return the same result
945
 
        value given the same arguments.
946
 
        """
 
464
        with exceptions for any special settings as defined above"""
947
465
        settings = {}
948
466
        for client_name in config.sections():
949
467
            section = dict(config.items(client_name))
950
468
            client = settings[client_name] = {}
951
 
 
 
469
            
952
470
            client["host"] = section["host"]
953
471
            # Reformat values from string types to Python types
954
472
            client["approved_by_default"] = config.getboolean(
955
473
                client_name, "approved_by_default")
956
 
            client["enabled"] = config.getboolean(client_name,
957
 
                                                  "enabled")
958
 
 
959
 
            # Uppercase and remove spaces from key_id and fingerprint
960
 
            # for later comparison purposes with return value from the
961
 
            # key_id() and fingerprint() functions
962
 
            client["key_id"] = (section.get("key_id", "").upper()
963
 
                                .replace(" ", ""))
 
474
            client["enabled"] = config.getboolean(client_name, "enabled")
 
475
            
964
476
            client["fingerprint"] = (section["fingerprint"].upper()
965
477
                                     .replace(" ", ""))
966
478
            if "secret" in section:
967
 
                client["secret"] = codecs.decode(section["secret"]
968
 
                                                 .encode("utf-8"),
969
 
                                                 "base64")
 
479
                client["secret"] = section["secret"].decode("base64")
970
480
            elif "secfile" in section:
971
481
                with open(os.path.expanduser(os.path.expandvars
972
482
                                             (section["secfile"])),
973
483
                          "rb") as secfile:
974
484
                    client["secret"] = secfile.read()
975
485
            else:
976
 
                raise TypeError("No secret or secfile for section {}"
977
 
                                .format(section))
 
486
                raise TypeError("No secret or secfile for section %s"
 
487
                                % section)
978
488
            client["timeout"] = string_to_delta(section["timeout"])
979
489
            client["extended_timeout"] = string_to_delta(
980
490
                section["extended_timeout"])
986
496
            client["checker_command"] = section["checker"]
987
497
            client["last_approval_request"] = None
988
498
            client["last_checked_ok"] = None
989
 
            client["last_checker_status"] = -2
 
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
990
507
 
991
508
        return settings
992
 
 
993
 
    def __init__(self, settings, name=None, server_settings=None):
 
509
        
 
510
        
 
511
    def __init__(self, settings, name = None):
 
512
        """Note: the 'checker' key in 'config' sets the
 
513
        'checker_command' attribute and *not* the 'checker'
 
514
        attribute."""
994
515
        self.name = name
995
 
        if server_settings is None:
996
 
            server_settings = {}
997
 
        self.server_settings = server_settings
998
516
        # adding all client settings
999
 
        for setting, value in settings.items():
 
517
        for setting, value in settings.iteritems():
1000
518
            setattr(self, setting, value)
1001
 
 
1002
 
        if self.enabled:
1003
 
            if not hasattr(self, "last_enabled"):
1004
 
                self.last_enabled = datetime.datetime.utcnow()
1005
 
            if not hasattr(self, "expires"):
1006
 
                self.expires = (datetime.datetime.utcnow()
1007
 
                                + self.timeout)
1008
 
        else:
1009
 
            self.last_enabled = None
1010
 
            self.expires = None
1011
 
 
1012
 
        log.debug("Creating client %r", self.name)
1013
 
        log.debug("  Key ID: %s", self.key_id)
1014
 
        log.debug("  Fingerprint: %s", self.fingerprint)
1015
 
        self.created = settings.get("created",
1016
 
                                    datetime.datetime.utcnow())
 
519
        
 
520
        logger.debug("Creating client %r", self.name)
 
521
        # Uppercase and remove spaces from fingerprint for later
 
522
        # comparison purposes with return value from the fingerprint()
 
523
        # function
 
524
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
525
        self.created = settings.get("created", datetime.datetime.utcnow())
1017
526
 
1018
527
        # attributes specific for this server instance
1019
528
        self.checker = None
1023
532
        self.current_checker_command = None
1024
533
        self.approved = None
1025
534
        self.approvals_pending = 0
1026
 
        self.changedstate = multiprocessing_manager.Condition(
1027
 
            multiprocessing_manager.Lock())
1028
 
        self.client_structure = [attr
1029
 
                                 for attr in self.__dict__.keys()
 
535
        self.changedstate = (multiprocessing_manager
 
536
                             .Condition(multiprocessing_manager
 
537
                                        .Lock()))
 
538
        self.client_structure = [attr for attr in
 
539
                                 self.__dict__.iterkeys()
1030
540
                                 if not attr.startswith("_")]
1031
541
        self.client_structure.append("client_structure")
1032
 
 
1033
 
        for name, t in inspect.getmembers(
1034
 
                type(self), lambda obj: isinstance(obj, property)):
 
542
        
 
543
        for name, t in inspect.getmembers(type(self),
 
544
                                          lambda obj:
 
545
                                              isinstance(obj,
 
546
                                                         property)):
1035
547
            if not name.startswith("_"):
1036
548
                self.client_structure.append(name)
1037
 
 
 
549
    
1038
550
    # Send notice to process children that client state has changed
1039
551
    def send_changedstate(self):
1040
552
        with self.changedstate:
1041
553
            self.changedstate.notify_all()
1042
 
 
 
554
    
1043
555
    def enable(self):
1044
556
        """Start this client's checker and timeout hooks"""
1045
557
        if getattr(self, "enabled", False):
1046
558
            # Already enabled
1047
559
            return
 
560
        self.send_changedstate()
 
561
        self.expires = datetime.datetime.utcnow() + self.timeout
1048
562
        self.enabled = True
1049
563
        self.last_enabled = datetime.datetime.utcnow()
1050
564
        self.init_checker()
1051
 
        self.send_changedstate()
1052
 
 
 
565
    
1053
566
    def disable(self, quiet=True):
1054
567
        """Disable this client."""
1055
568
        if not getattr(self, "enabled", False):
1056
569
            return False
1057
570
        if not quiet:
1058
 
            log.info("Disabling client %s", self.name)
1059
 
        if getattr(self, "disable_initiator_tag", None) is not None:
1060
 
            GLib.source_remove(self.disable_initiator_tag)
 
571
            self.send_changedstate()
 
572
        if not quiet:
 
573
            logger.info("Disabling client %s", self.name)
 
574
        if getattr(self, "disable_initiator_tag", False):
 
575
            gobject.source_remove(self.disable_initiator_tag)
1061
576
            self.disable_initiator_tag = None
1062
577
        self.expires = None
1063
 
        if getattr(self, "checker_initiator_tag", None) is not None:
1064
 
            GLib.source_remove(self.checker_initiator_tag)
 
578
        if getattr(self, "checker_initiator_tag", False):
 
579
            gobject.source_remove(self.checker_initiator_tag)
1065
580
            self.checker_initiator_tag = None
1066
581
        self.stop_checker()
1067
582
        self.enabled = False
1068
 
        if not quiet:
1069
 
            self.send_changedstate()
1070
 
        # Do not run this again if called by a GLib.timeout_add
 
583
        # Do not run this again if called by a gobject.timeout_add
1071
584
        return False
1072
 
 
 
585
    
1073
586
    def __del__(self):
1074
587
        self.disable()
1075
 
 
1076
 
    def init_checker(self, randomize_start=False):
1077
 
        # Schedule a new checker to be started a randomly selected
1078
 
        # time (a fraction of 'interval') from now.  This spreads out
1079
 
        # the startup of checkers over time when the server is
1080
 
        # started.
1081
 
        if self.checker_initiator_tag is not None:
1082
 
            GLib.source_remove(self.checker_initiator_tag)
1083
 
        interval_milliseconds = int(self.interval.total_seconds()
1084
 
                                    * 1000)
1085
 
        if randomize_start:
1086
 
            delay_milliseconds = random.randrange(
1087
 
                interval_milliseconds + 1)
1088
 
        else:
1089
 
            delay_milliseconds = interval_milliseconds
1090
 
        self.checker_initiator_tag = GLib.timeout_add(
1091
 
            delay_milliseconds, self.start_checker, randomize_start)
1092
 
        delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1093
 
        # A checker might take up to an 'interval' of time, so we can
1094
 
        # expire at the soonest one interval after a checker was
1095
 
        # started.  Since the initial checker is delayed, the expire
1096
 
        # time might have to be extended.
1097
 
        now = datetime.datetime.utcnow()
1098
 
        self.expires = now + delay + self.interval
1099
 
        # Schedule a disable() at expire time
1100
 
        if self.disable_initiator_tag is not None:
1101
 
            GLib.source_remove(self.disable_initiator_tag)
1102
 
        self.disable_initiator_tag = GLib.timeout_add(
1103
 
            int((self.expires - now).total_seconds() * 1000),
1104
 
            self.disable)
1105
 
 
1106
 
    def checker_callback(self, source, condition, connection,
1107
 
                         command):
 
588
    
 
589
    def init_checker(self):
 
590
        # Schedule a new checker to be started an 'interval' from now,
 
591
        # and every interval from then on.
 
592
        self.checker_initiator_tag = (gobject.timeout_add
 
593
                                      (self.interval_milliseconds(),
 
594
                                       self.start_checker))
 
595
        # Schedule a disable() when 'timeout' has passed
 
596
        self.disable_initiator_tag = (gobject.timeout_add
 
597
                                   (self.timeout_milliseconds(),
 
598
                                    self.disable))
 
599
        # Also start a new checker *right now*.
 
600
        self.start_checker()
 
601
    
 
602
    def checker_callback(self, pid, condition, command):
1108
603
        """The checker has completed, so take appropriate actions."""
1109
 
        # Read return code from connection (see call_pipe)
1110
 
        returncode = connection.recv()
1111
 
        connection.close()
1112
 
        if self.checker is not None:
1113
 
            self.checker.join()
1114
604
        self.checker_callback_tag = None
1115
605
        self.checker = None
1116
 
 
1117
 
        if returncode >= 0:
1118
 
            self.last_checker_status = returncode
1119
 
            self.last_checker_signal = None
 
606
        if os.WIFEXITED(condition):
 
607
            self.last_checker_status = os.WEXITSTATUS(condition)
1120
608
            if self.last_checker_status == 0:
1121
 
                log.info("Checker for %(name)s succeeded", vars(self))
 
609
                logger.info("Checker for %(name)s succeeded",
 
610
                            vars(self))
1122
611
                self.checked_ok()
1123
612
            else:
1124
 
                log.info("Checker for %(name)s failed", vars(self))
 
613
                logger.info("Checker for %(name)s failed",
 
614
                            vars(self))
1125
615
        else:
1126
616
            self.last_checker_status = -1
1127
 
            self.last_checker_signal = -returncode
1128
 
            log.warning("Checker for %(name)s crashed?", vars(self))
1129
 
        return False
1130
 
 
1131
 
    def checked_ok(self):
1132
 
        """Assert that the client has been seen, alive and well."""
1133
 
        self.last_checked_ok = datetime.datetime.utcnow()
1134
 
        self.last_checker_status = 0
1135
 
        self.last_checker_signal = None
1136
 
        self.bump_timeout()
1137
 
 
1138
 
    def bump_timeout(self, timeout=None):
1139
 
        """Bump up the timeout for this client."""
 
617
            logger.warning("Checker for %(name)s crashed?",
 
618
                           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
        """
1140
626
        if timeout is None:
1141
627
            timeout = self.timeout
 
628
        self.last_checked_ok = datetime.datetime.utcnow()
1142
629
        if self.disable_initiator_tag is not None:
1143
 
            GLib.source_remove(self.disable_initiator_tag)
1144
 
            self.disable_initiator_tag = None
 
630
            gobject.source_remove(self.disable_initiator_tag)
1145
631
        if getattr(self, "enabled", False):
1146
 
            self.disable_initiator_tag = GLib.timeout_add(
1147
 
                int(timeout.total_seconds() * 1000), self.disable)
 
632
            self.disable_initiator_tag = (gobject.timeout_add
 
633
                                          (timedelta_to_milliseconds
 
634
                                           (timeout), self.disable))
1148
635
            self.expires = datetime.datetime.utcnow() + timeout
1149
 
 
 
636
    
1150
637
    def need_approval(self):
1151
638
        self.last_approval_request = datetime.datetime.utcnow()
1152
 
 
1153
 
    def start_checker(self, start_was_randomized=False):
 
639
    
 
640
    def start_checker(self):
1154
641
        """Start a new checker subprocess if one is not running.
1155
 
 
 
642
        
1156
643
        If a checker already exists, leave it running and do
1157
644
        nothing."""
1158
645
        # The reason for not killing a running checker is that if we
1159
 
        # did that, and if a checker (for some reason) started running
1160
 
        # slowly and taking more than 'interval' time, then the client
1161
 
        # would inevitably timeout, since no checker would get a
1162
 
        # chance to run to completion.  If we instead leave running
 
646
        # did that, then if a checker (for some reason) started
 
647
        # running slowly and taking more than 'interval' time, the
 
648
        # client would inevitably timeout, since no checker would get
 
649
        # a chance to run to completion.  If we instead leave running
1163
650
        # checkers alone, the checker would have to take more time
1164
651
        # than 'timeout' for the client to be disabled, which is as it
1165
652
        # should be.
1166
 
 
1167
 
        if self.checker is not None and not self.checker.is_alive():
1168
 
            log.warning("Checker was not alive; joining")
1169
 
            self.checker.join()
1170
 
            self.checker = None
 
653
        
 
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)
1171
667
        # Start a new checker if needed
1172
668
        if self.checker is None:
1173
 
            # Escape attributes for the shell
1174
 
            escaped_attrs = {
1175
 
                attr: shlex.quote(str(getattr(self, attr)))
1176
 
                for attr in self.runtime_expansions}
1177
669
            try:
1178
 
                command = self.checker_command % escaped_attrs
1179
 
            except TypeError as error:
1180
 
                log.error('Could not format string "%s"',
1181
 
                          self.checker_command, exc_info=error)
1182
 
                return True     # Try again later
 
670
                # In case checker_command has exactly one % operator
 
671
                command = self.checker_command % self.host
 
672
            except TypeError:
 
673
                # Escape attributes for the shell
 
674
                escaped_attrs = dict(
 
675
                    (attr,
 
676
                     re.escape(unicode(str(getattr(self, attr, "")),
 
677
                                       errors=
 
678
                                       'replace')))
 
679
                    for attr in
 
680
                    self.runtime_expansions)
 
681
                
 
682
                try:
 
683
                    command = self.checker_command % escaped_attrs
 
684
                except TypeError as error:
 
685
                    logger.error('Could not format string "%s":'
 
686
                                 ' %s', self.checker_command, error)
 
687
                    return True # Try again later
1183
688
            self.current_checker_command = command
1184
 
            log.info("Starting checker %r for %s", command, self.name)
1185
 
            # We don't need to redirect stdout and stderr, since
1186
 
            # in normal mode, that is already done by daemon(),
1187
 
            # and in debug mode we don't want to.  (Stdin is
1188
 
            # always replaced by /dev/null.)
1189
 
            # The exception is when not debugging but nevertheless
1190
 
            # running in the foreground; use the previously
1191
 
            # created wnull.
1192
 
            popen_args = {"close_fds": True,
1193
 
                          "shell": True,
1194
 
                          "cwd": "/"}
1195
 
            if (not self.server_settings["debug"]
1196
 
                and self.server_settings["foreground"]):
1197
 
                popen_args.update({"stdout": wnull,
1198
 
                                   "stderr": wnull})
1199
 
            pipe = multiprocessing.Pipe(duplex=False)
1200
 
            self.checker = multiprocessing.Process(
1201
 
                target=call_pipe,
1202
 
                args=(pipe[1], subprocess.call, command),
1203
 
                kwargs=popen_args)
1204
 
            self.checker.start()
1205
 
            self.checker_callback_tag = GLib.io_add_watch(
1206
 
                GLib.IOChannel.unix_new(pipe[0].fileno()),
1207
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1208
 
                self.checker_callback, pipe[0], command)
1209
 
        if start_was_randomized:
1210
 
            # We were started after a random delay; Schedule a new
1211
 
            # checker to be started an 'interval' from now, and every
1212
 
            # interval from then on.
1213
 
            now = datetime.datetime.utcnow()
1214
 
            self.checker_initiator_tag = GLib.timeout_add(
1215
 
                int(self.interval.total_seconds() * 1000),
1216
 
                self.start_checker)
1217
 
            self.expires = max(self.expires, now + self.interval)
1218
 
            # Don't start a new checker again after same random delay
1219
 
            return False
1220
 
        # Re-run this periodically if run by GLib.timeout_add
 
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)
 
712
        # Re-run this periodically if run by gobject.timeout_add
1221
713
        return True
1222
 
 
 
714
    
1223
715
    def stop_checker(self):
1224
716
        """Force the checker process, if any, to stop."""
1225
717
        if self.checker_callback_tag:
1226
 
            GLib.source_remove(self.checker_callback_tag)
 
718
            gobject.source_remove(self.checker_callback_tag)
1227
719
            self.checker_callback_tag = None
1228
720
        if getattr(self, "checker", None) is None:
1229
721
            return
1230
 
        log.debug("Stopping checker for %(name)s", vars(self))
1231
 
        self.checker.terminate()
 
722
        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
1232
731
        self.checker = None
1233
732
 
1234
733
 
1235
 
def dbus_service_property(dbus_interface,
1236
 
                          signature="v",
1237
 
                          access="readwrite",
1238
 
                          byte_arrays=False):
 
734
def dbus_service_property(dbus_interface, signature="v",
 
735
                          access="readwrite", byte_arrays=False):
1239
736
    """Decorators for marking methods of a DBusObjectWithProperties to
1240
737
    become properties on the D-Bus.
1241
 
 
 
738
    
1242
739
    The decorated method will be called with no arguments by "Get"
1243
740
    and with one argument by "Set".
1244
 
 
 
741
    
1245
742
    The parameters, where they are supported, are the same as
1246
743
    dbus.service.method, except there is only "signature", since the
1247
744
    type from Get() and the type sent to Set() is the same.
1250
747
    # "Set" method, so we fail early here:
1251
748
    if byte_arrays and signature != "ay":
1252
749
        raise ValueError("Byte arrays not supported for non-'ay'"
1253
 
                         " signature {!r}".format(signature))
1254
 
 
 
750
                         " signature %r" % signature)
1255
751
    def decorator(func):
1256
752
        func._dbus_is_property = True
1257
753
        func._dbus_interface = dbus_interface
1260
756
        func._dbus_name = func.__name__
1261
757
        if func._dbus_name.endswith("_dbus_property"):
1262
758
            func._dbus_name = func._dbus_name[:-14]
1263
 
        func._dbus_get_args_options = {"byte_arrays": byte_arrays}
1264
 
        return func
1265
 
 
1266
 
    return decorator
1267
 
 
1268
 
 
1269
 
def dbus_interface_annotations(dbus_interface):
1270
 
    """Decorator for marking functions returning interface annotations
1271
 
 
1272
 
    Usage:
1273
 
 
1274
 
    @dbus_interface_annotations("org.example.Interface")
1275
 
    def _foo(self):  # Function name does not matter
1276
 
        return {"org.freedesktop.DBus.Deprecated": "true",
1277
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
1278
 
                    "false"}
1279
 
    """
1280
 
 
1281
 
    def decorator(func):
1282
 
        func._dbus_is_interface = True
1283
 
        func._dbus_interface = dbus_interface
1284
 
        func._dbus_name = dbus_interface
1285
 
        return func
1286
 
 
1287
 
    return decorator
1288
 
 
1289
 
 
1290
 
def dbus_annotations(annotations):
1291
 
    """Decorator to annotate D-Bus methods, signals or properties
1292
 
    Usage:
1293
 
 
1294
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1295
 
                       "org.freedesktop.DBus.Property."
1296
 
                       "EmitsChangedSignal": "false"})
1297
 
    @dbus_service_property("org.example.Interface", signature="b",
1298
 
                           access="r")
1299
 
    def Property_dbus_property(self):
1300
 
        return dbus.Boolean(False)
1301
 
 
1302
 
    See also the DBusObjectWithAnnotations class.
1303
 
    """
1304
 
 
1305
 
    def decorator(func):
1306
 
        func._dbus_annotations = annotations
1307
 
        return func
1308
 
 
 
759
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
760
        return func
1309
761
    return decorator
1310
762
 
1311
763
 
1312
764
class DBusPropertyException(dbus.exceptions.DBusException):
1313
765
    """A base class for D-Bus property-related exceptions
1314
766
    """
1315
 
    pass
 
767
    def __unicode__(self):
 
768
        return unicode(str(self))
1316
769
 
1317
770
 
1318
771
class DBusPropertyAccessException(DBusPropertyException):
1327
780
    pass
1328
781
 
1329
782
 
1330
 
class DBusObjectWithAnnotations(dbus.service.Object):
1331
 
    """A D-Bus object with annotations.
1332
 
 
1333
 
    Classes inheriting from this can use the dbus_annotations
1334
 
    decorator to add annotations to methods or signals.
1335
 
    """
1336
 
 
1337
 
    @staticmethod
1338
 
    def _is_dbus_thing(thing):
1339
 
        """Returns a function testing if an attribute is a D-Bus thing
1340
 
 
1341
 
        If called like _is_dbus_thing("method") it returns a function
1342
 
        suitable for use as predicate to inspect.getmembers().
1343
 
        """
1344
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1345
 
                                   False)
1346
 
 
1347
 
    def _get_all_dbus_things(self, thing):
1348
 
        """Returns a generator of (name, attribute) pairs
1349
 
        """
1350
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
1351
 
                 athing.__get__(self))
1352
 
                for cls in self.__class__.__mro__
1353
 
                for name, athing in
1354
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
1355
 
 
1356
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1357
 
                         out_signature="s",
1358
 
                         path_keyword="object_path",
1359
 
                         connection_keyword="connection")
1360
 
    def Introspect(self, object_path, connection):
1361
 
        """Overloading of standard D-Bus method.
1362
 
 
1363
 
        Inserts annotation tags on methods and signals.
1364
 
        """
1365
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
1366
 
                                                   connection)
1367
 
        try:
1368
 
            document = xml.dom.minidom.parseString(xmlstring)
1369
 
 
1370
 
            for if_tag in document.getElementsByTagName("interface"):
1371
 
                # Add annotation tags
1372
 
                for typ in ("method", "signal"):
1373
 
                    for tag in if_tag.getElementsByTagName(typ):
1374
 
                        annots = dict()
1375
 
                        for name, prop in (self.
1376
 
                                           _get_all_dbus_things(typ)):
1377
 
                            if (name == tag.getAttribute("name")
1378
 
                                and prop._dbus_interface
1379
 
                                == if_tag.getAttribute("name")):
1380
 
                                annots.update(getattr(
1381
 
                                    prop, "_dbus_annotations", {}))
1382
 
                        for name, value in annots.items():
1383
 
                            ann_tag = document.createElement(
1384
 
                                "annotation")
1385
 
                            ann_tag.setAttribute("name", name)
1386
 
                            ann_tag.setAttribute("value", value)
1387
 
                            tag.appendChild(ann_tag)
1388
 
                # Add interface annotation tags
1389
 
                for annotation, value in dict(
1390
 
                    itertools.chain.from_iterable(
1391
 
                        annotations().items()
1392
 
                        for name, annotations
1393
 
                        in self._get_all_dbus_things("interface")
1394
 
                        if name == if_tag.getAttribute("name")
1395
 
                        )).items():
1396
 
                    ann_tag = document.createElement("annotation")
1397
 
                    ann_tag.setAttribute("name", annotation)
1398
 
                    ann_tag.setAttribute("value", value)
1399
 
                    if_tag.appendChild(ann_tag)
1400
 
                # Fix argument name for the Introspect method itself
1401
 
                if (if_tag.getAttribute("name")
1402
 
                    == dbus.INTROSPECTABLE_IFACE):
1403
 
                    for cn in if_tag.getElementsByTagName("method"):
1404
 
                        if cn.getAttribute("name") == "Introspect":
1405
 
                            for arg in cn.getElementsByTagName("arg"):
1406
 
                                if (arg.getAttribute("direction")
1407
 
                                    == "out"):
1408
 
                                    arg.setAttribute("name",
1409
 
                                                     "xml_data")
1410
 
            xmlstring = document.toxml("utf-8")
1411
 
            document.unlink()
1412
 
        except (AttributeError, xml.dom.DOMException,
1413
 
                xml.parsers.expat.ExpatError) as error:
1414
 
            log.error("Failed to override Introspection method",
1415
 
                      exc_info=error)
1416
 
        return xmlstring
1417
 
 
1418
 
 
1419
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
 
783
class DBusObjectWithProperties(dbus.service.Object):
1420
784
    """A D-Bus object with properties.
1421
 
 
 
785
    
1422
786
    Classes inheriting from this can use the dbus_service_property
1423
787
    decorator to expose methods as D-Bus properties.  It exposes the
1424
788
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1425
789
    """
1426
 
 
 
790
    
 
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
    
1427
803
    def _get_dbus_property(self, interface_name, property_name):
1428
804
        """Returns a bound method if one exists which is a D-Bus
1429
805
        property with the specified name and interface.
1430
806
        """
1431
 
        for cls in self.__class__.__mro__:
1432
 
            for name, value in inspect.getmembers(
1433
 
                    cls, self._is_dbus_thing("property")):
 
807
        for cls in  self.__class__.__mro__:
 
808
            for name, value in (inspect.getmembers
 
809
                                (cls, self._is_dbus_property)):
1434
810
                if (value._dbus_name == property_name
1435
811
                    and value._dbus_interface == interface_name):
1436
812
                    return value.__get__(self)
1437
 
 
 
813
        
1438
814
        # No such property
1439
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
1440
 
            self.dbus_object_path, interface_name, property_name))
1441
 
 
1442
 
    @classmethod
1443
 
    def _get_all_interface_names(cls):
1444
 
        """Get a sequence of all interfaces supported by an object"""
1445
 
        return (name for name in set(getattr(getattr(x, attr),
1446
 
                                             "_dbus_interface", None)
1447
 
                                     for x in (inspect.getmro(cls))
1448
 
                                     for attr in dir(x))
1449
 
                if name is not None)
1450
 
 
1451
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1452
 
                         in_signature="ss",
 
815
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
816
                                   + interface_name + "."
 
817
                                   + property_name)
 
818
    
 
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1453
820
                         out_signature="v")
1454
821
    def Get(self, interface_name, property_name):
1455
822
        """Standard D-Bus property Get() method, see D-Bus standard.
1461
828
        if not hasattr(value, "variant_level"):
1462
829
            return value
1463
830
        return type(value)(value, variant_level=value.variant_level+1)
1464
 
 
 
831
    
1465
832
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
1466
833
    def Set(self, interface_name, property_name, value):
1467
834
        """Standard D-Bus property Set() method, see D-Bus standard.
1473
840
            # The byte_arrays option is not supported yet on
1474
841
            # signatures other than "ay".
1475
842
            if prop._dbus_signature != "ay":
1476
 
                raise ValueError("Byte arrays not supported for non-"
1477
 
                                 "'ay' signature {!r}"
1478
 
                                 .format(prop._dbus_signature))
1479
 
            value = dbus.ByteArray(bytes(value))
 
843
                raise ValueError
 
844
            value = dbus.ByteArray(''.join(unichr(byte)
 
845
                                           for byte in value))
1480
846
        prop(value)
1481
 
 
1482
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1483
 
                         in_signature="s",
 
847
    
 
848
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1484
849
                         out_signature="a{sv}")
1485
850
    def GetAll(self, interface_name):
1486
851
        """Standard D-Bus property GetAll() method, see D-Bus
1487
852
        standard.
1488
 
 
 
853
        
1489
854
        Note: Will not include properties with access="write".
1490
855
        """
1491
856
        properties = {}
1492
 
        for name, prop in self._get_all_dbus_things("property"):
 
857
        for name, prop in self._get_all_dbus_properties():
1493
858
            if (interface_name
1494
859
                and interface_name != prop._dbus_interface):
1495
860
                # Interface non-empty but did not match
1501
866
            if not hasattr(value, "variant_level"):
1502
867
                properties[name] = value
1503
868
                continue
1504
 
            properties[name] = type(value)(
1505
 
                value, variant_level=value.variant_level + 1)
 
869
            properties[name] = type(value)(value, variant_level=
 
870
                                           value.variant_level+1)
1506
871
        return dbus.Dictionary(properties, signature="sv")
1507
 
 
1508
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1509
 
    def PropertiesChanged(self, interface_name, changed_properties,
1510
 
                          invalidated_properties):
1511
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
1512
 
        standard.
1513
 
        """
1514
 
        pass
1515
 
 
 
872
    
1516
873
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1517
874
                         out_signature="s",
1518
 
                         path_keyword="object_path",
1519
 
                         connection_keyword="connection")
 
875
                         path_keyword='object_path',
 
876
                         connection_keyword='connection')
1520
877
    def Introspect(self, object_path, connection):
1521
 
        """Overloading of standard D-Bus method.
1522
 
 
1523
 
        Inserts property tags and interface annotation tags.
 
878
        """Standard D-Bus method, overloaded to insert property tags.
1524
879
        """
1525
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1526
 
                                                         object_path,
1527
 
                                                         connection)
 
880
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
881
                                                   connection)
1528
882
        try:
1529
883
            document = xml.dom.minidom.parseString(xmlstring)
1530
 
 
1531
884
            def make_tag(document, name, prop):
1532
885
                e = document.createElement("property")
1533
886
                e.setAttribute("name", name)
1534
887
                e.setAttribute("type", prop._dbus_signature)
1535
888
                e.setAttribute("access", prop._dbus_access)
1536
889
                return e
1537
 
 
1538
890
            for if_tag in document.getElementsByTagName("interface"):
1539
 
                # Add property tags
1540
891
                for tag in (make_tag(document, name, prop)
1541
892
                            for name, prop
1542
 
                            in self._get_all_dbus_things("property")
 
893
                            in self._get_all_dbus_properties()
1543
894
                            if prop._dbus_interface
1544
895
                            == if_tag.getAttribute("name")):
1545
896
                    if_tag.appendChild(tag)
1546
 
                # Add annotation tags for properties
1547
 
                for tag in if_tag.getElementsByTagName("property"):
1548
 
                    annots = dict()
1549
 
                    for name, prop in self._get_all_dbus_things(
1550
 
                            "property"):
1551
 
                        if (name == tag.getAttribute("name")
1552
 
                            and prop._dbus_interface
1553
 
                            == if_tag.getAttribute("name")):
1554
 
                            annots.update(getattr(
1555
 
                                prop, "_dbus_annotations", {}))
1556
 
                    for name, value in annots.items():
1557
 
                        ann_tag = document.createElement(
1558
 
                            "annotation")
1559
 
                        ann_tag.setAttribute("name", name)
1560
 
                        ann_tag.setAttribute("value", value)
1561
 
                        tag.appendChild(ann_tag)
1562
897
                # Add the names to the return values for the
1563
898
                # "org.freedesktop.DBus.Properties" methods
1564
899
                if (if_tag.getAttribute("name")
1578
913
            document.unlink()
1579
914
        except (AttributeError, xml.dom.DOMException,
1580
915
                xml.parsers.expat.ExpatError) as error:
1581
 
            log.error("Failed to override Introspection method",
1582
 
                      exc_info=error)
1583
 
        return xmlstring
1584
 
 
1585
 
 
1586
 
try:
1587
 
    dbus.OBJECT_MANAGER_IFACE
1588
 
except AttributeError:
1589
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1590
 
 
1591
 
 
1592
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1593
 
    """A D-Bus object with an ObjectManager.
1594
 
 
1595
 
    Classes inheriting from this exposes the standard
1596
 
    GetManagedObjects call and the InterfacesAdded and
1597
 
    InterfacesRemoved signals on the standard
1598
 
    "org.freedesktop.DBus.ObjectManager" interface.
1599
 
 
1600
 
    Note: No signals are sent automatically; they must be sent
1601
 
    manually.
1602
 
    """
1603
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1604
 
                         out_signature="a{oa{sa{sv}}}")
1605
 
    def GetManagedObjects(self):
1606
 
        """This function must be overridden"""
1607
 
        raise NotImplementedError()
1608
 
 
1609
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1610
 
                         signature="oa{sa{sv}}")
1611
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
1612
 
        pass
1613
 
 
1614
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1615
 
    def InterfacesRemoved(self, object_path, interfaces):
1616
 
        pass
1617
 
 
1618
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1619
 
                         out_signature="s",
1620
 
                         path_keyword="object_path",
1621
 
                         connection_keyword="connection")
1622
 
    def Introspect(self, object_path, connection):
1623
 
        """Overloading of standard D-Bus method.
1624
 
 
1625
 
        Override return argument name of GetManagedObjects to be
1626
 
        "objpath_interfaces_and_properties"
1627
 
        """
1628
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1629
 
                                                         object_path,
1630
 
                                                         connection)
1631
 
        try:
1632
 
            document = xml.dom.minidom.parseString(xmlstring)
1633
 
 
1634
 
            for if_tag in document.getElementsByTagName("interface"):
1635
 
                # Fix argument name for the GetManagedObjects method
1636
 
                if (if_tag.getAttribute("name")
1637
 
                    == dbus.OBJECT_MANAGER_IFACE):
1638
 
                    for cn in if_tag.getElementsByTagName("method"):
1639
 
                        if (cn.getAttribute("name")
1640
 
                            == "GetManagedObjects"):
1641
 
                            for arg in cn.getElementsByTagName("arg"):
1642
 
                                if (arg.getAttribute("direction")
1643
 
                                    == "out"):
1644
 
                                    arg.setAttribute(
1645
 
                                        "name",
1646
 
                                        "objpath_interfaces"
1647
 
                                        "_and_properties")
1648
 
            xmlstring = document.toxml("utf-8")
1649
 
            document.unlink()
1650
 
        except (AttributeError, xml.dom.DOMException,
1651
 
                xml.parsers.expat.ExpatError) as error:
1652
 
            log.error("Failed to override Introspection method",
1653
 
                      exc_info=error)
1654
 
        return xmlstring
1655
 
 
1656
 
 
1657
 
def datetime_to_dbus(dt, variant_level=0):
 
916
            logger.error("Failed to override Introspection method",
 
917
                         error)
 
918
        return xmlstring
 
919
 
 
920
 
 
921
def datetime_to_dbus (dt, variant_level=0):
1658
922
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1659
923
    if dt is None:
1660
 
        return dbus.String("", variant_level=variant_level)
1661
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1662
 
 
1663
 
 
1664
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1665
 
    """A class decorator; applied to a subclass of
1666
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1667
 
    interface names according to the "alt_interface_names" mapping.
1668
 
    Usage:
1669
 
 
1670
 
    @alternate_dbus_interfaces({"org.example.Interface":
1671
 
                                    "net.example.AlternateInterface"})
1672
 
    class SampleDBusObject(dbus.service.Object):
1673
 
        @dbus.service.method("org.example.Interface")
1674
 
        def SampleDBusMethod():
1675
 
            pass
1676
 
 
1677
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1678
 
    reachable via two interfaces: "org.example.Interface" and
1679
 
    "net.example.AlternateInterface", the latter of which will have
1680
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1681
 
    "true", unless "deprecate" is passed with a False value.
1682
 
 
1683
 
    This works for methods and signals, and also for D-Bus properties
1684
 
    (from DBusObjectWithProperties) and interfaces (from the
1685
 
    dbus_interface_annotations decorator).
 
924
        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.
1686
933
    """
1687
 
 
1688
 
    def wrapper(cls):
1689
 
        for orig_interface_name, alt_interface_name in (
1690
 
                alt_interface_names.items()):
1691
 
            attr = {}
1692
 
            interface_names = set()
1693
 
            # Go though all attributes of the class
1694
 
            for attrname, attribute in inspect.getmembers(cls):
 
934
    def __new__(mcs, name, bases, attr):
 
935
        # Go through all the base classes which could have D-Bus
 
936
        # methods, signals, or properties in them
 
937
        for base in (b for b in bases
 
938
                     if issubclass(b, dbus.service.Object)):
 
939
            # Go though all attributes of the base class
 
940
            for attrname, attribute in inspect.getmembers(base):
1695
941
                # Ignore non-D-Bus attributes, and D-Bus attributes
1696
942
                # with the wrong interface name
1697
943
                if (not hasattr(attribute, "_dbus_interface")
1698
 
                    or not attribute._dbus_interface.startswith(
1699
 
                        orig_interface_name)):
 
944
                    or not attribute._dbus_interface
 
945
                    .startswith("se.recompile.Mandos")):
1700
946
                    continue
1701
947
                # Create an alternate D-Bus interface name based on
1702
948
                # the current name
1703
 
                alt_interface = attribute._dbus_interface.replace(
1704
 
                    orig_interface_name, alt_interface_name)
1705
 
                interface_names.add(alt_interface)
 
949
                alt_interface = (attribute._dbus_interface
 
950
                                 .replace("se.recompile.Mandos",
 
951
                                          "se.bsnet.fukt.Mandos"))
1706
952
                # Is this a D-Bus signal?
1707
953
                if getattr(attribute, "_dbus_is_signal", False):
1708
 
                    # Extract the original non-method undecorated
1709
 
                    # function by black magic
1710
 
                    if sys.version_info.major == 2:
1711
 
                        nonmethod_func = (dict(
 
954
                    # Extract the original non-method function by
 
955
                    # black magic
 
956
                    nonmethod_func = (dict(
1712
957
                            zip(attribute.func_code.co_freevars,
1713
 
                                attribute.__closure__))
1714
 
                                          ["func"].cell_contents)
1715
 
                    else:
1716
 
                        nonmethod_func = (dict(
1717
 
                            zip(attribute.__code__.co_freevars,
1718
 
                                attribute.__closure__))
1719
 
                                          ["func"].cell_contents)
 
958
                                attribute.__closure__))["func"]
 
959
                                      .cell_contents)
1720
960
                    # Create a new, but exactly alike, function
1721
961
                    # object, and decorate it to be a new D-Bus signal
1722
962
                    # with the alternate D-Bus interface name
1723
 
                    new_function = copy_function(nonmethod_func)
1724
 
                    new_function = (dbus.service.signal(
1725
 
                        alt_interface,
1726
 
                        attribute._dbus_signature)(new_function))
1727
 
                    # Copy annotations, if any
1728
 
                    try:
1729
 
                        new_function._dbus_annotations = dict(
1730
 
                            attribute._dbus_annotations)
1731
 
                    except AttributeError:
1732
 
                        pass
1733
 
 
 
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)))
1734
972
                    # Define a creator of a function to call both the
1735
 
                    # original and alternate functions, so both the
1736
 
                    # original and alternate signals gets sent when
1737
 
                    # the function is called
 
973
                    # old and new functions, so both the old and new
 
974
                    # signals gets sent when the function is called
1738
975
                    def fixscope(func1, func2):
1739
976
                        """This function is a scope container to pass
1740
977
                        func1 and func2 to the "call_both" function
1741
978
                        outside of its arguments"""
1742
 
 
1743
 
                        @functools.wraps(func2)
1744
979
                        def call_both(*args, **kwargs):
1745
980
                            """This function will emit two D-Bus
1746
981
                            signals by calling func1 and func2"""
1747
982
                            func1(*args, **kwargs)
1748
983
                            func2(*args, **kwargs)
1749
 
                        # Make wrapper function look like a D-Bus
1750
 
                        # signal
1751
 
                        for name, attr in inspect.getmembers(func2):
1752
 
                            if name.startswith("_dbus_"):
1753
 
                                setattr(call_both, name, attr)
1754
 
 
1755
984
                        return call_both
1756
985
                    # Create the "call_both" function and add it to
1757
986
                    # the class
1758
 
                    attr[attrname] = fixscope(attribute, new_function)
 
987
                    attr[attrname] = fixscope(attribute,
 
988
                                              new_function)
1759
989
                # Is this a D-Bus method?
1760
990
                elif getattr(attribute, "_dbus_is_method", False):
1761
991
                    # Create a new, but exactly alike, function
1762
992
                    # object.  Decorate it to be a new D-Bus method
1763
993
                    # with the alternate D-Bus interface name.  Add it
1764
994
                    # to the class.
1765
 
                    attr[attrname] = (
1766
 
                        dbus.service.method(
1767
 
                            alt_interface,
1768
 
                            attribute._dbus_in_signature,
1769
 
                            attribute._dbus_out_signature)
1770
 
                        (copy_function(attribute)))
1771
 
                    # Copy annotations, if any
1772
 
                    try:
1773
 
                        attr[attrname]._dbus_annotations = dict(
1774
 
                            attribute._dbus_annotations)
1775
 
                    except AttributeError:
1776
 
                        pass
 
995
                    attr[attrname] = (dbus.service.method
 
996
                                      (alt_interface,
 
997
                                       attribute._dbus_in_signature,
 
998
                                       attribute._dbus_out_signature)
 
999
                                      (types.FunctionType
 
1000
                                       (attribute.func_code,
 
1001
                                        attribute.func_globals,
 
1002
                                        attribute.func_name,
 
1003
                                        attribute.func_defaults,
 
1004
                                        attribute.func_closure)))
1777
1005
                # Is this a D-Bus property?
1778
1006
                elif getattr(attribute, "_dbus_is_property", False):
1779
1007
                    # Create a new, but exactly alike, function
1780
1008
                    # object, and decorate it to be a new D-Bus
1781
1009
                    # property with the alternate D-Bus interface
1782
1010
                    # name.  Add it to the class.
1783
 
                    attr[attrname] = (dbus_service_property(
1784
 
                        alt_interface, attribute._dbus_signature,
1785
 
                        attribute._dbus_access,
1786
 
                        attribute._dbus_get_args_options
1787
 
                        ["byte_arrays"])
1788
 
                                      (copy_function(attribute)))
1789
 
                    # Copy annotations, if any
1790
 
                    try:
1791
 
                        attr[attrname]._dbus_annotations = dict(
1792
 
                            attribute._dbus_annotations)
1793
 
                    except AttributeError:
1794
 
                        pass
1795
 
                # Is this a D-Bus interface?
1796
 
                elif getattr(attribute, "_dbus_is_interface", False):
1797
 
                    # Create a new, but exactly alike, function
1798
 
                    # object.  Decorate it to be a new D-Bus interface
1799
 
                    # with the alternate D-Bus interface name.  Add it
1800
 
                    # to the class.
1801
 
                    attr[attrname] = (
1802
 
                        dbus_interface_annotations(alt_interface)
1803
 
                        (copy_function(attribute)))
1804
 
            if deprecate:
1805
 
                # Deprecate all alternate interfaces
1806
 
                iname = "_AlternateDBusNames_interface_annotation{}"
1807
 
                for interface_name in interface_names:
1808
 
 
1809
 
                    @dbus_interface_annotations(interface_name)
1810
 
                    def func(self):
1811
 
                        return {"org.freedesktop.DBus.Deprecated":
1812
 
                                "true"}
1813
 
                    # Find an unused name
1814
 
                    for aname in (iname.format(i)
1815
 
                                  for i in itertools.count()):
1816
 
                        if aname not in attr:
1817
 
                            attr[aname] = func
1818
 
                            break
1819
 
            if interface_names:
1820
 
                # Replace the class with a new subclass of it with
1821
 
                # methods, signals, etc. as created above.
1822
 
                if sys.version_info.major == 2:
1823
 
                    cls = type(b"{}Alternate".format(cls.__name__),
1824
 
                               (cls, ), attr)
1825
 
                else:
1826
 
                    cls = type("{}Alternate".format(cls.__name__),
1827
 
                               (cls, ), attr)
1828
 
        return cls
1829
 
 
1830
 
    return wrapper
1831
 
 
1832
 
 
1833
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1834
 
                            "se.bsnet.fukt.Mandos"})
 
1011
                    attr[attrname] = (dbus_service_property
 
1012
                                      (alt_interface,
 
1013
                                       attribute._dbus_signature,
 
1014
                                       attribute._dbus_access,
 
1015
                                       attribute
 
1016
                                       ._dbus_get_args_options
 
1017
                                       ["byte_arrays"])
 
1018
                                      (types.FunctionType
 
1019
                                       (attribute.func_code,
 
1020
                                        attribute.func_globals,
 
1021
                                        attribute.func_name,
 
1022
                                        attribute.func_defaults,
 
1023
                                        attribute.func_closure)))
 
1024
        return type.__new__(mcs, name, bases, attr)
 
1025
 
 
1026
 
1835
1027
class ClientDBus(Client, DBusObjectWithProperties):
1836
1028
    """A Client class using D-Bus
1837
 
 
 
1029
    
1838
1030
    Attributes:
1839
1031
    dbus_object_path: dbus.ObjectPath
1840
1032
    bus: dbus.SystemBus()
1841
1033
    """
1842
 
 
 
1034
    
1843
1035
    runtime_expansions = (Client.runtime_expansions
1844
 
                          + ("dbus_object_path", ))
1845
 
 
1846
 
    _interface = "se.recompile.Mandos.Client"
1847
 
 
 
1036
                          + ("dbus_object_path",))
 
1037
    
1848
1038
    # dbus.service.Object doesn't use super(), so we can't either.
1849
 
 
1850
 
    def __init__(self, bus=None, *args, **kwargs):
 
1039
    
 
1040
    def __init__(self, bus = None, *args, **kwargs):
1851
1041
        self.bus = bus
1852
1042
        Client.__init__(self, *args, **kwargs)
 
1043
        self._approvals_pending = 0
 
1044
        
 
1045
        self._approvals_pending = 0
1853
1046
        # Only now, when this client is initialized, can it show up on
1854
1047
        # the D-Bus
1855
 
        client_object_name = str(self.name).translate(
 
1048
        client_object_name = unicode(self.name).translate(
1856
1049
            {ord("."): ord("_"),
1857
1050
             ord("-"): ord("_")})
1858
 
        self.dbus_object_path = dbus.ObjectPath(
1859
 
            "/clients/" + client_object_name)
 
1051
        self.dbus_object_path = (dbus.ObjectPath
 
1052
                                 ("/clients/" + client_object_name))
1860
1053
        DBusObjectWithProperties.__init__(self, self.bus,
1861
1054
                                          self.dbus_object_path)
1862
 
 
1863
 
    def notifychangeproperty(transform_func, dbus_name,
1864
 
                             type_func=lambda x: x,
1865
 
                             variant_level=1,
1866
 
                             invalidate_only=False,
1867
 
                             _interface=_interface):
 
1055
        
 
1056
    def notifychangeproperty(transform_func,
 
1057
                             dbus_name, type_func=lambda x: x,
 
1058
                             variant_level=1):
1868
1059
        """ Modify a variable so that it's a property which announces
1869
1060
        its changes to DBus.
1870
 
 
 
1061
        
1871
1062
        transform_fun: Function that takes a value and a variant_level
1872
1063
                       and transforms it to a D-Bus type.
1873
1064
        dbus_name: D-Bus name of the variable
1875
1066
                   to the D-Bus.  Default: no transform
1876
1067
        variant_level: D-Bus variant level.  Default: 1
1877
1068
        """
1878
 
        attrname = "_{}".format(dbus_name)
1879
 
 
 
1069
        attrname = "_{0}".format(dbus_name)
1880
1070
        def setter(self, value):
1881
1071
            if hasattr(self, "dbus_object_path"):
1882
1072
                if (not hasattr(self, attrname) or
1883
1073
                    type_func(getattr(self, attrname, None))
1884
1074
                    != type_func(value)):
1885
 
                    if invalidate_only:
1886
 
                        self.PropertiesChanged(
1887
 
                            _interface, dbus.Dictionary(),
1888
 
                            dbus.Array((dbus_name, )))
1889
 
                    else:
1890
 
                        dbus_value = transform_func(
1891
 
                            type_func(value),
1892
 
                            variant_level=variant_level)
1893
 
                        self.PropertyChanged(dbus.String(dbus_name),
1894
 
                                             dbus_value)
1895
 
                        self.PropertiesChanged(
1896
 
                            _interface,
1897
 
                            dbus.Dictionary({dbus.String(dbus_name):
1898
 
                                             dbus_value}),
1899
 
                            dbus.Array())
 
1075
                    dbus_value = transform_func(type_func(value),
 
1076
                                                variant_level
 
1077
                                                =variant_level)
 
1078
                    self.PropertyChanged(dbus.String(dbus_name),
 
1079
                                         dbus_value)
1900
1080
            setattr(self, attrname, value)
1901
 
 
 
1081
        
1902
1082
        return property(lambda self: getattr(self, attrname), setter)
1903
 
 
 
1083
    
 
1084
    
1904
1085
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1905
1086
    approvals_pending = notifychangeproperty(dbus.Boolean,
1906
1087
                                             "ApprovalPending",
1907
 
                                             type_func=bool)
 
1088
                                             type_func = bool)
1908
1089
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1909
1090
    last_enabled = notifychangeproperty(datetime_to_dbus,
1910
1091
                                        "LastEnabled")
1911
 
    checker = notifychangeproperty(
1912
 
        dbus.Boolean, "CheckerRunning",
1913
 
        type_func=lambda checker: checker is not None)
 
1092
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1093
                                   type_func = lambda checker:
 
1094
                                       checker is not None)
1914
1095
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1915
1096
                                           "LastCheckedOK")
1916
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1917
 
                                               "LastCheckerStatus")
1918
1097
    last_approval_request = notifychangeproperty(
1919
1098
        datetime_to_dbus, "LastApprovalRequest")
1920
1099
    approved_by_default = notifychangeproperty(dbus.Boolean,
1921
1100
                                               "ApprovedByDefault")
1922
 
    approval_delay = notifychangeproperty(
1923
 
        dbus.UInt64, "ApprovalDelay",
1924
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1101
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1102
                                          "ApprovalDelay",
 
1103
                                          type_func =
 
1104
                                          timedelta_to_milliseconds)
1925
1105
    approval_duration = notifychangeproperty(
1926
1106
        dbus.UInt64, "ApprovalDuration",
1927
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1107
        type_func = timedelta_to_milliseconds)
1928
1108
    host = notifychangeproperty(dbus.String, "Host")
1929
 
    timeout = notifychangeproperty(
1930
 
        dbus.UInt64, "Timeout",
1931
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1109
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1110
                                   type_func =
 
1111
                                   timedelta_to_milliseconds)
1932
1112
    extended_timeout = notifychangeproperty(
1933
1113
        dbus.UInt64, "ExtendedTimeout",
1934
 
        type_func=lambda td: td.total_seconds() * 1000)
1935
 
    interval = notifychangeproperty(
1936
 
        dbus.UInt64, "Interval",
1937
 
        type_func=lambda td: td.total_seconds() * 1000)
 
1114
        type_func = timedelta_to_milliseconds)
 
1115
    interval = notifychangeproperty(dbus.UInt64,
 
1116
                                    "Interval",
 
1117
                                    type_func =
 
1118
                                    timedelta_to_milliseconds)
1938
1119
    checker_command = notifychangeproperty(dbus.String, "Checker")
1939
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1940
 
                                  invalidate_only=True)
1941
 
 
 
1120
    
1942
1121
    del notifychangeproperty
1943
 
 
 
1122
    
1944
1123
    def __del__(self, *args, **kwargs):
1945
1124
        try:
1946
1125
            self.remove_from_connection()
1949
1128
        if hasattr(DBusObjectWithProperties, "__del__"):
1950
1129
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1951
1130
        Client.__del__(self, *args, **kwargs)
1952
 
 
1953
 
    def checker_callback(self, source, condition,
1954
 
                         connection, command, *args, **kwargs):
1955
 
        ret = Client.checker_callback(self, source, condition,
1956
 
                                      connection, command, *args,
1957
 
                                      **kwargs)
1958
 
        exitstatus = self.last_checker_status
1959
 
        if exitstatus >= 0:
 
1131
    
 
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)
1960
1138
            # Emit D-Bus signal
1961
1139
            self.CheckerCompleted(dbus.Int16(exitstatus),
1962
 
                                  # This is specific to GNU libC
1963
 
                                  dbus.Int64(exitstatus << 8),
 
1140
                                  dbus.Int64(condition),
1964
1141
                                  dbus.String(command))
1965
1142
        else:
1966
1143
            # Emit D-Bus signal
1967
1144
            self.CheckerCompleted(dbus.Int16(-1),
1968
 
                                  dbus.Int64(
1969
 
                                      # This is specific to GNU libC
1970
 
                                      (exitstatus << 8)
1971
 
                                      | self.last_checker_signal),
 
1145
                                  dbus.Int64(condition),
1972
1146
                                  dbus.String(command))
1973
 
        return ret
1974
 
 
 
1147
        
 
1148
        return Client.checker_callback(self, pid, condition, command,
 
1149
                                       *args, **kwargs)
 
1150
    
1975
1151
    def start_checker(self, *args, **kwargs):
1976
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1152
        old_checker = self.checker
 
1153
        if self.checker is not None:
 
1154
            old_checker_pid = self.checker.pid
 
1155
        else:
 
1156
            old_checker_pid = None
1977
1157
        r = Client.start_checker(self, *args, **kwargs)
1978
1158
        # Only if new checker process was started
1979
1159
        if (self.checker is not None
1981
1161
            # Emit D-Bus signal
1982
1162
            self.CheckerStarted(self.current_checker_command)
1983
1163
        return r
1984
 
 
 
1164
    
1985
1165
    def _reset_approved(self):
1986
1166
        self.approved = None
1987
1167
        return False
1988
 
 
 
1168
    
1989
1169
    def approve(self, value=True):
 
1170
        self.send_changedstate()
1990
1171
        self.approved = value
1991
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1992
 
                             * 1000), self._reset_approved)
1993
 
        self.send_changedstate()
1994
 
 
1995
 
    #  D-Bus methods, signals & properties
1996
 
 
1997
 
    #  Interfaces
1998
 
 
1999
 
    #  Signals
2000
 
 
 
1172
        gobject.timeout_add(timedelta_to_milliseconds
 
1173
                            (self.approval_duration),
 
1174
                            self._reset_approved)
 
1175
    
 
1176
    
 
1177
    ## D-Bus methods, signals & properties
 
1178
    _interface = "se.recompile.Mandos.Client"
 
1179
    
 
1180
    ## Signals
 
1181
    
2001
1182
    # CheckerCompleted - signal
2002
1183
    @dbus.service.signal(_interface, signature="nxs")
2003
1184
    def CheckerCompleted(self, exitcode, waitstatus, command):
2004
1185
        "D-Bus signal"
2005
1186
        pass
2006
 
 
 
1187
    
2007
1188
    # CheckerStarted - signal
2008
1189
    @dbus.service.signal(_interface, signature="s")
2009
1190
    def CheckerStarted(self, command):
2010
1191
        "D-Bus signal"
2011
1192
        pass
2012
 
 
 
1193
    
2013
1194
    # PropertyChanged - signal
2014
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2015
1195
    @dbus.service.signal(_interface, signature="sv")
2016
1196
    def PropertyChanged(self, property, value):
2017
1197
        "D-Bus signal"
2018
1198
        pass
2019
 
 
 
1199
    
2020
1200
    # GotSecret - signal
2021
1201
    @dbus.service.signal(_interface)
2022
1202
    def GotSecret(self):
2025
1205
        server to mandos-client
2026
1206
        """
2027
1207
        pass
2028
 
 
 
1208
    
2029
1209
    # Rejected - signal
2030
1210
    @dbus.service.signal(_interface, signature="s")
2031
1211
    def Rejected(self, reason):
2032
1212
        "D-Bus signal"
2033
1213
        pass
2034
 
 
 
1214
    
2035
1215
    # NeedApproval - signal
2036
1216
    @dbus.service.signal(_interface, signature="tb")
2037
1217
    def NeedApproval(self, timeout, default):
2038
1218
        "D-Bus signal"
2039
1219
        return self.need_approval()
2040
 
 
2041
 
    #  Methods
2042
 
 
 
1220
    
 
1221
    # NeRwequest - signal
 
1222
    @dbus.service.signal(_interface, signature="s")
 
1223
    def NewRequest(self, ip):
 
1224
        """D-Bus signal
 
1225
        Is sent after a client request a password.
 
1226
        """
 
1227
        pass
 
1228
    
 
1229
    ## Methods
 
1230
    
2043
1231
    # Approve - method
2044
1232
    @dbus.service.method(_interface, in_signature="b")
2045
1233
    def Approve(self, value):
2046
1234
        self.approve(value)
2047
 
 
 
1235
    
2048
1236
    # CheckedOK - method
2049
1237
    @dbus.service.method(_interface)
2050
1238
    def CheckedOK(self):
2051
1239
        self.checked_ok()
2052
 
 
 
1240
    
2053
1241
    # Enable - method
2054
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2055
1242
    @dbus.service.method(_interface)
2056
1243
    def Enable(self):
2057
1244
        "D-Bus method"
2058
1245
        self.enable()
2059
 
 
 
1246
    
2060
1247
    # StartChecker - method
2061
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2062
1248
    @dbus.service.method(_interface)
2063
1249
    def StartChecker(self):
2064
1250
        "D-Bus method"
2065
1251
        self.start_checker()
2066
 
 
 
1252
    
2067
1253
    # Disable - method
2068
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2069
1254
    @dbus.service.method(_interface)
2070
1255
    def Disable(self):
2071
1256
        "D-Bus method"
2072
1257
        self.disable()
2073
 
 
 
1258
    
2074
1259
    # StopChecker - method
2075
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2076
1260
    @dbus.service.method(_interface)
2077
1261
    def StopChecker(self):
2078
1262
        self.stop_checker()
2079
 
 
2080
 
    #  Properties
2081
 
 
 
1263
    
 
1264
    ## Properties
 
1265
    
2082
1266
    # ApprovalPending - property
2083
1267
    @dbus_service_property(_interface, signature="b", access="read")
2084
1268
    def ApprovalPending_dbus_property(self):
2085
1269
        return dbus.Boolean(bool(self.approvals_pending))
2086
 
 
 
1270
    
2087
1271
    # ApprovedByDefault - property
2088
 
    @dbus_service_property(_interface,
2089
 
                           signature="b",
 
1272
    @dbus_service_property(_interface, signature="b",
2090
1273
                           access="readwrite")
2091
1274
    def ApprovedByDefault_dbus_property(self, value=None):
2092
1275
        if value is None:       # get
2093
1276
            return dbus.Boolean(self.approved_by_default)
2094
1277
        self.approved_by_default = bool(value)
2095
 
 
 
1278
    
2096
1279
    # ApprovalDelay - property
2097
 
    @dbus_service_property(_interface,
2098
 
                           signature="t",
 
1280
    @dbus_service_property(_interface, signature="t",
2099
1281
                           access="readwrite")
2100
1282
    def ApprovalDelay_dbus_property(self, value=None):
2101
1283
        if value is None:       # get
2102
 
            return dbus.UInt64(self.approval_delay.total_seconds()
2103
 
                               * 1000)
 
1284
            return dbus.UInt64(self.approval_delay_milliseconds())
2104
1285
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
2105
 
 
 
1286
    
2106
1287
    # ApprovalDuration - property
2107
 
    @dbus_service_property(_interface,
2108
 
                           signature="t",
 
1288
    @dbus_service_property(_interface, signature="t",
2109
1289
                           access="readwrite")
2110
1290
    def ApprovalDuration_dbus_property(self, value=None):
2111
1291
        if value is None:       # get
2112
 
            return dbus.UInt64(self.approval_duration.total_seconds()
2113
 
                               * 1000)
 
1292
            return dbus.UInt64(timedelta_to_milliseconds(
 
1293
                    self.approval_duration))
2114
1294
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
2115
 
 
 
1295
    
2116
1296
    # Name - property
2117
 
    @dbus_annotations(
2118
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2119
1297
    @dbus_service_property(_interface, signature="s", access="read")
2120
1298
    def Name_dbus_property(self):
2121
1299
        return dbus.String(self.name)
2122
 
 
2123
 
    # KeyID - property
2124
 
    @dbus_annotations(
2125
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2126
 
    @dbus_service_property(_interface, signature="s", access="read")
2127
 
    def KeyID_dbus_property(self):
2128
 
        return dbus.String(self.key_id)
2129
 
 
 
1300
    
2130
1301
    # Fingerprint - property
2131
 
    @dbus_annotations(
2132
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2133
1302
    @dbus_service_property(_interface, signature="s", access="read")
2134
1303
    def Fingerprint_dbus_property(self):
2135
1304
        return dbus.String(self.fingerprint)
2136
 
 
 
1305
    
2137
1306
    # Host - property
2138
 
    @dbus_service_property(_interface,
2139
 
                           signature="s",
 
1307
    @dbus_service_property(_interface, signature="s",
2140
1308
                           access="readwrite")
2141
1309
    def Host_dbus_property(self, value=None):
2142
1310
        if value is None:       # get
2143
1311
            return dbus.String(self.host)
2144
 
        self.host = str(value)
2145
 
 
 
1312
        self.host = unicode(value)
 
1313
    
2146
1314
    # Created - property
2147
 
    @dbus_annotations(
2148
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2149
1315
    @dbus_service_property(_interface, signature="s", access="read")
2150
1316
    def Created_dbus_property(self):
2151
1317
        return datetime_to_dbus(self.created)
2152
 
 
 
1318
    
2153
1319
    # LastEnabled - property
2154
1320
    @dbus_service_property(_interface, signature="s", access="read")
2155
1321
    def LastEnabled_dbus_property(self):
2156
1322
        return datetime_to_dbus(self.last_enabled)
2157
 
 
 
1323
    
2158
1324
    # Enabled - property
2159
 
    @dbus_service_property(_interface,
2160
 
                           signature="b",
 
1325
    @dbus_service_property(_interface, signature="b",
2161
1326
                           access="readwrite")
2162
1327
    def Enabled_dbus_property(self, value=None):
2163
1328
        if value is None:       # get
2166
1331
            self.enable()
2167
1332
        else:
2168
1333
            self.disable()
2169
 
 
 
1334
    
2170
1335
    # LastCheckedOK - property
2171
 
    @dbus_service_property(_interface,
2172
 
                           signature="s",
 
1336
    @dbus_service_property(_interface, signature="s",
2173
1337
                           access="readwrite")
2174
1338
    def LastCheckedOK_dbus_property(self, value=None):
2175
1339
        if value is not None:
2176
1340
            self.checked_ok()
2177
1341
            return
2178
1342
        return datetime_to_dbus(self.last_checked_ok)
2179
 
 
2180
 
    # LastCheckerStatus - property
2181
 
    @dbus_service_property(_interface, signature="n", access="read")
2182
 
    def LastCheckerStatus_dbus_property(self):
2183
 
        return dbus.Int16(self.last_checker_status)
2184
 
 
 
1343
    
2185
1344
    # Expires - property
2186
1345
    @dbus_service_property(_interface, signature="s", access="read")
2187
1346
    def Expires_dbus_property(self):
2188
1347
        return datetime_to_dbus(self.expires)
2189
 
 
 
1348
    
2190
1349
    # LastApprovalRequest - property
2191
1350
    @dbus_service_property(_interface, signature="s", access="read")
2192
1351
    def LastApprovalRequest_dbus_property(self):
2193
1352
        return datetime_to_dbus(self.last_approval_request)
2194
 
 
 
1353
    
2195
1354
    # Timeout - property
2196
 
    @dbus_service_property(_interface,
2197
 
                           signature="t",
 
1355
    @dbus_service_property(_interface, signature="t",
2198
1356
                           access="readwrite")
2199
1357
    def Timeout_dbus_property(self, value=None):
2200
1358
        if value is None:       # get
2201
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
2202
 
        old_timeout = self.timeout
 
1359
            return dbus.UInt64(self.timeout_milliseconds())
2203
1360
        self.timeout = datetime.timedelta(0, 0, 0, value)
2204
 
        # Reschedule disabling
2205
 
        if self.enabled:
2206
 
            now = datetime.datetime.utcnow()
2207
 
            self.expires += self.timeout - old_timeout
2208
 
            if self.expires <= now:
2209
 
                # The timeout has passed
2210
 
                self.disable()
2211
 
            else:
2212
 
                if (getattr(self, "disable_initiator_tag", None)
2213
 
                    is None):
2214
 
                    return
2215
 
                GLib.source_remove(self.disable_initiator_tag)
2216
 
                self.disable_initiator_tag = GLib.timeout_add(
2217
 
                    int((self.expires - now).total_seconds() * 1000),
2218
 
                    self.disable)
2219
 
 
 
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))
 
1381
    
2220
1382
    # ExtendedTimeout - property
2221
 
    @dbus_service_property(_interface,
2222
 
                           signature="t",
 
1383
    @dbus_service_property(_interface, signature="t",
2223
1384
                           access="readwrite")
2224
1385
    def ExtendedTimeout_dbus_property(self, value=None):
2225
1386
        if value is None:       # get
2226
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
2227
 
                               * 1000)
 
1387
            return dbus.UInt64(self.extended_timeout_milliseconds())
2228
1388
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2229
 
 
 
1389
    
2230
1390
    # Interval - property
2231
 
    @dbus_service_property(_interface,
2232
 
                           signature="t",
 
1391
    @dbus_service_property(_interface, signature="t",
2233
1392
                           access="readwrite")
2234
1393
    def Interval_dbus_property(self, value=None):
2235
1394
        if value is None:       # get
2236
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1395
            return dbus.UInt64(self.interval_milliseconds())
2237
1396
        self.interval = datetime.timedelta(0, 0, 0, value)
2238
1397
        if getattr(self, "checker_initiator_tag", None) is None:
2239
1398
            return
2240
1399
        if self.enabled:
2241
1400
            # Reschedule checker run
2242
 
            GLib.source_remove(self.checker_initiator_tag)
2243
 
            self.checker_initiator_tag = GLib.timeout_add(
2244
 
                value, self.start_checker)
2245
 
            self.start_checker()  # Start one now, too
2246
 
 
 
1401
            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
 
1405
    
2247
1406
    # Checker - property
2248
 
    @dbus_service_property(_interface,
2249
 
                           signature="s",
 
1407
    @dbus_service_property(_interface, signature="s",
2250
1408
                           access="readwrite")
2251
1409
    def Checker_dbus_property(self, value=None):
2252
1410
        if value is None:       # get
2253
1411
            return dbus.String(self.checker_command)
2254
 
        self.checker_command = str(value)
2255
 
 
 
1412
        self.checker_command = unicode(value)
 
1413
    
2256
1414
    # CheckerRunning - property
2257
 
    @dbus_service_property(_interface,
2258
 
                           signature="b",
 
1415
    @dbus_service_property(_interface, signature="b",
2259
1416
                           access="readwrite")
2260
1417
    def CheckerRunning_dbus_property(self, value=None):
2261
1418
        if value is None:       # get
2264
1421
            self.start_checker()
2265
1422
        else:
2266
1423
            self.stop_checker()
2267
 
 
 
1424
    
2268
1425
    # ObjectPath - property
2269
 
    @dbus_annotations(
2270
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2271
 
         "org.freedesktop.DBus.Deprecated": "true"})
2272
1426
    @dbus_service_property(_interface, signature="o", access="read")
2273
1427
    def ObjectPath_dbus_property(self):
2274
 
        return self.dbus_object_path  # is already a dbus.ObjectPath
2275
 
 
 
1428
        return self.dbus_object_path # is already a dbus.ObjectPath
 
1429
    
2276
1430
    # Secret = property
2277
 
    @dbus_annotations(
2278
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
2279
 
         "invalidates"})
2280
 
    @dbus_service_property(_interface,
2281
 
                           signature="ay",
2282
 
                           access="write",
2283
 
                           byte_arrays=True)
 
1431
    @dbus_service_property(_interface, signature="ay",
 
1432
                           access="write", byte_arrays=True)
2284
1433
    def Secret_dbus_property(self, value):
2285
 
        self.secret = bytes(value)
2286
 
 
 
1434
        self.secret = str(value)
 
1435
    
2287
1436
    del _interface
2288
1437
 
2289
1438
 
2290
 
class ProxyClient:
2291
 
    def __init__(self, child_pipe, key_id, fpr, address):
 
1439
class ProxyClient(object):
 
1440
    def __init__(self, child_pipe, fpr, address):
2292
1441
        self._pipe = child_pipe
2293
 
        self._pipe.send(("init", key_id, fpr, address))
 
1442
        self._pipe.send(('init', fpr, address))
2294
1443
        if not self._pipe.recv():
2295
 
            raise KeyError(key_id or fpr)
2296
 
 
 
1444
            raise KeyError()
 
1445
    
2297
1446
    def __getattribute__(self, name):
2298
 
        if name == "_pipe":
 
1447
        if name == '_pipe':
2299
1448
            return super(ProxyClient, self).__getattribute__(name)
2300
 
        self._pipe.send(("getattr", name))
 
1449
        self._pipe.send(('getattr', name))
2301
1450
        data = self._pipe.recv()
2302
 
        if data[0] == "data":
 
1451
        if data[0] == 'data':
2303
1452
            return data[1]
2304
 
        if data[0] == "function":
2305
 
 
 
1453
        if data[0] == 'function':
2306
1454
            def func(*args, **kwargs):
2307
 
                self._pipe.send(("funcall", name, args, kwargs))
 
1455
                self._pipe.send(('funcall', name, args, kwargs))
2308
1456
                return self._pipe.recv()[1]
2309
 
 
2310
1457
            return func
2311
 
 
 
1458
    
2312
1459
    def __setattr__(self, name, value):
2313
 
        if name == "_pipe":
 
1460
        if name == '_pipe':
2314
1461
            return super(ProxyClient, self).__setattr__(name, value)
2315
 
        self._pipe.send(("setattr", name, value))
 
1462
        self._pipe.send(('setattr', name, value))
 
1463
 
 
1464
 
 
1465
class ClientDBusTransitional(ClientDBus):
 
1466
    __metaclass__ = AlternateDBusNamesMetaclass
2316
1467
 
2317
1468
 
2318
1469
class ClientHandler(socketserver.BaseRequestHandler, object):
2319
1470
    """A class to handle client connections.
2320
 
 
 
1471
    
2321
1472
    Instantiated once for each connection to handle it.
2322
1473
    Note: This will run in its own forked process."""
2323
 
 
 
1474
    
2324
1475
    def handle(self):
2325
1476
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2326
 
            log.info("TCP connection from: %s",
2327
 
                     str(self.client_address))
2328
 
            log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2329
 
 
2330
 
            session = gnutls.ClientSession(self.request)
2331
 
 
2332
 
            # priority = ":".join(("NONE", "+VERS-TLS1.1",
2333
 
            #                       "+AES-256-CBC", "+SHA1",
2334
 
            #                       "+COMP-NULL", "+CTYPE-OPENPGP",
2335
 
            #                       "+DHE-DSS"))
 
1477
            logger.info("TCP connection from: %s",
 
1478
                        unicode(self.client_address))
 
1479
            logger.debug("Pipe FD: %d",
 
1480
                         self.server.child_pipe.fileno())
 
1481
            
 
1482
            session = (gnutls.connection
 
1483
                       .ClientSession(self.request,
 
1484
                                      gnutls.connection
 
1485
                                      .X509Credentials()))
 
1486
            
 
1487
            # Note: gnutls.connection.X509Credentials is really a
 
1488
            # generic GnuTLS certificate credentials object so long as
 
1489
            # no X.509 keys are added to it.  Therefore, we can use it
 
1490
            # here despite using OpenPGP certificates.
 
1491
            
 
1492
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1493
            #                      "+AES-256-CBC", "+SHA1",
 
1494
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1495
            #                      "+DHE-DSS"))
2336
1496
            # Use a fallback default, since this MUST be set.
2337
1497
            priority = self.server.gnutls_priority
2338
1498
            if priority is None:
2339
1499
                priority = "NORMAL"
2340
 
            gnutls.priority_set_direct(session,
2341
 
                                       priority.encode("utf-8"), None)
2342
 
 
 
1500
            (gnutls.library.functions
 
1501
             .gnutls_priority_set_direct(session._c_object,
 
1502
                                         priority, None))
 
1503
            
2343
1504
            # Start communication using the Mandos protocol
2344
1505
            # Get protocol number
2345
1506
            line = self.request.makefile().readline()
2346
 
            log.debug("Protocol version: %r", line)
 
1507
            logger.debug("Protocol version: %r", line)
2347
1508
            try:
2348
1509
                if int(line.strip().split()[0]) > 1:
2349
 
                    raise RuntimeError(line)
 
1510
                    raise RuntimeError
2350
1511
            except (ValueError, IndexError, RuntimeError) as error:
2351
 
                log.error("Unknown protocol version: %s", error)
 
1512
                logger.error("Unknown protocol version: %s", error)
2352
1513
                return
2353
 
 
 
1514
            
2354
1515
            # Start GnuTLS connection
2355
1516
            try:
2356
1517
                session.handshake()
2357
 
            except gnutls.Error as error:
2358
 
                log.warning("Handshake failed: %s", error)
 
1518
            except gnutls.errors.GNUTLSError as error:
 
1519
                logger.warning("Handshake failed: %s", error)
2359
1520
                # Do not run session.bye() here: the session is not
2360
1521
                # established.  Just abandon the request.
2361
1522
                return
2362
 
            log.debug("Handshake succeeded")
2363
 
 
 
1523
            logger.debug("Handshake succeeded")
 
1524
            
2364
1525
            approval_required = False
2365
1526
            try:
2366
 
                if gnutls.has_rawpk:
2367
 
                    fpr = b""
2368
 
                    try:
2369
 
                        key_id = self.key_id(
2370
 
                            self.peer_certificate(session))
2371
 
                    except (TypeError, gnutls.Error) as error:
2372
 
                        log.warning("Bad certificate: %s", error)
2373
 
                        return
2374
 
                    log.debug("Key ID: %s",
2375
 
                              key_id.decode("utf-8",
2376
 
                                            errors="replace"))
2377
 
 
2378
 
                else:
2379
 
                    key_id = b""
2380
 
                    try:
2381
 
                        fpr = self.fingerprint(
2382
 
                            self.peer_certificate(session))
2383
 
                    except (TypeError, gnutls.Error) as error:
2384
 
                        log.warning("Bad certificate: %s", error)
2385
 
                        return
2386
 
                    log.debug("Fingerprint: %s", fpr)
2387
 
 
2388
 
                try:
2389
 
                    client = ProxyClient(child_pipe, key_id, fpr,
 
1527
                try:
 
1528
                    fpr = self.fingerprint(self.peer_certificate
 
1529
                                           (session))
 
1530
                except (TypeError,
 
1531
                        gnutls.errors.GNUTLSError) as error:
 
1532
                    logger.warning("Bad certificate: %s", error)
 
1533
                    return
 
1534
                logger.debug("Fingerprint: %s", fpr)
 
1535
                
 
1536
                try:
 
1537
                    client = ProxyClient(child_pipe, fpr,
2390
1538
                                         self.client_address)
2391
1539
                except KeyError:
2392
1540
                    return
2393
 
 
 
1541
                
 
1542
                if self.server.use_dbus:
 
1543
                    # Emit D-Bus signal
 
1544
                    client.NewRequest(str(self.client_address))
 
1545
                
2394
1546
                if client.approval_delay:
2395
1547
                    delay = client.approval_delay
2396
1548
                    client.approvals_pending += 1
2397
1549
                    approval_required = True
2398
 
 
 
1550
                
2399
1551
                while True:
2400
1552
                    if not client.enabled:
2401
 
                        log.info("Client %s is disabled", client.name)
 
1553
                        logger.info("Client %s is disabled",
 
1554
                                       client.name)
2402
1555
                        if self.server.use_dbus:
2403
1556
                            # Emit D-Bus signal
2404
1557
                            client.Rejected("Disabled")
2405
1558
                        return
2406
 
 
 
1559
                    
2407
1560
                    if client.approved or not client.approval_delay:
2408
 
                        # We are approved or approval is disabled
 
1561
                        #We are approved or approval is disabled
2409
1562
                        break
2410
1563
                    elif client.approved is None:
2411
 
                        log.info("Client %s needs approval",
2412
 
                                 client.name)
 
1564
                        logger.info("Client %s needs approval",
 
1565
                                    client.name)
2413
1566
                        if self.server.use_dbus:
2414
1567
                            # Emit D-Bus signal
2415
1568
                            client.NeedApproval(
2416
 
                                client.approval_delay.total_seconds()
2417
 
                                * 1000, client.approved_by_default)
 
1569
                                client.approval_delay_milliseconds(),
 
1570
                                client.approved_by_default)
2418
1571
                    else:
2419
 
                        log.warning("Client %s was not approved",
2420
 
                                    client.name)
 
1572
                        logger.warning("Client %s was not approved",
 
1573
                                       client.name)
2421
1574
                        if self.server.use_dbus:
2422
1575
                            # Emit D-Bus signal
2423
1576
                            client.Rejected("Denied")
2424
1577
                        return
2425
 
 
2426
 
                    # wait until timeout or approved
 
1578
                    
 
1579
                    #wait until timeout or approved
2427
1580
                    time = datetime.datetime.now()
2428
1581
                    client.changedstate.acquire()
2429
 
                    client.changedstate.wait(delay.total_seconds())
 
1582
                    (client.changedstate.wait
 
1583
                     (float(client.timedelta_to_milliseconds(delay)
 
1584
                            / 1000)))
2430
1585
                    client.changedstate.release()
2431
1586
                    time2 = datetime.datetime.now()
2432
1587
                    if (time2 - time) >= delay:
2433
1588
                        if not client.approved_by_default:
2434
 
                            log.warning("Client %s timed out while"
2435
 
                                        " waiting for approval",
2436
 
                                        client.name)
 
1589
                            logger.warning("Client %s timed out while"
 
1590
                                           " waiting for approval",
 
1591
                                           client.name)
2437
1592
                            if self.server.use_dbus:
2438
1593
                                # Emit D-Bus signal
2439
1594
                                client.Rejected("Approval timed out")
2442
1597
                            break
2443
1598
                    else:
2444
1599
                        delay -= time2 - time
2445
 
 
2446
 
                try:
2447
 
                    session.send(client.secret)
2448
 
                except gnutls.Error as error:
2449
 
                    log.warning("gnutls send failed", exc_info=error)
2450
 
                    return
2451
 
 
2452
 
                log.info("Sending secret to %s", client.name)
 
1600
                
 
1601
                sent_size = 0
 
1602
                while sent_size < len(client.secret):
 
1603
                    try:
 
1604
                        sent = session.send(client.secret[sent_size:])
 
1605
                    except gnutls.errors.GNUTLSError as error:
 
1606
                        logger.warning("gnutls send failed")
 
1607
                        return
 
1608
                    logger.debug("Sent: %d, remaining: %d",
 
1609
                                 sent, len(client.secret)
 
1610
                                 - (sent_size + sent))
 
1611
                    sent_size += sent
 
1612
                
 
1613
                logger.info("Sending secret to %s", client.name)
2453
1614
                # bump the timeout using extended_timeout
2454
 
                client.bump_timeout(client.extended_timeout)
 
1615
                client.checked_ok(client.extended_timeout)
2455
1616
                if self.server.use_dbus:
2456
1617
                    # Emit D-Bus signal
2457
1618
                    client.GotSecret()
2458
 
 
 
1619
            
2459
1620
            finally:
2460
1621
                if approval_required:
2461
1622
                    client.approvals_pending -= 1
2462
1623
                try:
2463
1624
                    session.bye()
2464
 
                except gnutls.Error as error:
2465
 
                    log.warning("GnuTLS bye failed", exc_info=error)
2466
 
 
 
1625
                except gnutls.errors.GNUTLSError as error:
 
1626
                    logger.warning("GnuTLS bye failed")
 
1627
    
2467
1628
    @staticmethod
2468
1629
    def peer_certificate(session):
2469
 
        "Return the peer's certificate as a bytestring"
2470
 
        try:
2471
 
            cert_type = gnutls.certificate_type_get2(
2472
 
                session, gnutls.CTYPE_PEERS)
2473
 
        except AttributeError:
2474
 
            cert_type = gnutls.certificate_type_get(session)
2475
 
        if gnutls.has_rawpk:
2476
 
            valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2477
 
        else:
2478
 
            valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2479
 
        # If not a valid certificate type...
2480
 
        if cert_type not in valid_cert_types:
2481
 
            log.info("Cert type %r not in %r", cert_type,
2482
 
                     valid_cert_types)
2483
 
            # ...return invalid data
2484
 
            return b""
 
1630
        "Return the peer's OpenPGP certificate as a bytestring"
 
1631
        # If not an OpenPGP certificate...
 
1632
        if (gnutls.library.functions
 
1633
            .gnutls_certificate_type_get(session._c_object)
 
1634
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1635
            # ...do the normal thing
 
1636
            return session.peer_certificate
2485
1637
        list_size = ctypes.c_uint(1)
2486
 
        cert_list = (gnutls.certificate_get_peers
2487
 
                     (session, ctypes.byref(list_size)))
 
1638
        cert_list = (gnutls.library.functions
 
1639
                     .gnutls_certificate_get_peers
 
1640
                     (session._c_object, ctypes.byref(list_size)))
2488
1641
        if not bool(cert_list) and list_size.value != 0:
2489
 
            raise gnutls.Error("error getting peer certificate")
 
1642
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1643
                                            " certificate")
2490
1644
        if list_size.value == 0:
2491
1645
            return None
2492
1646
        cert = cert_list[0]
2493
1647
        return ctypes.string_at(cert.data, cert.size)
2494
 
 
2495
 
    @staticmethod
2496
 
    def key_id(certificate):
2497
 
        "Convert a certificate bytestring to a hexdigit key ID"
2498
 
        # New GnuTLS "datum" with the public key
2499
 
        datum = gnutls.datum_t(
2500
 
            ctypes.cast(ctypes.c_char_p(certificate),
2501
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2502
 
            ctypes.c_uint(len(certificate)))
2503
 
        # XXX all these need to be created in the gnutls "module"
2504
 
        # New empty GnuTLS certificate
2505
 
        pubkey = gnutls.pubkey_t()
2506
 
        gnutls.pubkey_init(ctypes.byref(pubkey))
2507
 
        # Import the raw public key into the certificate
2508
 
        gnutls.pubkey_import(pubkey,
2509
 
                             ctypes.byref(datum),
2510
 
                             gnutls.X509_FMT_DER)
2511
 
        # New buffer for the key ID
2512
 
        buf = ctypes.create_string_buffer(32)
2513
 
        buf_len = ctypes.c_size_t(len(buf))
2514
 
        # Get the key ID from the raw public key into the buffer
2515
 
        gnutls.pubkey_get_key_id(
2516
 
            pubkey,
2517
 
            gnutls.KEYID_USE_SHA256,
2518
 
            ctypes.cast(ctypes.byref(buf),
2519
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2520
 
            ctypes.byref(buf_len))
2521
 
        # Deinit the certificate
2522
 
        gnutls.pubkey_deinit(pubkey)
2523
 
 
2524
 
        # Convert the buffer to a Python bytestring
2525
 
        key_id = ctypes.string_at(buf, buf_len.value)
2526
 
        # Convert the bytestring to hexadecimal notation
2527
 
        hex_key_id = binascii.hexlify(key_id).upper()
2528
 
        return hex_key_id
2529
 
 
 
1648
    
2530
1649
    @staticmethod
2531
1650
    def fingerprint(openpgp):
2532
1651
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2533
1652
        # New GnuTLS "datum" with the OpenPGP public key
2534
 
        datum = gnutls.datum_t(
2535
 
            ctypes.cast(ctypes.c_char_p(openpgp),
2536
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2537
 
            ctypes.c_uint(len(openpgp)))
 
1653
        datum = (gnutls.library.types
 
1654
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1655
                                             ctypes.POINTER
 
1656
                                             (ctypes.c_ubyte)),
 
1657
                                 ctypes.c_uint(len(openpgp))))
2538
1658
        # New empty GnuTLS certificate
2539
 
        crt = gnutls.openpgp_crt_t()
2540
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1659
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1660
        (gnutls.library.functions
 
1661
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
2541
1662
        # Import the OpenPGP public key into the certificate
2542
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2543
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1663
        (gnutls.library.functions
 
1664
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1665
                                    gnutls.library.constants
 
1666
                                    .GNUTLS_OPENPGP_FMT_RAW))
2544
1667
        # Verify the self signature in the key
2545
1668
        crtverify = ctypes.c_uint()
2546
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2547
 
                                       ctypes.byref(crtverify))
 
1669
        (gnutls.library.functions
 
1670
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1671
                                         ctypes.byref(crtverify)))
2548
1672
        if crtverify.value != 0:
2549
 
            gnutls.openpgp_crt_deinit(crt)
2550
 
            raise gnutls.CertificateSecurityError(code
2551
 
                                                  =crtverify.value)
 
1673
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1674
            raise (gnutls.errors.CertificateSecurityError
 
1675
                   ("Verify failed"))
2552
1676
        # New buffer for the fingerprint
2553
1677
        buf = ctypes.create_string_buffer(20)
2554
1678
        buf_len = ctypes.c_size_t()
2555
1679
        # Get the fingerprint from the certificate into the buffer
2556
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2557
 
                                           ctypes.byref(buf_len))
 
1680
        (gnutls.library.functions
 
1681
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1682
                                             ctypes.byref(buf_len)))
2558
1683
        # Deinit the certificate
2559
 
        gnutls.openpgp_crt_deinit(crt)
 
1684
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2560
1685
        # Convert the buffer to a Python bytestring
2561
1686
        fpr = ctypes.string_at(buf, buf_len.value)
2562
1687
        # Convert the bytestring to hexadecimal notation
2564
1689
        return hex_fpr
2565
1690
 
2566
1691
 
2567
 
class MultiprocessingMixIn:
 
1692
class MultiprocessingMixIn(object):
2568
1693
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2569
 
 
2570
1694
    def sub_process_main(self, request, address):
2571
1695
        try:
2572
1696
            self.finish_request(request, address)
2573
1697
        except Exception:
2574
1698
            self.handle_error(request, address)
2575
1699
        self.close_request(request)
2576
 
 
 
1700
    
2577
1701
    def process_request(self, request, address):
2578
1702
        """Start a new process to process the request."""
2579
 
        proc = multiprocessing.Process(target=self.sub_process_main,
2580
 
                                       args=(request, address))
 
1703
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1704
                                       args = (request,
 
1705
                                               address))
2581
1706
        proc.start()
2582
1707
        return proc
2583
1708
 
2584
1709
 
2585
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
 
1710
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2586
1711
    """ adds a pipe to the MixIn """
2587
 
 
2588
1712
    def process_request(self, request, client_address):
2589
1713
        """Overrides and wraps the original process_request().
2590
 
 
 
1714
        
2591
1715
        This function creates a new pipe in self.pipe
2592
1716
        """
2593
1717
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
2594
 
 
 
1718
        
2595
1719
        proc = MultiprocessingMixIn.process_request(self, request,
2596
1720
                                                    client_address)
2597
1721
        self.child_pipe.close()
2598
1722
        self.add_pipe(parent_pipe, proc)
2599
 
 
 
1723
    
2600
1724
    def add_pipe(self, parent_pipe, proc):
2601
1725
        """Dummy function; override as necessary"""
2602
 
        raise NotImplementedError()
 
1726
        raise NotImplementedError
2603
1727
 
2604
1728
 
2605
1729
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2606
 
                     socketserver.TCPServer):
2607
 
    """IPv6-capable TCP server.  Accepts None as address and/or port
2608
 
 
 
1730
                     socketserver.TCPServer, object):
 
1731
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
1732
    
2609
1733
    Attributes:
2610
1734
        enabled:        Boolean; whether this server is activated yet
2611
1735
        interface:      None or a network interface name (string)
2612
1736
        use_ipv6:       Boolean; to use IPv6 or not
2613
1737
    """
2614
 
 
2615
1738
    def __init__(self, server_address, RequestHandlerClass,
2616
 
                 interface=None,
2617
 
                 use_ipv6=True,
2618
 
                 socketfd=None):
2619
 
        """If socketfd is set, use that file descriptor instead of
2620
 
        creating a new one with socket.socket().
2621
 
        """
 
1739
                 interface=None, use_ipv6=True):
2622
1740
        self.interface = interface
2623
1741
        if use_ipv6:
2624
1742
            self.address_family = socket.AF_INET6
2625
 
        if socketfd is not None:
2626
 
            # Save the file descriptor
2627
 
            self.socketfd = socketfd
2628
 
            # Save the original socket.socket() function
2629
 
            self.socket_socket = socket.socket
2630
 
 
2631
 
            # To implement --socket, we monkey patch socket.socket.
2632
 
            #
2633
 
            # (When socketserver.TCPServer is a new-style class, we
2634
 
            # could make self.socket into a property instead of monkey
2635
 
            # patching socket.socket.)
2636
 
            #
2637
 
            # Create a one-time-only replacement for socket.socket()
2638
 
            @functools.wraps(socket.socket)
2639
 
            def socket_wrapper(*args, **kwargs):
2640
 
                # Restore original function so subsequent calls are
2641
 
                # not affected.
2642
 
                socket.socket = self.socket_socket
2643
 
                del self.socket_socket
2644
 
                # This time only, return a new socket object from the
2645
 
                # saved file descriptor.
2646
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
2647
 
            # Replace socket.socket() function with wrapper
2648
 
            socket.socket = socket_wrapper
2649
 
        # The socketserver.TCPServer.__init__ will call
2650
 
        # socket.socket(), which might be our replacement,
2651
 
        # socket_wrapper(), if socketfd was set.
2652
1743
        socketserver.TCPServer.__init__(self, server_address,
2653
1744
                                        RequestHandlerClass)
2654
 
 
2655
1745
    def server_bind(self):
2656
1746
        """This overrides the normal server_bind() function
2657
1747
        to bind to an interface if one was specified, and also NOT to
2658
1748
        bind to an address or port if they were not specified."""
2659
 
        global SO_BINDTODEVICE
2660
1749
        if self.interface is not None:
2661
1750
            if SO_BINDTODEVICE is None:
2662
 
                # Fall back to a hard-coded value which seems to be
2663
 
                # common enough.
2664
 
                log.warning("SO_BINDTODEVICE not found, trying 25")
2665
 
                SO_BINDTODEVICE = 25
2666
 
            try:
2667
 
                self.socket.setsockopt(
2668
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
2669
 
                    (self.interface + "\0").encode("utf-8"))
2670
 
            except socket.error as error:
2671
 
                if error.errno == errno.EPERM:
2672
 
                    log.error("No permission to bind to interface %s",
2673
 
                              self.interface)
2674
 
                elif error.errno == errno.ENOPROTOOPT:
2675
 
                    log.error("SO_BINDTODEVICE not available; cannot"
2676
 
                              " bind to interface %s", self.interface)
2677
 
                elif error.errno == errno.ENODEV:
2678
 
                    log.error("Interface %s does not exist, cannot"
2679
 
                              " bind", self.interface)
2680
 
                else:
2681
 
                    raise
 
1751
                logger.error("SO_BINDTODEVICE does not exist;"
 
1752
                             " cannot bind to interface %s",
 
1753
                             self.interface)
 
1754
            else:
 
1755
                try:
 
1756
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1757
                                           SO_BINDTODEVICE,
 
1758
                                           str(self.interface
 
1759
                                               + '\0'))
 
1760
                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:
 
1766
                        logger.error("SO_BINDTODEVICE not available;"
 
1767
                                     " cannot bind to interface %s",
 
1768
                                     self.interface)
 
1769
                    else:
 
1770
                        raise
2682
1771
        # Only bind(2) the socket if we really need to.
2683
1772
        if self.server_address[0] or self.server_address[1]:
2684
 
            if self.server_address[1]:
2685
 
                self.allow_reuse_address = True
2686
1773
            if not self.server_address[0]:
2687
1774
                if self.address_family == socket.AF_INET6:
2688
 
                    any_address = "::"  # in6addr_any
 
1775
                    any_address = "::" # in6addr_any
2689
1776
                else:
2690
 
                    any_address = "0.0.0.0"  # INADDR_ANY
 
1777
                    any_address = socket.INADDR_ANY
2691
1778
                self.server_address = (any_address,
2692
1779
                                       self.server_address[1])
2693
1780
            elif not self.server_address[1]:
2694
 
                self.server_address = (self.server_address[0], 0)
 
1781
                self.server_address = (self.server_address[0],
 
1782
                                       0)
2695
1783
#                 if self.interface:
2696
1784
#                     self.server_address = (self.server_address[0],
2697
1785
#                                            0, # port
2703
1791
 
2704
1792
class MandosServer(IPv6_TCPServer):
2705
1793
    """Mandos server.
2706
 
 
 
1794
    
2707
1795
    Attributes:
2708
1796
        clients:        set of Client objects
2709
1797
        gnutls_priority GnuTLS priority string
2710
1798
        use_dbus:       Boolean; to emit D-Bus signals or not
2711
 
 
2712
 
    Assumes a GLib.MainLoop event loop.
 
1799
    
 
1800
    Assumes a gobject.MainLoop event loop.
2713
1801
    """
2714
 
 
2715
1802
    def __init__(self, server_address, RequestHandlerClass,
2716
 
                 interface=None,
2717
 
                 use_ipv6=True,
2718
 
                 clients=None,
2719
 
                 gnutls_priority=None,
2720
 
                 use_dbus=True,
2721
 
                 socketfd=None):
 
1803
                 interface=None, use_ipv6=True, clients=None,
 
1804
                 gnutls_priority=None, use_dbus=True):
2722
1805
        self.enabled = False
2723
1806
        self.clients = clients
2724
1807
        if self.clients is None:
2727
1810
        self.gnutls_priority = gnutls_priority
2728
1811
        IPv6_TCPServer.__init__(self, server_address,
2729
1812
                                RequestHandlerClass,
2730
 
                                interface=interface,
2731
 
                                use_ipv6=use_ipv6,
2732
 
                                socketfd=socketfd)
2733
 
 
 
1813
                                interface = interface,
 
1814
                                use_ipv6 = use_ipv6)
2734
1815
    def server_activate(self):
2735
1816
        if self.enabled:
2736
1817
            return socketserver.TCPServer.server_activate(self)
2737
 
 
 
1818
    
2738
1819
    def enable(self):
2739
1820
        self.enabled = True
2740
 
 
 
1821
    
2741
1822
    def add_pipe(self, parent_pipe, proc):
2742
1823
        # Call "handle_ipc" for both data and EOF events
2743
 
        GLib.io_add_watch(
2744
 
            GLib.IOChannel.unix_new(parent_pipe.fileno()),
2745
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2746
 
            functools.partial(self.handle_ipc,
2747
 
                              parent_pipe=parent_pipe,
2748
 
                              proc=proc))
2749
 
 
2750
 
    def handle_ipc(self, source, condition,
2751
 
                   parent_pipe=None,
2752
 
                   proc=None,
2753
 
                   client_object=None):
 
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))
 
1830
    
 
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)
2754
1847
        # error, or the other end of multiprocessing.Pipe has closed
2755
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
1848
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2756
1849
            # Wait for other process to exit
2757
1850
            proc.join()
2758
1851
            return False
2759
 
 
 
1852
        
2760
1853
        # Read a request from the child
2761
1854
        request = parent_pipe.recv()
2762
1855
        command = request[0]
2763
 
 
2764
 
        if command == "init":
2765
 
            key_id = request[1].decode("ascii")
2766
 
            fpr = request[2].decode("ascii")
2767
 
            address = request[3]
2768
 
 
2769
 
            for c in self.clients.values():
2770
 
                if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2771
 
                              "27AE41E4649B934CA495991B7852B855"):
2772
 
                    continue
2773
 
                if key_id and c.key_id == key_id:
2774
 
                    client = c
2775
 
                    break
2776
 
                if fpr and c.fingerprint == fpr:
 
1856
        
 
1857
        if command == 'init':
 
1858
            fpr = request[1]
 
1859
            address = request[2]
 
1860
            
 
1861
            for c in self.clients.itervalues():
 
1862
                if c.fingerprint == fpr:
2777
1863
                    client = c
2778
1864
                    break
2779
1865
            else:
2780
 
                log.info("Client not found for key ID: %s, address:"
2781
 
                         " %s", key_id or fpr, address)
 
1866
                logger.info("Client not found for fingerprint: %s, ad"
 
1867
                            "dress: %s", fpr, address)
2782
1868
                if self.use_dbus:
2783
1869
                    # Emit D-Bus signal
2784
 
                    mandos_dbus_service.ClientNotFound(key_id or fpr,
 
1870
                    mandos_dbus_service.ClientNotFound(fpr,
2785
1871
                                                       address[0])
2786
1872
                parent_pipe.send(False)
2787
1873
                return False
2788
 
 
2789
 
            GLib.io_add_watch(
2790
 
                GLib.IOChannel.unix_new(parent_pipe.fileno()),
2791
 
                GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2792
 
                functools.partial(self.handle_ipc,
2793
 
                                  parent_pipe=parent_pipe,
2794
 
                                  proc=proc,
2795
 
                                  client_object=client))
 
1874
            
 
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))
2796
1883
            parent_pipe.send(True)
2797
1884
            # remove the old hook in favor of the new above hook on
2798
1885
            # same fileno
2799
1886
            return False
2800
 
        if command == "funcall":
 
1887
        if command == 'funcall':
2801
1888
            funcname = request[1]
2802
1889
            args = request[2]
2803
1890
            kwargs = request[3]
2804
 
 
2805
 
            parent_pipe.send(("data", getattr(client_object,
 
1891
            
 
1892
            parent_pipe.send(('data', getattr(client_object,
2806
1893
                                              funcname)(*args,
2807
 
                                                        **kwargs)))
2808
 
 
2809
 
        if command == "getattr":
 
1894
                                                         **kwargs)))
 
1895
        
 
1896
        if command == 'getattr':
2810
1897
            attrname = request[1]
2811
 
            if isinstance(client_object.__getattribute__(attrname),
2812
 
                          collections.abc.Callable):
2813
 
                parent_pipe.send(("function", ))
 
1898
            if callable(client_object.__getattribute__(attrname)):
 
1899
                parent_pipe.send(('function',))
2814
1900
            else:
2815
 
                parent_pipe.send((
2816
 
                    "data", client_object.__getattribute__(attrname)))
2817
 
 
2818
 
        if command == "setattr":
 
1901
                parent_pipe.send(('data', client_object
 
1902
                                  .__getattribute__(attrname)))
 
1903
        
 
1904
        if command == 'setattr':
2819
1905
            attrname = request[1]
2820
1906
            value = request[2]
2821
1907
            setattr(client_object, attrname, value)
2822
 
 
 
1908
        
2823
1909
        return True
2824
1910
 
2825
1911
 
2826
 
def rfc3339_duration_to_delta(duration):
2827
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2828
 
 
2829
 
    >>> timedelta = datetime.timedelta
2830
 
    >>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2831
 
    True
2832
 
    >>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2833
 
    True
2834
 
    >>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2835
 
    True
2836
 
    >>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2837
 
    True
2838
 
    >>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2839
 
    True
2840
 
    >>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2841
 
    True
2842
 
    >>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2843
 
    True
2844
 
    >>> del timedelta
2845
 
    """
2846
 
 
2847
 
    # Parsing an RFC 3339 duration with regular expressions is not
2848
 
    # possible - there would have to be multiple places for the same
2849
 
    # values, like seconds.  The current code, while more esoteric, is
2850
 
    # cleaner without depending on a parsing library.  If Python had a
2851
 
    # built-in library for parsing we would use it, but we'd like to
2852
 
    # avoid excessive use of external libraries.
2853
 
 
2854
 
    # New type for defining tokens, syntax, and semantics all-in-one
2855
 
    Token = collections.namedtuple("Token", (
2856
 
        "regexp",  # To match token; if "value" is not None, must have
2857
 
                   # a "group" containing digits
2858
 
        "value",   # datetime.timedelta or None
2859
 
        "followers"))           # Tokens valid after this token
2860
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2861
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2862
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2863
 
    token_second = Token(re.compile(r"(\d+)S"),
2864
 
                         datetime.timedelta(seconds=1),
2865
 
                         frozenset((token_end, )))
2866
 
    token_minute = Token(re.compile(r"(\d+)M"),
2867
 
                         datetime.timedelta(minutes=1),
2868
 
                         frozenset((token_second, token_end)))
2869
 
    token_hour = Token(re.compile(r"(\d+)H"),
2870
 
                       datetime.timedelta(hours=1),
2871
 
                       frozenset((token_minute, token_end)))
2872
 
    token_time = Token(re.compile(r"T"),
2873
 
                       None,
2874
 
                       frozenset((token_hour, token_minute,
2875
 
                                  token_second)))
2876
 
    token_day = Token(re.compile(r"(\d+)D"),
2877
 
                      datetime.timedelta(days=1),
2878
 
                      frozenset((token_time, token_end)))
2879
 
    token_month = Token(re.compile(r"(\d+)M"),
2880
 
                        datetime.timedelta(weeks=4),
2881
 
                        frozenset((token_day, token_end)))
2882
 
    token_year = Token(re.compile(r"(\d+)Y"),
2883
 
                       datetime.timedelta(weeks=52),
2884
 
                       frozenset((token_month, token_end)))
2885
 
    token_week = Token(re.compile(r"(\d+)W"),
2886
 
                       datetime.timedelta(weeks=1),
2887
 
                       frozenset((token_end, )))
2888
 
    token_duration = Token(re.compile(r"P"), None,
2889
 
                           frozenset((token_year, token_month,
2890
 
                                      token_day, token_time,
2891
 
                                      token_week)))
2892
 
    # Define starting values:
2893
 
    # Value so far
2894
 
    value = datetime.timedelta()
2895
 
    found_token = None
2896
 
    # Following valid tokens
2897
 
    followers = frozenset((token_duration, ))
2898
 
    # String left to parse
2899
 
    s = duration
2900
 
    # Loop until end token is found
2901
 
    while found_token is not token_end:
2902
 
        # Search for any currently valid tokens
2903
 
        for token in followers:
2904
 
            match = token.regexp.match(s)
2905
 
            if match is not None:
2906
 
                # Token found
2907
 
                if token.value is not None:
2908
 
                    # Value found, parse digits
2909
 
                    factor = int(match.group(1), 10)
2910
 
                    # Add to value so far
2911
 
                    value += factor * token.value
2912
 
                # Strip token from string
2913
 
                s = token.regexp.sub("", s, 1)
2914
 
                # Go to found token
2915
 
                found_token = token
2916
 
                # Set valid next tokens
2917
 
                followers = found_token.followers
2918
 
                break
2919
 
        else:
2920
 
            # No currently valid tokens were found
2921
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2922
 
                             .format(duration))
2923
 
    # End token found
2924
 
    return value
2925
 
 
2926
 
 
2927
1912
def string_to_delta(interval):
2928
1913
    """Parse a string and return a datetime.timedelta
2929
 
 
2930
 
    >>> string_to_delta("7d") == datetime.timedelta(7)
2931
 
    True
2932
 
    >>> string_to_delta("60s") == datetime.timedelta(0, 60)
2933
 
    True
2934
 
    >>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2935
 
    True
2936
 
    >>> string_to_delta("24h") == datetime.timedelta(1)
2937
 
    True
2938
 
    >>> string_to_delta("1w") == datetime.timedelta(7)
2939
 
    True
2940
 
    >>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2941
 
    True
 
1914
    
 
1915
    >>> string_to_delta('7d')
 
1916
    datetime.timedelta(7)
 
1917
    >>> string_to_delta('60s')
 
1918
    datetime.timedelta(0, 60)
 
1919
    >>> string_to_delta('60m')
 
1920
    datetime.timedelta(0, 3600)
 
1921
    >>> string_to_delta('24h')
 
1922
    datetime.timedelta(1)
 
1923
    >>> string_to_delta('1w')
 
1924
    datetime.timedelta(7)
 
1925
    >>> string_to_delta('5m 30s')
 
1926
    datetime.timedelta(0, 330)
2942
1927
    """
2943
 
 
2944
 
    try:
2945
 
        return rfc3339_duration_to_delta(interval)
2946
 
    except ValueError:
2947
 
        pass
2948
 
 
2949
1928
    timevalue = datetime.timedelta(0)
2950
1929
    for s in interval.split():
2951
1930
        try:
2952
 
            suffix = s[-1]
 
1931
            suffix = unicode(s[-1])
2953
1932
            value = int(s[:-1])
2954
1933
            if suffix == "d":
2955
1934
                delta = datetime.timedelta(value)
2962
1941
            elif suffix == "w":
2963
1942
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2964
1943
            else:
2965
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
2966
 
        except IndexError as e:
 
1944
                raise ValueError("Unknown suffix %r" % suffix)
 
1945
        except (ValueError, IndexError) as e:
2967
1946
            raise ValueError(*(e.args))
2968
1947
        timevalue += delta
2969
1948
    return timevalue
2970
1949
 
2971
1950
 
2972
 
def daemon(nochdir=False, noclose=False):
 
1951
def daemon(nochdir = False, noclose = False):
2973
1952
    """See daemon(3).  Standard BSD Unix function.
2974
 
 
 
1953
    
2975
1954
    This should really exist as os.daemon, but it doesn't (yet)."""
2976
1955
    if os.fork():
2977
1956
        sys.exit()
2982
1961
        sys.exit()
2983
1962
    if not noclose:
2984
1963
        # Close all standard open file descriptors
2985
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1964
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2986
1965
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2987
1966
            raise OSError(errno.ENODEV,
2988
 
                          "{} not a character device"
2989
 
                          .format(os.devnull))
 
1967
                          "%s not a character device"
 
1968
                          % os.path.devnull)
2990
1969
        os.dup2(null, sys.stdin.fileno())
2991
1970
        os.dup2(null, sys.stdout.fileno())
2992
1971
        os.dup2(null, sys.stderr.fileno())
2995
1974
 
2996
1975
 
2997
1976
def main():
2998
 
 
 
1977
    
2999
1978
    ##################################################################
3000
1979
    # Parsing of options, both command line and config file
3001
 
 
 
1980
    
3002
1981
    parser = argparse.ArgumentParser()
3003
1982
    parser.add_argument("-v", "--version", action="version",
3004
 
                        version="%(prog)s {}".format(version),
 
1983
                        version = "%%(prog)s %s" % version,
3005
1984
                        help="show version number and exit")
3006
1985
    parser.add_argument("-i", "--interface", metavar="IF",
3007
1986
                        help="Bind to interface IF")
3013
1992
                        help="Run self-test")
3014
1993
    parser.add_argument("--debug", action="store_true",
3015
1994
                        help="Debug mode; run in foreground and log"
3016
 
                        " to terminal", default=None)
 
1995
                        " to terminal")
3017
1996
    parser.add_argument("--debuglevel", metavar="LEVEL",
3018
1997
                        help="Debug level for stdout output")
3019
1998
    parser.add_argument("--priority", help="GnuTLS"
3026
2005
                        " files")
3027
2006
    parser.add_argument("--no-dbus", action="store_false",
3028
2007
                        dest="use_dbus", help="Do not provide D-Bus"
3029
 
                        " system bus interface", default=None)
 
2008
                        " system bus interface")
3030
2009
    parser.add_argument("--no-ipv6", action="store_false",
3031
 
                        dest="use_ipv6", help="Do not use IPv6",
3032
 
                        default=None)
 
2010
                        dest="use_ipv6", help="Do not use IPv6")
3033
2011
    parser.add_argument("--no-restore", action="store_false",
3034
2012
                        dest="restore", help="Do not restore stored"
3035
 
                        " state", default=None)
3036
 
    parser.add_argument("--socket", type=int,
3037
 
                        help="Specify a file descriptor to a network"
3038
 
                        " socket to use instead of creating one")
 
2013
                        " state")
3039
2014
    parser.add_argument("--statedir", metavar="DIR",
3040
2015
                        help="Directory to save/restore state in")
3041
 
    parser.add_argument("--foreground", action="store_true",
3042
 
                        help="Run in foreground", default=None)
3043
 
    parser.add_argument("--no-zeroconf", action="store_false",
3044
 
                        dest="zeroconf", help="Do not use Zeroconf",
3045
 
                        default=None)
3046
 
 
 
2016
    
3047
2017
    options = parser.parse_args()
3048
 
 
 
2018
    
 
2019
    if options.check:
 
2020
        import doctest
 
2021
        doctest.testmod()
 
2022
        sys.exit()
 
2023
    
3049
2024
    # Default values for config file for server-global settings
3050
 
    if gnutls.has_rawpk:
3051
 
        priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3052
 
                    ":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3053
 
    else:
3054
 
        priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3055
 
                    ":+SIGN-DSA-SHA256")
3056
 
    server_defaults = {"interface": "",
3057
 
                       "address": "",
3058
 
                       "port": "",
3059
 
                       "debug": "False",
3060
 
                       "priority": priority,
3061
 
                       "servicename": "Mandos",
3062
 
                       "use_dbus": "True",
3063
 
                       "use_ipv6": "True",
3064
 
                       "debuglevel": "",
3065
 
                       "restore": "True",
3066
 
                       "socket": "",
3067
 
                       "statedir": "/var/lib/mandos",
3068
 
                       "foreground": "False",
3069
 
                       "zeroconf": "True",
3070
 
                       }
3071
 
    del priority
3072
 
 
 
2025
    server_defaults = { "interface": "",
 
2026
                        "address": "",
 
2027
                        "port": "",
 
2028
                        "debug": "False",
 
2029
                        "priority":
 
2030
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2031
                        "servicename": "Mandos",
 
2032
                        "use_dbus": "True",
 
2033
                        "use_ipv6": "True",
 
2034
                        "debuglevel": "",
 
2035
                        "restore": "True",
 
2036
                        "statedir": "/var/lib/mandos"
 
2037
                        }
 
2038
    
3073
2039
    # Parse config file for server-global settings
3074
 
    server_config = configparser.ConfigParser(server_defaults)
 
2040
    server_config = configparser.SafeConfigParser(server_defaults)
3075
2041
    del server_defaults
3076
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
3077
 
    # Convert the ConfigParser object to a dict
 
2042
    server_config.read(os.path.join(options.configdir,
 
2043
                                    "mandos.conf"))
 
2044
    # Convert the SafeConfigParser object to a dict
3078
2045
    server_settings = server_config.defaults()
3079
2046
    # Use the appropriate methods on the non-string config options
3080
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3081
 
                   "foreground", "zeroconf"):
 
2047
    for option in ("debug", "use_dbus", "use_ipv6"):
3082
2048
        server_settings[option] = server_config.getboolean("DEFAULT",
3083
2049
                                                           option)
3084
2050
    if server_settings["port"]:
3085
2051
        server_settings["port"] = server_config.getint("DEFAULT",
3086
2052
                                                       "port")
3087
 
    if server_settings["socket"]:
3088
 
        server_settings["socket"] = server_config.getint("DEFAULT",
3089
 
                                                         "socket")
3090
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
3091
 
        # over with an opened os.devnull.  But we don't want this to
3092
 
        # happen with a supplied network socket.
3093
 
        if 0 <= server_settings["socket"] <= 2:
3094
 
            server_settings["socket"] = os.dup(server_settings
3095
 
                                               ["socket"])
3096
2053
    del server_config
3097
 
 
 
2054
    
3098
2055
    # Override the settings from the config file with command line
3099
2056
    # options, if set.
3100
2057
    for option in ("interface", "address", "port", "debug",
3101
 
                   "priority", "servicename", "configdir", "use_dbus",
3102
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
3103
 
                   "socket", "foreground", "zeroconf"):
 
2058
                   "priority", "servicename", "configdir",
 
2059
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2060
                   "statedir"):
3104
2061
        value = getattr(options, option)
3105
2062
        if value is not None:
3106
2063
            server_settings[option] = value
3107
2064
    del options
3108
2065
    # Force all strings to be unicode
3109
2066
    for option in server_settings.keys():
3110
 
        if isinstance(server_settings[option], bytes):
3111
 
            server_settings[option] = (server_settings[option]
3112
 
                                       .decode("utf-8"))
3113
 
    # Force all boolean options to be boolean
3114
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
3115
 
                   "foreground", "zeroconf"):
3116
 
        server_settings[option] = bool(server_settings[option])
3117
 
    # Debug implies foreground
3118
 
    if server_settings["debug"]:
3119
 
        server_settings["foreground"] = True
 
2067
        if type(server_settings[option]) is str:
 
2068
            server_settings[option] = unicode(server_settings[option])
3120
2069
    # Now we have our good server settings in "server_settings"
3121
 
 
 
2070
    
3122
2071
    ##################################################################
3123
 
 
3124
 
    if (not server_settings["zeroconf"]
3125
 
        and not (server_settings["port"]
3126
 
                 or server_settings["socket"] != "")):
3127
 
        parser.error("Needs port or socket to work without Zeroconf")
3128
 
 
 
2072
    
3129
2073
    # For convenience
3130
2074
    debug = server_settings["debug"]
3131
2075
    debuglevel = server_settings["debuglevel"]
3133
2077
    use_ipv6 = server_settings["use_ipv6"]
3134
2078
    stored_state_path = os.path.join(server_settings["statedir"],
3135
2079
                                     stored_state_file)
3136
 
    foreground = server_settings["foreground"]
3137
 
    zeroconf = server_settings["zeroconf"]
3138
 
 
 
2080
    
3139
2081
    if debug:
3140
2082
        initlogger(debug, logging.DEBUG)
3141
2083
    else:
3144
2086
        else:
3145
2087
            level = getattr(logging, debuglevel.upper())
3146
2088
            initlogger(debug, level)
3147
 
 
 
2089
    
3148
2090
    if server_settings["servicename"] != "Mandos":
3149
 
        syslogger.setFormatter(
3150
 
            logging.Formatter("Mandos ({}) [%(process)d]:"
3151
 
                              " %(levelname)s: %(message)s".format(
3152
 
                                  server_settings["servicename"])))
3153
 
 
 
2091
        syslogger.setFormatter(logging.Formatter
 
2092
                               ('Mandos (%s) [%%(process)d]:'
 
2093
                                ' %%(levelname)s: %%(message)s'
 
2094
                                % server_settings["servicename"]))
 
2095
    
3154
2096
    # Parse config file with clients
3155
 
    client_config = configparser.ConfigParser(Client.client_defaults)
 
2097
    client_config = configparser.SafeConfigParser(Client.client_defaults)
3156
2098
    client_config.read(os.path.join(server_settings["configdir"],
3157
2099
                                    "clients.conf"))
3158
 
 
 
2100
    
3159
2101
    global mandos_dbus_service
3160
2102
    mandos_dbus_service = None
3161
 
 
3162
 
    socketfd = None
3163
 
    if server_settings["socket"] != "":
3164
 
        socketfd = server_settings["socket"]
3165
 
    tcp_server = MandosServer(
3166
 
        (server_settings["address"], server_settings["port"]),
3167
 
        ClientHandler,
3168
 
        interface=(server_settings["interface"] or None),
3169
 
        use_ipv6=use_ipv6,
3170
 
        gnutls_priority=server_settings["priority"],
3171
 
        use_dbus=use_dbus,
3172
 
        socketfd=socketfd)
3173
 
    if not foreground:
3174
 
        pidfilename = "/run/mandos.pid"
3175
 
        if not os.path.isdir("/run/."):
3176
 
            pidfilename = "/var/run/mandos.pid"
3177
 
        pidfile = None
3178
 
        try:
3179
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3180
 
        except IOError as e:
3181
 
            log.error("Could not open file %r", pidfilename,
3182
 
                      exc_info=e)
3183
 
 
3184
 
    for name, group in (("_mandos", "_mandos"),
3185
 
                        ("mandos", "mandos"),
3186
 
                        ("nobody", "nogroup")):
3187
 
        try:
3188
 
            uid = pwd.getpwnam(name).pw_uid
3189
 
            gid = pwd.getpwnam(group).pw_gid
3190
 
            break
 
2103
    
 
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"
 
2115
        try:
 
2116
            pidfile = open(pidfilename, "w")
 
2117
        except IOError:
 
2118
            logger.error("Could not open file %r", pidfilename)
 
2119
    
 
2120
    try:
 
2121
        uid = pwd.getpwnam("_mandos").pw_uid
 
2122
        gid = pwd.getpwnam("_mandos").pw_gid
 
2123
    except KeyError:
 
2124
        try:
 
2125
            uid = pwd.getpwnam("mandos").pw_uid
 
2126
            gid = pwd.getpwnam("mandos").pw_gid
3191
2127
        except KeyError:
3192
 
            continue
3193
 
    else:
3194
 
        uid = 65534
3195
 
        gid = 65534
 
2128
            try:
 
2129
                uid = pwd.getpwnam("nobody").pw_uid
 
2130
                gid = pwd.getpwnam("nobody").pw_gid
 
2131
            except KeyError:
 
2132
                uid = 65534
 
2133
                gid = 65534
3196
2134
    try:
3197
2135
        os.setgid(gid)
3198
2136
        os.setuid(uid)
3199
 
        log.debug("Did setuid/setgid to %s:%s", uid, gid)
3200
2137
    except OSError as error:
3201
 
        log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3202
 
                    os.strerror(error.errno))
3203
 
        if error.errno != errno.EPERM:
3204
 
            raise
3205
 
 
 
2138
        if error[0] != errno.EPERM:
 
2139
            raise error
 
2140
    
3206
2141
    if debug:
3207
2142
        # Enable all possible GnuTLS debugging
3208
 
 
 
2143
        
3209
2144
        # "Use a log level over 10 to enable all debugging options."
3210
2145
        # - GnuTLS manual
3211
 
        gnutls.global_set_log_level(11)
3212
 
 
3213
 
        @gnutls.log_func
 
2146
        gnutls.library.functions.gnutls_global_set_log_level(11)
 
2147
        
 
2148
        @gnutls.library.types.gnutls_log_func
3214
2149
        def debug_gnutls(level, string):
3215
 
            log.debug("GnuTLS: %s",
3216
 
                      string[:-1].decode("utf-8", errors="replace"))
3217
 
 
3218
 
        gnutls.global_set_log_function(debug_gnutls)
3219
 
 
 
2150
            logger.debug("GnuTLS: %s", string[:-1])
 
2151
        
 
2152
        (gnutls.library.functions
 
2153
         .gnutls_global_set_log_function(debug_gnutls))
 
2154
        
3220
2155
        # Redirect stdin so all checkers get /dev/null
3221
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2156
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3222
2157
        os.dup2(null, sys.stdin.fileno())
3223
2158
        if null > 2:
3224
2159
            os.close(null)
3225
 
 
 
2160
    
3226
2161
    # Need to fork before connecting to D-Bus
3227
 
    if not foreground:
 
2162
    if not debug:
3228
2163
        # Close all input and output, do double fork, etc.
3229
2164
        daemon()
3230
 
 
3231
 
    if gi.version_info < (3, 10, 2):
3232
 
        # multiprocessing will use threads, so before we use GLib we
3233
 
        # need to inform GLib that threads will be used.
3234
 
        GLib.threads_init()
3235
 
 
 
2165
    
 
2166
    gobject.threads_init()
 
2167
    
3236
2168
    global main_loop
3237
2169
    # From the Avahi example code
3238
 
    DBusGMainLoop(set_as_default=True)
3239
 
    main_loop = GLib.MainLoop()
 
2170
    DBusGMainLoop(set_as_default=True )
 
2171
    main_loop = gobject.MainLoop()
3240
2172
    bus = dbus.SystemBus()
3241
2173
    # End of Avahi example code
3242
2174
    if use_dbus:
3243
2175
        try:
3244
2176
            bus_name = dbus.service.BusName("se.recompile.Mandos",
3245
 
                                            bus,
3246
 
                                            do_not_queue=True)
3247
 
            old_bus_name = dbus.service.BusName(
3248
 
                "se.bsnet.fukt.Mandos", bus,
3249
 
                do_not_queue=True)
3250
 
        except dbus.exceptions.DBusException as e:
3251
 
            log.error("Disabling D-Bus:", exc_info=e)
 
2177
                                            bus, do_not_queue=True)
 
2178
            old_bus_name = (dbus.service.BusName
 
2179
                            ("se.bsnet.fukt.Mandos", bus,
 
2180
                             do_not_queue=True))
 
2181
        except dbus.exceptions.NameExistsException as e:
 
2182
            logger.error(unicode(e) + ", disabling D-Bus")
3252
2183
            use_dbus = False
3253
2184
            server_settings["use_dbus"] = False
3254
2185
            tcp_server.use_dbus = False
3255
 
    if zeroconf:
3256
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3257
 
        service = AvahiServiceToSyslog(
3258
 
            name=server_settings["servicename"],
3259
 
            servicetype="_mandos._tcp",
3260
 
            protocol=protocol,
3261
 
            bus=bus)
3262
 
        if server_settings["interface"]:
3263
 
            service.interface = if_nametoindex(
3264
 
                server_settings["interface"].encode("utf-8"))
3265
 
 
 
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"])))
 
2194
    
3266
2195
    global multiprocessing_manager
3267
2196
    multiprocessing_manager = multiprocessing.Manager()
3268
 
 
 
2197
    
3269
2198
    client_class = Client
3270
2199
    if use_dbus:
3271
 
        client_class = functools.partial(ClientDBus, bus=bus)
3272
 
 
 
2200
        client_class = functools.partial(ClientDBusTransitional,
 
2201
                                         bus = bus)
 
2202
    
3273
2203
    client_settings = Client.config_parser(client_config)
3274
2204
    old_client_settings = {}
3275
2205
    clients_data = {}
3276
 
 
3277
 
    # This is used to redirect stdout and stderr for checker processes
3278
 
    global wnull
3279
 
    wnull = open(os.devnull, "w")  # A writable /dev/null
3280
 
    # Only used if server is running in foreground but not in debug
3281
 
    # mode
3282
 
    if debug or not foreground:
3283
 
        wnull.close()
3284
 
 
 
2206
    
3285
2207
    # Get client data and settings from last running state.
3286
2208
    if server_settings["restore"]:
3287
2209
        try:
3288
2210
            with open(stored_state_path, "rb") as stored_state:
3289
 
                if sys.version_info.major == 2:
3290
 
                    clients_data, old_client_settings = pickle.load(
3291
 
                        stored_state)
3292
 
                else:
3293
 
                    bytes_clients_data, bytes_old_client_settings = (
3294
 
                        pickle.load(stored_state, encoding="bytes"))
3295
 
                    #   Fix bytes to strings
3296
 
                    #  clients_data
3297
 
                    # .keys()
3298
 
                    clients_data = {(key.decode("utf-8")
3299
 
                                     if isinstance(key, bytes)
3300
 
                                     else key): value
3301
 
                                    for key, value in
3302
 
                                    bytes_clients_data.items()}
3303
 
                    del bytes_clients_data
3304
 
                    for key in clients_data:
3305
 
                        value = {(k.decode("utf-8")
3306
 
                                  if isinstance(k, bytes) else k): v
3307
 
                                 for k, v in
3308
 
                                 clients_data[key].items()}
3309
 
                        clients_data[key] = value
3310
 
                        # .client_structure
3311
 
                        value["client_structure"] = [
3312
 
                            (s.decode("utf-8")
3313
 
                             if isinstance(s, bytes)
3314
 
                             else s) for s in
3315
 
                            value["client_structure"]]
3316
 
                        # .name, .host, and .checker_command
3317
 
                        for k in ("name", "host", "checker_command"):
3318
 
                            if isinstance(value[k], bytes):
3319
 
                                value[k] = value[k].decode("utf-8")
3320
 
                        if "key_id" not in value:
3321
 
                            value["key_id"] = ""
3322
 
                        elif "fingerprint" not in value:
3323
 
                            value["fingerprint"] = ""
3324
 
                    #  old_client_settings
3325
 
                    # .keys()
3326
 
                    old_client_settings = {
3327
 
                        (key.decode("utf-8")
3328
 
                         if isinstance(key, bytes)
3329
 
                         else key): value
3330
 
                        for key, value in
3331
 
                        bytes_old_client_settings.items()}
3332
 
                    del bytes_old_client_settings
3333
 
                    # .host and .checker_command
3334
 
                    for value in old_client_settings.values():
3335
 
                        for attribute in ("host", "checker_command"):
3336
 
                            if isinstance(value[attribute], bytes):
3337
 
                                value[attribute] = (value[attribute]
3338
 
                                                    .decode("utf-8"))
 
2211
                clients_data, old_client_settings = (pickle.load
 
2212
                                                     (stored_state))
3339
2213
            os.remove(stored_state_path)
3340
2214
        except IOError as e:
3341
 
            if e.errno == errno.ENOENT:
3342
 
                log.warning("Could not load persistent state:"
3343
 
                            " %s", os.strerror(e.errno))
3344
 
            else:
3345
 
                log.critical("Could not load persistent state:",
3346
 
                             exc_info=e)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
3347
2218
                raise
3348
2219
        except EOFError as e:
3349
 
            log.warning("Could not load persistent state: EOFError:",
3350
 
                        exc_info=e)
3351
 
 
 
2220
            logger.warning("Could not load persistent state: "
 
2221
                           "EOFError: {0}".format(e))
 
2222
    
3352
2223
    with PGPEngine() as pgp:
3353
 
        for client_name, client in clients_data.items():
3354
 
            # Skip removed clients
3355
 
            if client_name not in client_settings:
3356
 
                continue
3357
 
 
 
2224
        for client_name, client in clients_data.iteritems():
3358
2225
            # Decide which value to use after restoring saved state.
3359
2226
            # We have three different values: Old config file,
3360
2227
            # new config file, and saved state.
3365
2232
                    # For each value in new config, check if it
3366
2233
                    # differs from the old config value (Except for
3367
2234
                    # the "secret" attribute)
3368
 
                    if (name != "secret"
3369
 
                        and (value !=
3370
 
                             old_client_settings[client_name][name])):
 
2235
                    if (name != "secret" and
 
2236
                        value != old_client_settings[client_name]
 
2237
                        [name]):
3371
2238
                        client[name] = value
3372
2239
                except KeyError:
3373
2240
                    pass
3374
 
 
 
2241
            
3375
2242
            # Clients who has passed its expire date can still be
3376
 
            # enabled if its last checker was successful.  A Client
3377
 
            # whose checker succeeded before we stored its state is
3378
 
            # assumed to have successfully run all checkers during
3379
 
            # downtime.
 
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.
3380
2246
            if client["enabled"]:
3381
2247
                if datetime.datetime.utcnow() >= client["expires"]:
3382
2248
                    if not client["last_checked_ok"]:
3383
 
                        log.warning("disabling client %s - Client"
3384
 
                                    " never performed a successful"
3385
 
                                    " checker", client_name)
 
2249
                        logger.warning(
 
2250
                            "disabling client {0} - Client never "
 
2251
                            "performed a successfull checker"
 
2252
                            .format(client["name"]))
3386
2253
                        client["enabled"] = False
3387
2254
                    elif client["last_checker_status"] != 0:
3388
 
                        log.warning("disabling client %s - Client"
3389
 
                                    " last checker failed with error"
3390
 
                                    " code %s", client_name,
3391
 
                                    client["last_checker_status"])
 
2255
                        logger.warning(
 
2256
                            "disabling client {0} - Client "
 
2257
                            "last checker failed with error code {1}"
 
2258
                            .format(client["name"],
 
2259
                                    client["last_checker_status"]))
3392
2260
                        client["enabled"] = False
3393
2261
                    else:
3394
 
                        client["expires"] = (
3395
 
                            datetime.datetime.utcnow()
3396
 
                            + client["timeout"])
3397
 
                        log.debug("Last checker succeeded, keeping %s"
3398
 
                                  " enabled", client_name)
 
2262
                        client["expires"] = (datetime.datetime
 
2263
                                             .utcnow()
 
2264
                                             + client["timeout"])
 
2265
                    
3399
2266
            try:
3400
 
                client["secret"] = pgp.decrypt(
3401
 
                    client["encrypted_secret"],
3402
 
                    client_settings[client_name]["secret"])
 
2267
                client["secret"] = (
 
2268
                    pgp.decrypt(client["encrypted_secret"],
 
2269
                                client_settings[client_name]
 
2270
                                ["secret"]))
3403
2271
            except PGPError:
3404
2272
                # If decryption fails, we use secret from new settings
3405
 
                log.debug("Failed to decrypt %s old secret",
3406
 
                          client_name)
3407
 
                client["secret"] = (client_settings[client_name]
3408
 
                                    ["secret"])
 
2273
                logger.debug("Failed to decrypt {0} old secret"
 
2274
                             .format(client_name))
 
2275
                client["secret"] = (
 
2276
                    client_settings[client_name]["secret"])
3409
2277
 
 
2278
    
3410
2279
    # Add/remove clients based on new changes made to config
3411
 
    for client_name in (set(old_client_settings)
3412
 
                        - set(client_settings)):
 
2280
    for client_name in set(old_client_settings) - set(client_settings):
3413
2281
        del clients_data[client_name]
3414
 
    for client_name in (set(client_settings)
3415
 
                        - set(old_client_settings)):
 
2282
    for client_name in set(client_settings) - set(old_client_settings):
3416
2283
        clients_data[client_name] = client_settings[client_name]
3417
2284
 
3418
 
    # Create all client objects
3419
 
    for client_name, client in clients_data.items():
 
2285
    # Create clients all clients
 
2286
    for client_name, client in clients_data.iteritems():
3420
2287
        tcp_server.clients[client_name] = client_class(
3421
 
            name=client_name,
3422
 
            settings=client,
3423
 
            server_settings=server_settings)
3424
 
 
 
2288
            name = client_name, settings = client)
 
2289
    
3425
2290
    if not tcp_server.clients:
3426
 
        log.warning("No clients defined")
3427
 
 
3428
 
    if not foreground:
3429
 
        if pidfile is not None:
3430
 
            pid = os.getpid()
3431
 
            try:
3432
 
                with pidfile:
3433
 
                    print(pid, file=pidfile)
3434
 
            except IOError:
3435
 
                log.error("Could not write to file %r with PID %d",
3436
 
                          pidfilename, pid)
3437
 
        del pidfile
 
2291
        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
3438
2305
        del pidfilename
3439
 
 
3440
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
3441
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3442
 
                             lambda: main_loop.quit() and False)
3443
 
 
 
2306
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2307
    
 
2308
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2309
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
2310
    
3444
2311
    if use_dbus:
3445
 
 
3446
 
        @alternate_dbus_interfaces(
3447
 
            {"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3448
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2312
        class MandosDBusService(dbus.service.Object):
3449
2313
            """A D-Bus proxy object"""
3450
 
 
3451
2314
            def __init__(self):
3452
2315
                dbus.service.Object.__init__(self, bus, "/")
3453
 
 
3454
2316
            _interface = "se.recompile.Mandos"
3455
 
 
 
2317
            
3456
2318
            @dbus.service.signal(_interface, signature="o")
3457
2319
            def ClientAdded(self, objpath):
3458
2320
                "D-Bus signal"
3459
2321
                pass
3460
 
 
 
2322
            
3461
2323
            @dbus.service.signal(_interface, signature="ss")
3462
 
            def ClientNotFound(self, key_id, address):
 
2324
            def ClientNotFound(self, fingerprint, address):
3463
2325
                "D-Bus signal"
3464
2326
                pass
3465
 
 
3466
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3467
 
                               "true"})
 
2327
            
3468
2328
            @dbus.service.signal(_interface, signature="os")
3469
2329
            def ClientRemoved(self, objpath, name):
3470
2330
                "D-Bus signal"
3471
2331
                pass
3472
 
 
3473
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3474
 
                               "true"})
 
2332
            
3475
2333
            @dbus.service.method(_interface, out_signature="ao")
3476
2334
            def GetAllClients(self):
3477
2335
                "D-Bus method"
3478
 
                return dbus.Array(c.dbus_object_path for c in
3479
 
                                  tcp_server.clients.values())
3480
 
 
3481
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3482
 
                               "true"})
 
2336
                return dbus.Array(c.dbus_object_path
 
2337
                                  for c in
 
2338
                                  tcp_server.clients.itervalues())
 
2339
            
3483
2340
            @dbus.service.method(_interface,
3484
2341
                                 out_signature="a{oa{sv}}")
3485
2342
            def GetAllClientsWithProperties(self):
3486
2343
                "D-Bus method"
3487
2344
                return dbus.Dictionary(
3488
 
                    {c.dbus_object_path: c.GetAll(
3489
 
                        "se.recompile.Mandos.Client")
3490
 
                     for c in tcp_server.clients.values()},
 
2345
                    ((c.dbus_object_path, c.GetAll(""))
 
2346
                     for c in tcp_server.clients.itervalues()),
3491
2347
                    signature="oa{sv}")
3492
 
 
 
2348
            
3493
2349
            @dbus.service.method(_interface, in_signature="o")
3494
2350
            def RemoveClient(self, object_path):
3495
2351
                "D-Bus method"
3496
 
                for c in tcp_server.clients.values():
 
2352
                for c in tcp_server.clients.itervalues():
3497
2353
                    if c.dbus_object_path == object_path:
3498
2354
                        del tcp_server.clients[c.name]
3499
2355
                        c.remove_from_connection()
3500
 
                        # Don't signal the disabling
 
2356
                        # Don't signal anything except ClientRemoved
3501
2357
                        c.disable(quiet=True)
3502
 
                        # Emit D-Bus signal for removal
3503
 
                        self.client_removed_signal(c)
 
2358
                        # Emit D-Bus signal
 
2359
                        self.ClientRemoved(object_path, c.name)
3504
2360
                        return
3505
2361
                raise KeyError(object_path)
3506
 
 
 
2362
            
3507
2363
            del _interface
3508
 
 
3509
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3510
 
                                 out_signature="a{oa{sa{sv}}}")
3511
 
            def GetManagedObjects(self):
3512
 
                """D-Bus method"""
3513
 
                return dbus.Dictionary(
3514
 
                    {client.dbus_object_path:
3515
 
                     dbus.Dictionary(
3516
 
                         {interface: client.GetAll(interface)
3517
 
                          for interface in
3518
 
                          client._get_all_interface_names()})
3519
 
                     for client in tcp_server.clients.values()})
3520
 
 
3521
 
            def client_added_signal(self, client):
3522
 
                """Send the new standard signal and the old signal"""
3523
 
                if use_dbus:
3524
 
                    # New standard signal
3525
 
                    self.InterfacesAdded(
3526
 
                        client.dbus_object_path,
3527
 
                        dbus.Dictionary(
3528
 
                            {interface: client.GetAll(interface)
3529
 
                             for interface in
3530
 
                             client._get_all_interface_names()}))
3531
 
                    # Old signal
3532
 
                    self.ClientAdded(client.dbus_object_path)
3533
 
 
3534
 
            def client_removed_signal(self, client):
3535
 
                """Send the new standard signal and the old signal"""
3536
 
                if use_dbus:
3537
 
                    # New standard signal
3538
 
                    self.InterfacesRemoved(
3539
 
                        client.dbus_object_path,
3540
 
                        client._get_all_interface_names())
3541
 
                    # Old signal
3542
 
                    self.ClientRemoved(client.dbus_object_path,
3543
 
                                       client.name)
3544
 
 
3545
 
        mandos_dbus_service = MandosDBusService()
3546
 
 
3547
 
    # Save modules to variables to exempt the modules from being
3548
 
    # unloaded before the function registered with atexit() is run.
3549
 
    mp = multiprocessing
3550
 
    wn = wnull
3551
 
 
 
2364
        
 
2365
        class MandosDBusServiceTransitional(MandosDBusService):
 
2366
            __metaclass__ = AlternateDBusNamesMetaclass
 
2367
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2368
    
3552
2369
    def cleanup():
3553
2370
        "Cleanup function; run on exit"
3554
 
        if zeroconf:
3555
 
            service.cleanup()
3556
 
 
3557
 
        mp.active_children()
3558
 
        wn.close()
 
2371
        service.cleanup()
 
2372
        
 
2373
        multiprocessing.active_children()
3559
2374
        if not (tcp_server.clients or client_settings):
3560
2375
            return
3561
 
 
 
2376
        
3562
2377
        # Store client before exiting. Secrets are encrypted with key
3563
2378
        # based on what config file has. If config file is
3564
2379
        # removed/edited, old secret will thus be unrecovable.
3565
2380
        clients = {}
3566
2381
        with PGPEngine() as pgp:
3567
 
            for client in tcp_server.clients.values():
 
2382
            for client in tcp_server.clients.itervalues():
3568
2383
                key = client_settings[client.name]["secret"]
3569
2384
                client.encrypted_secret = pgp.encrypt(client.secret,
3570
2385
                                                      key)
3571
2386
                client_dict = {}
3572
 
 
 
2387
                
3573
2388
                # A list of attributes that can not be pickled
3574
2389
                # + secret.
3575
 
                exclude = {"bus", "changedstate", "secret",
3576
 
                           "checker", "server_settings"}
3577
 
                for name, typ in inspect.getmembers(dbus.service
3578
 
                                                    .Object):
 
2390
                exclude = set(("bus", "changedstate", "secret",
 
2391
                               "checker"))
 
2392
                for name, typ in (inspect.getmembers
 
2393
                                  (dbus.service.Object)):
3579
2394
                    exclude.add(name)
3580
 
 
 
2395
                
3581
2396
                client_dict["encrypted_secret"] = (client
3582
2397
                                                   .encrypted_secret)
3583
2398
                for attr in client.client_structure:
3584
2399
                    if attr not in exclude:
3585
2400
                        client_dict[attr] = getattr(client, attr)
3586
 
 
 
2401
                
3587
2402
                clients[client.name] = client_dict
3588
2403
                del client_settings[client.name]["secret"]
3589
 
 
 
2404
        
3590
2405
        try:
3591
 
            with tempfile.NamedTemporaryFile(
3592
 
                    mode="wb",
3593
 
                    suffix=".pickle",
3594
 
                    prefix="clients-",
3595
 
                    dir=os.path.dirname(stored_state_path),
3596
 
                    delete=False) as stored_state:
3597
 
                pickle.dump((clients, client_settings), stored_state,
3598
 
                            protocol=2)
3599
 
                tempname = stored_state.name
 
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:
 
2411
                pickle.dump((clients, client_settings), stored_state)
3600
2412
            os.rename(tempname, stored_state_path)
3601
2413
        except (IOError, OSError) as e:
 
2414
            logger.warning("Could not save persistent state: {0}"
 
2415
                           .format(e))
3602
2416
            if not debug:
3603
2417
                try:
3604
2418
                    os.remove(tempname)
3605
2419
                except NameError:
3606
2420
                    pass
3607
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3608
 
                log.warning("Could not save persistent state: %s",
3609
 
                            os.strerror(e.errno))
3610
 
            else:
3611
 
                log.warning("Could not save persistent state:",
3612
 
                            exc_info=e)
3613
 
                raise
3614
 
 
 
2421
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2422
                                   errno.EEXIST)):
 
2423
                raise e
 
2424
        
3615
2425
        # Delete all clients, and settings from config
3616
2426
        while tcp_server.clients:
3617
2427
            name, client = tcp_server.clients.popitem()
3618
2428
            if use_dbus:
3619
2429
                client.remove_from_connection()
3620
 
            # Don't signal the disabling
 
2430
            # Don't signal anything except ClientRemoved
3621
2431
            client.disable(quiet=True)
3622
 
            # Emit D-Bus signal for removal
3623
2432
            if use_dbus:
3624
 
                mandos_dbus_service.client_removed_signal(client)
 
2433
                # Emit D-Bus signal
 
2434
                mandos_dbus_service.ClientRemoved(client
 
2435
                                                  .dbus_object_path,
 
2436
                                                  client.name)
3625
2437
        client_settings.clear()
3626
 
 
 
2438
    
3627
2439
    atexit.register(cleanup)
3628
 
 
3629
 
    for client in tcp_server.clients.values():
 
2440
    
 
2441
    for client in tcp_server.clients.itervalues():
3630
2442
        if use_dbus:
3631
 
            # Emit D-Bus signal for adding
3632
 
            mandos_dbus_service.client_added_signal(client)
 
2443
            # Emit D-Bus signal
 
2444
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
3633
2445
        # Need to initiate checking of clients
3634
2446
        if client.enabled:
3635
 
            client.init_checker(randomize_start=True)
3636
 
 
 
2447
            client.init_checker()
 
2448
    
3637
2449
    tcp_server.enable()
3638
2450
    tcp_server.server_activate()
3639
 
 
 
2451
    
3640
2452
    # Find out what port we got
3641
 
    if zeroconf:
3642
 
        service.port = tcp_server.socket.getsockname()[1]
 
2453
    service.port = tcp_server.socket.getsockname()[1]
3643
2454
    if use_ipv6:
3644
 
        log.info("Now listening on address %r, port %d, flowinfo %d,"
3645
 
                 " scope_id %d", *tcp_server.socket.getsockname())
 
2455
        logger.info("Now listening on address %r, port %d,"
 
2456
                    " flowinfo %d, scope_id %d"
 
2457
                    % tcp_server.socket.getsockname())
3646
2458
    else:                       # IPv4
3647
 
        log.info("Now listening on address %r, port %d",
3648
 
                 *tcp_server.socket.getsockname())
3649
 
 
3650
 
    # service.interface = tcp_server.socket.getsockname()[3]
3651
 
 
 
2459
        logger.info("Now listening on address %r, port %d"
 
2460
                    % tcp_server.socket.getsockname())
 
2461
    
 
2462
    #service.interface = tcp_server.socket.getsockname()[3]
 
2463
    
3652
2464
    try:
3653
 
        if zeroconf:
3654
 
            # From the Avahi example code
3655
 
            try:
3656
 
                service.activate()
3657
 
            except dbus.exceptions.DBusException as error:
3658
 
                log.critical("D-Bus Exception", exc_info=error)
3659
 
                cleanup()
3660
 
                sys.exit(1)
3661
 
            # End of Avahi example code
3662
 
 
3663
 
        GLib.io_add_watch(
3664
 
            GLib.IOChannel.unix_new(tcp_server.fileno()),
3665
 
            GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3666
 
            lambda *args, **kwargs: (tcp_server.handle_request
3667
 
                                     (*args[2:], **kwargs) or True))
3668
 
 
3669
 
        log.debug("Starting main loop")
 
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
 
2473
        
 
2474
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2475
                             lambda *args, **kwargs:
 
2476
                             (tcp_server.handle_request
 
2477
                              (*args[2:], **kwargs) or True))
 
2478
        
 
2479
        logger.debug("Starting main loop")
3670
2480
        main_loop.run()
3671
2481
    except AvahiError as error:
3672
 
        log.critical("Avahi Error", exc_info=error)
 
2482
        logger.critical("AvahiError: %s", error)
3673
2483
        cleanup()
3674
2484
        sys.exit(1)
3675
2485
    except KeyboardInterrupt:
3676
2486
        if debug:
3677
2487
            print("", file=sys.stderr)
3678
 
        log.debug("Server received KeyboardInterrupt")
3679
 
    log.debug("Server exiting")
 
2488
        logger.debug("Server received KeyboardInterrupt")
 
2489
    logger.debug("Server exiting")
3680
2490
    # Must run before the D-Bus bus name gets deregistered
3681
2491
    cleanup()
3682
2492
 
3683
 
 
3684
 
def parse_test_args():
3685
 
    # type: () -> argparse.Namespace
3686
 
    parser = argparse.ArgumentParser(add_help=False)
3687
 
    parser.add_argument("--check", action="store_true")
3688
 
    parser.add_argument("--prefix", )
3689
 
    args, unknown_args = parser.parse_known_args()
3690
 
    if args.check:
3691
 
        # Remove test options from sys.argv
3692
 
        sys.argv[1:] = unknown_args
3693
 
    return args
3694
 
 
3695
 
# Add all tests from doctest strings
3696
 
def load_tests(loader, tests, none):
3697
 
    import doctest
3698
 
    tests.addTests(doctest.DocTestSuite())
3699
 
    return tests
3700
 
 
3701
 
if __name__ == "__main__":
3702
 
    options = parse_test_args()
3703
 
    try:
3704
 
        if options.check:
3705
 
            extra_test_prefix = options.prefix
3706
 
            if extra_test_prefix is not None:
3707
 
                if not (unittest.main(argv=[""], exit=False)
3708
 
                        .result.wasSuccessful()):
3709
 
                    sys.exit(1)
3710
 
                class ExtraTestLoader(unittest.TestLoader):
3711
 
                    testMethodPrefix = extra_test_prefix
3712
 
                # Call using ./scriptname --test [--verbose]
3713
 
                unittest.main(argv=[""], testLoader=ExtraTestLoader())
3714
 
            else:
3715
 
                unittest.main(argv=[""])
3716
 
        else:
3717
 
            main()
3718
 
    finally:
3719
 
        logging.shutdown()
3720
 
 
3721
 
# Local Variables:
3722
 
# run-tests:
3723
 
# (lambda (&optional extra)
3724
 
#   (if (not (funcall run-tests-in-test-buffer default-directory
3725
 
#             extra))
3726
 
#       (funcall show-test-buffer-in-test-window)
3727
 
#     (funcall remove-test-window)
3728
 
#     (if extra (message "Extra tests run successfully!"))))
3729
 
# run-tests-in-test-buffer:
3730
 
# (lambda (dir &optional extra)
3731
 
#   (with-current-buffer (get-buffer-create "*Test*")
3732
 
#     (setq buffer-read-only nil
3733
 
#           default-directory dir)
3734
 
#     (erase-buffer)
3735
 
#     (compilation-mode))
3736
 
#   (let ((process-result
3737
 
#          (let ((inhibit-read-only t))
3738
 
#            (process-file-shell-command
3739
 
#             (funcall get-command-line extra) nil "*Test*"))))
3740
 
#     (and (numberp process-result)
3741
 
#          (= process-result 0))))
3742
 
# get-command-line:
3743
 
# (lambda (&optional extra)
3744
 
#   (let ((quoted-script
3745
 
#          (shell-quote-argument (funcall get-script-name))))
3746
 
#     (format
3747
 
#      (concat "%s --check" (if extra " --prefix=atest" ""))
3748
 
#      quoted-script)))
3749
 
# get-script-name:
3750
 
# (lambda ()
3751
 
#   (if (fboundp 'file-local-name)
3752
 
#       (file-local-name (buffer-file-name))
3753
 
#     (or (file-remote-p (buffer-file-name) 'localname)
3754
 
#         (buffer-file-name))))
3755
 
# remove-test-window:
3756
 
# (lambda ()
3757
 
#   (let ((test-window (get-buffer-window "*Test*")))
3758
 
#     (if test-window (delete-window test-window))))
3759
 
# show-test-buffer-in-test-window:
3760
 
# (lambda ()
3761
 
#   (when (not (get-buffer-window-list "*Test*"))
3762
 
#     (setq next-error-last-buffer (get-buffer "*Test*"))
3763
 
#     (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3764
 
#            (display-buffer-overriding-action
3765
 
#             `((display-buffer-in-side-window) (side . ,side)
3766
 
#               (window-height . fit-window-to-buffer)
3767
 
#               (window-width . fit-window-to-buffer))))
3768
 
#       (display-buffer "*Test*"))))
3769
 
# eval:
3770
 
# (progn
3771
 
#   (let* ((run-extra-tests (lambda () (interactive)
3772
 
#                             (funcall run-tests t)))
3773
 
#          (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3774
 
#          (outer-keymap `(keymap (3 . ,inner-keymap))))     ; C-c
3775
 
#     (setq minor-mode-overriding-map-alist
3776
 
#           (cons `(run-tests . ,outer-keymap)
3777
 
#                 minor-mode-overriding-map-alist)))
3778
 
#   (add-hook 'after-save-hook run-tests 90 t))
3779
 
# End:
 
2493
if __name__ == '__main__':
 
2494
    main()