/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2023-02-11 06:58:15 UTC
  • Revision ID: teddy@recompile.se-20230211065815-jtffi61tbdrgr875
Suppress warnings

Suppress warnings about mlock()ing uninitialized memory and reading an
ievent struct.

* dracut-module/password-agent.c (send_password_to_socket): Suppress
  "-Wmaybe-uninitialized" when mlock()ing password send buffer.
  (test_read_inotify_event_IN_DELETE_badname): When reading from
    a struct ievent, suppress "-Wstringop-overread".

Show diffs side-by-side

added added

removed removed

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