/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2011-10-09 12:53:54 UTC
  • Revision ID: belorn@fukt.bsnet.se-20111009125354-1qpmzu91l2ox73h3
usplash is deprecated

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