/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* clients.conf ([DEFAULT]/timeout): Changed default value to "5m".
  ([DEFAULT]/interval): Changed default value to "2m".
  ([DEFAULT]/extenden_timeout): New.
  ([bar]/interval): Changed to "1m".

Show diffs side-by-side

added added

removed removed

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