/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: 2016-03-23 07:11:22 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 343.
  • Revision ID: teddy@recompile.se-20160323071122-55srtjdizr21rr7f
Use HTTPS in home page links

Since we have a real certificate now, change all links to the home
page to use HTTPS.

* README: Use HTTPS in home page links
* debian/control (Source: mandos/Homepage): - '' -
* debian/copyright (Source): - '' -
* intro.xml (SEE ALSO): - '' -
* mandos.lsm (Primary-site): - '' -

Show diffs side-by-side

added added

removed removed

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