/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 at recompile
  • Date: 2020-01-18 00:57:30 UTC
  • Revision ID: teddy@recompile.se-20200118005730-rysosg44wz5gyxf8
DBUS-API: Order properties alphabetically

In the documentation for the D-Bus API, list the client object
properties in alphabetical order.

Show diffs side-by-side

added added

removed removed

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