/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2018-02-06 19:49:19 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 362.
  • Revision ID: teddy@recompile.se-20180206194919-rfmlt49naz5jnpfx
Fix Python 3 issue

* (mandos/MandosServer.handle_ipc): Decode bytes into string.

Show diffs side-by-side

added added

removed removed

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