/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-04-10 20:33:13 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190410203313-d3ufer20hfws7i3h
Improve language in intro(8mandos) manual page

* intro.xml (INTRODUCTION): Replace "it" with "the data" to fix bad
                            reference, and clarify that it is the
                            client which continues booting.

Show diffs side-by-side

added added

removed removed

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