/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2022-04-24 11:45:13 UTC
  • mto: This revision was merged to the branch mainline in revision 406.
  • Revision ID: teddy@recompile.se-20220424114513-0rvlunnjhgs3deus
mandos-monitor: Update boilerplate code

* mandos-monitor: Show warnings by default.

Show diffs side-by-side

added added

removed removed

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