/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: 2018-02-06 20:03:50 UTC
  • Revision ID: teddy@recompile.se-20180206200350-jzvorueb731xkph3
Update Debian Debhelper compatibility version.

* (debian/compat): Change to "10".

Show diffs side-by-side

added added

removed removed

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