/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2019-12-04 23:52:20 UTC
  • Revision ID: teddy@recompile.se-20191204235220-yn88brp0scmqwy2t
Remove non-project-specific pattern from .bzrignore

Only project-specific patterns should be in the .bzrignore file.
Other generic patterns should be in the ~/.config/breezy/ignore and
~/.bazaar/ignore files.

* .bzrignore (.tramp_history): Remove.

Show diffs side-by-side

added added

removed removed

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