/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

merge

Show diffs side-by-side

added added

removed removed

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