/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2019-02-11 05:14:10 UTC
  • Revision ID: teddy@recompile.se-20190211051410-43fmzhy0vlafw2pc
Fix warnings from -Wimplicit-fallthrough

* plugin-runner.c (main/parse_opt): Add __builtin_unreachable() after
                                    calls to argp_state_help().
* plugins.d/askpass-fifo.c (error_plus): Add __builtin_unreachable()
                                         after calls to error().
* plugins.d/mandos-client.c (main/parse_opt) Add
                                             __builtin_unreachable()
                                             after calls to
                                             argp_state_help().
* plugins.d/password-prompt.c: - '' -

Show diffs side-by-side

added added

removed removed

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