/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: 2016-02-21 14:24:01 UTC
  • Revision ID: teddy@recompile.se-20160221142401-j7glu6a2hg604d1e
Use AddressSanitizer and UndefinedBehaviorSanitizer.

* Makefile (SANITIZE): New; set to all sanitizing options depending on
                       GCC version.
  (CFLAGS): Added "$(SANITIZE)".

Show diffs side-by-side

added added

removed removed

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