/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: 2015-05-30 16:47:00 UTC
  • Revision ID: teddy@recompile.se-20150530164700-77zrd7964gdhbk1f
mandos: Disable D-Bus if any DBusException is raised when connecting.

Show diffs side-by-side

added added

removed removed

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