/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2018-02-06 20:03:50 UTC
  • Revision ID: teddy@recompile.se-20180206200350-jzvorueb731xkph3
Update Debian Debhelper compatibility version.

* (debian/compat): Change to "10".

Show diffs side-by-side

added added

removed removed

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