/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2019-02-11 11:45:58 UTC
  • Revision ID: teddy@recompile.se-20190211114558-61fxgi3q88fa6k7e
Merge from trunk

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