/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-10-01 15:26:56 UTC
  • mfrom: (351 release)
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 352.
  • Revision ID: teddy@recompile.se-20161001152656-1rrnoowjaqt6i1pz
Merge from release branch

Show diffs side-by-side

added added

removed removed

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