/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-08-26 18:44:21 UTC
  • Revision ID: teddy@recompile.se-20160826184421-gjqjgzxy3lupx9n3
Fix bug where mandos server could not find GnuTLS library

* mandos (GnuTLS): Try to find both "gnutls" and variant name
                   "gnutls-deb0", for a Debian Jessie system which
                   does not have the package "gnutls28-dev" installed.

Show diffs side-by-side

added added

removed removed

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