/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2019-12-04 23:52:20 UTC
  • Revision ID: teddy@recompile.se-20191204235220-yn88brp0scmqwy2t
Remove non-project-specific pattern from .bzrignore

Only project-specific patterns should be in the .bzrignore file.
Other generic patterns should be in the ~/.config/breezy/ignore and
~/.bazaar/ignore files.

* .bzrignore (.tramp_history): Remove.

Show diffs side-by-side

added added

removed removed

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