/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

working new feature: network-hooks - Enables user-scripts to take up
                     interfaces during bootup

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