/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-10-01 15:26:56 UTC
  • mfrom: (237.4.82 release)
  • Revision ID: teddy@recompile.se-20161001152656-1rrnoowjaqt6i1pz
Merge from release branch

Show diffs side-by-side

added added

removed removed

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