/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-12 01:41:14 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150712014114-qbala4mutkixxct3
Handle local Zeroconf service name collisions on startup, too.

* mandos (AvahiService.server_state_changed): Catch name collision
                                              error when adding
                                              server.

Show diffs side-by-side

added added

removed removed

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