/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Break long lines.

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