/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2010-09-25 19:55:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100925195517-u0qfi01huxl72f75
* mandos (Client.runtime_expansions): New attribute containing the
                                      allowed runtime expansions.

* mandos-clients.conf.xml (OPTIONS): Reordered alphabetically.

* mandos-ctl: Bug fix: print timeout and interval values pretty again.

* mandos-ctl.xml (EXAMPLE): Added more examples.

Show diffs side-by-side

added added

removed removed

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