/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
 
from __future__ import division, with_statement, absolute_import
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
 
36
 
 
37
from future_builtins import *
35
38
 
36
39
import SocketServer as socketserver
37
40
import socket
38
 
import optparse
 
41
import argparse
39
42
import datetime
40
43
import errno
41
44
import gnutls.crypto
55
58
import logging
56
59
import logging.handlers
57
60
import pwd
58
 
from contextlib import closing
 
61
import contextlib
59
62
import struct
60
63
import fcntl
61
64
import functools
 
65
import cPickle as pickle
 
66
import multiprocessing
 
67
import types
 
68
import binascii
 
69
import tempfile
 
70
import itertools
62
71
 
63
72
import dbus
64
73
import dbus.service
69
78
import ctypes.util
70
79
import xml.dom.minidom
71
80
import inspect
 
81
import GnuPGInterface
72
82
 
73
83
try:
74
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
78
88
    except ImportError:
79
89
        SO_BINDTODEVICE = None
80
90
 
81
 
 
82
 
version = "1.0.13"
83
 
 
84
 
logger = logging.Logger(u'mandos')
 
91
version = "1.5.3"
 
92
stored_state_file = "clients.pickle"
 
93
 
 
94
logger = logging.getLogger()
85
95
syslogger = (logging.handlers.SysLogHandler
86
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
87
 
              address = "/dev/log"))
88
 
syslogger.setFormatter(logging.Formatter
89
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
90
 
                        u' %(message)s'))
91
 
logger.addHandler(syslogger)
92
 
 
93
 
console = logging.StreamHandler()
94
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
95
 
                                       u' %(levelname)s:'
96
 
                                       u' %(message)s'))
97
 
logger.addHandler(console)
 
97
              address = str("/dev/log")))
 
98
 
 
99
try:
 
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
101
                      (ctypes.util.find_library("c"))
 
102
                      .if_nametoindex)
 
103
except (OSError, AttributeError):
 
104
    def if_nametoindex(interface):
 
105
        "Get an interface index the hard way, i.e. using fcntl()"
 
106
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
107
        with contextlib.closing(socket.socket()) as s:
 
108
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
109
                                struct.pack(str("16s16x"),
 
110
                                            interface))
 
111
        interface_index = struct.unpack(str("I"),
 
112
                                        ifreq[16:20])[0]
 
113
        return interface_index
 
114
 
 
115
 
 
116
def initlogger(debug, level=logging.WARNING):
 
117
    """init logger and add loglevel"""
 
118
    
 
119
    syslogger.setFormatter(logging.Formatter
 
120
                           ('Mandos [%(process)d]: %(levelname)s:'
 
121
                            ' %(message)s'))
 
122
    logger.addHandler(syslogger)
 
123
    
 
124
    if debug:
 
125
        console = logging.StreamHandler()
 
126
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
127
                                               ' [%(process)d]:'
 
128
                                               ' %(levelname)s:'
 
129
                                               ' %(message)s'))
 
130
        logger.addHandler(console)
 
131
    logger.setLevel(level)
 
132
 
 
133
 
 
134
class PGPError(Exception):
 
135
    """Exception if encryption/decryption fails"""
 
136
    pass
 
137
 
 
138
 
 
139
class PGPEngine(object):
 
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
 
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
144
        self.gnupg = GnuPGInterface.GnuPG()
 
145
        self.gnupg.options.meta_interactive = False
 
146
        self.gnupg.options.homedir = self.tempdir
 
147
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
148
                                              '--quiet',
 
149
                                              '--no-use-agent'])
 
150
    
 
151
    def __enter__(self):
 
152
        return self
 
153
    
 
154
    def __exit__ (self, exc_type, exc_value, traceback):
 
155
        self._cleanup()
 
156
        return False
 
157
    
 
158
    def __del__(self):
 
159
        self._cleanup()
 
160
    
 
161
    def _cleanup(self):
 
162
        if self.tempdir is not None:
 
163
            # Delete contents of tempdir
 
164
            for root, dirs, files in os.walk(self.tempdir,
 
165
                                             topdown = False):
 
166
                for filename in files:
 
167
                    os.remove(os.path.join(root, filename))
 
168
                for dirname in dirs:
 
169
                    os.rmdir(os.path.join(root, dirname))
 
170
            # Remove tempdir
 
171
            os.rmdir(self.tempdir)
 
172
            self.tempdir = None
 
173
    
 
174
    def password_encode(self, password):
 
175
        # Passphrase can not be empty and can not contain newlines or
 
176
        # NUL bytes.  So we prefix it and hex encode it.
 
177
        return b"mandos" + binascii.hexlify(password)
 
178
    
 
179
    def encrypt(self, data, password):
 
180
        self.gnupg.passphrase = self.password_encode(password)
 
181
        with open(os.devnull, "w") as devnull:
 
182
            try:
 
183
                proc = self.gnupg.run(['--symmetric'],
 
184
                                      create_fhs=['stdin', 'stdout'],
 
185
                                      attach_fhs={'stderr': devnull})
 
186
                with contextlib.closing(proc.handles['stdin']) as f:
 
187
                    f.write(data)
 
188
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
                    ciphertext = f.read()
 
190
                proc.wait()
 
191
            except IOError as e:
 
192
                raise PGPError(e)
 
193
        self.gnupg.passphrase = None
 
194
        return ciphertext
 
195
    
 
196
    def decrypt(self, data, password):
 
197
        self.gnupg.passphrase = self.password_encode(password)
 
198
        with open(os.devnull, "w") as devnull:
 
199
            try:
 
200
                proc = self.gnupg.run(['--decrypt'],
 
201
                                      create_fhs=['stdin', 'stdout'],
 
202
                                      attach_fhs={'stderr': devnull})
 
203
                with contextlib.closing(proc.handles['stdin']) as f:
 
204
                    f.write(data)
 
205
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
                    decrypted_plaintext = f.read()
 
207
                proc.wait()
 
208
            except IOError as e:
 
209
                raise PGPError(e)
 
210
        self.gnupg.passphrase = None
 
211
        return decrypted_plaintext
 
212
 
98
213
 
99
214
class AvahiError(Exception):
100
215
    def __init__(self, value, *args, **kwargs):
116
231
    Attributes:
117
232
    interface: integer; avahi.IF_UNSPEC or an interface index.
118
233
               Used to optionally bind to the specified interface.
119
 
    name: string; Example: u'Mandos'
120
 
    type: string; Example: u'_mandos._tcp'.
 
234
    name: string; Example: 'Mandos'
 
235
    type: string; Example: '_mandos._tcp'.
121
236
                  See <http://www.dns-sd.org/ServiceTypes.html>
122
237
    port: integer; what port to announce
123
238
    TXT: list of strings; TXT record for the service
130
245
    server: D-Bus Server
131
246
    bus: dbus.SystemBus()
132
247
    """
 
248
    
133
249
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
134
250
                 servicetype = None, port = None, TXT = None,
135
 
                 domain = u"", host = u"", max_renames = 32768,
 
251
                 domain = "", host = "", max_renames = 32768,
136
252
                 protocol = avahi.PROTO_UNSPEC, bus = None):
137
253
        self.interface = interface
138
254
        self.name = name
147
263
        self.group = None       # our entry group
148
264
        self.server = None
149
265
        self.bus = bus
 
266
        self.entry_group_state_changed_match = None
 
267
    
150
268
    def rename(self):
151
269
        """Derived from the Avahi example code"""
152
270
        if self.rename_count >= self.max_renames:
153
 
            logger.critical(u"No suitable Zeroconf service name found"
154
 
                            u" after %i retries, exiting.",
 
271
            logger.critical("No suitable Zeroconf service name found"
 
272
                            " after %i retries, exiting.",
155
273
                            self.rename_count)
156
 
            raise AvahiServiceError(u"Too many renames")
157
 
        self.name = self.server.GetAlternativeServiceName(self.name)
158
 
        logger.info(u"Changing Zeroconf service name to %r ...",
159
 
                    unicode(self.name))
160
 
        syslogger.setFormatter(logging.Formatter
161
 
                               (u'Mandos (%s) [%%(process)d]:'
162
 
                                u' %%(levelname)s: %%(message)s'
163
 
                                % self.name))
 
274
            raise AvahiServiceError("Too many renames")
 
275
        self.name = unicode(self.server
 
276
                            .GetAlternativeServiceName(self.name))
 
277
        logger.info("Changing Zeroconf service name to %r ...",
 
278
                    self.name)
164
279
        self.remove()
165
 
        self.add()
 
280
        try:
 
281
            self.add()
 
282
        except dbus.exceptions.DBusException as error:
 
283
            logger.critical("D-Bus Exception", exc_info=error)
 
284
            self.cleanup()
 
285
            os._exit(1)
166
286
        self.rename_count += 1
 
287
    
167
288
    def remove(self):
168
289
        """Derived from the Avahi example code"""
 
290
        if self.entry_group_state_changed_match is not None:
 
291
            self.entry_group_state_changed_match.remove()
 
292
            self.entry_group_state_changed_match = None
169
293
        if self.group is not None:
170
294
            self.group.Reset()
 
295
    
171
296
    def add(self):
172
297
        """Derived from the Avahi example code"""
 
298
        self.remove()
173
299
        if self.group is None:
174
300
            self.group = dbus.Interface(
175
301
                self.bus.get_object(avahi.DBUS_NAME,
176
302
                                    self.server.EntryGroupNew()),
177
303
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
178
 
            self.group.connect_to_signal('StateChanged',
179
 
                                         self
180
 
                                         .entry_group_state_changed)
181
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
304
        self.entry_group_state_changed_match = (
 
305
            self.group.connect_to_signal(
 
306
                'StateChanged', self.entry_group_state_changed))
 
307
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
182
308
                     self.name, self.type)
183
309
        self.group.AddService(
184
310
            self.interface,
189
315
            dbus.UInt16(self.port),
190
316
            avahi.string_array_to_txt_array(self.TXT))
191
317
        self.group.Commit()
 
318
    
192
319
    def entry_group_state_changed(self, state, error):
193
320
        """Derived from the Avahi example code"""
194
 
        logger.debug(u"Avahi state change: %i", state)
 
321
        logger.debug("Avahi entry group state change: %i", state)
195
322
        
196
323
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
 
            logger.debug(u"Zeroconf service established.")
 
324
            logger.debug("Zeroconf service established.")
198
325
        elif state == avahi.ENTRY_GROUP_COLLISION:
199
 
            logger.warning(u"Zeroconf service name collision.")
 
326
            logger.info("Zeroconf service name collision.")
200
327
            self.rename()
201
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
202
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
329
            logger.critical("Avahi: Error in group state changed %s",
203
330
                            unicode(error))
204
 
            raise AvahiGroupError(u"State changed: %s"
205
 
                                  % unicode(error))
 
331
            raise AvahiGroupError("State changed: {0!s}"
 
332
                                  .format(error))
 
333
    
206
334
    def cleanup(self):
207
335
        """Derived from the Avahi example code"""
208
336
        if self.group is not None:
209
 
            self.group.Free()
 
337
            try:
 
338
                self.group.Free()
 
339
            except (dbus.exceptions.UnknownMethodException,
 
340
                    dbus.exceptions.DBusException):
 
341
                pass
210
342
            self.group = None
211
 
    def server_state_changed(self, state):
 
343
        self.remove()
 
344
    
 
345
    def server_state_changed(self, state, error=None):
212
346
        """Derived from the Avahi example code"""
213
 
        if state == avahi.SERVER_COLLISION:
214
 
            logger.error(u"Zeroconf server name collision")
215
 
            self.remove()
 
347
        logger.debug("Avahi server state change: %i", state)
 
348
        bad_states = { avahi.SERVER_INVALID:
 
349
                           "Zeroconf server invalid",
 
350
                       avahi.SERVER_REGISTERING: None,
 
351
                       avahi.SERVER_COLLISION:
 
352
                           "Zeroconf server name collision",
 
353
                       avahi.SERVER_FAILURE:
 
354
                           "Zeroconf server failure" }
 
355
        if state in bad_states:
 
356
            if bad_states[state] is not None:
 
357
                if error is None:
 
358
                    logger.error(bad_states[state])
 
359
                else:
 
360
                    logger.error(bad_states[state] + ": %r", error)
 
361
            self.cleanup()
216
362
        elif state == avahi.SERVER_RUNNING:
217
363
            self.add()
 
364
        else:
 
365
            if error is None:
 
366
                logger.debug("Unknown state: %r", state)
 
367
            else:
 
368
                logger.debug("Unknown state: %r: %r", state, error)
 
369
    
218
370
    def activate(self):
219
371
        """Derived from the Avahi example code"""
220
372
        if self.server is None:
221
373
            self.server = dbus.Interface(
222
374
                self.bus.get_object(avahi.DBUS_NAME,
223
 
                                    avahi.DBUS_PATH_SERVER),
 
375
                                    avahi.DBUS_PATH_SERVER,
 
376
                                    follow_name_owner_changes=True),
224
377
                avahi.DBUS_INTERFACE_SERVER)
225
 
        self.server.connect_to_signal(u"StateChanged",
 
378
        self.server.connect_to_signal("StateChanged",
226
379
                                 self.server_state_changed)
227
380
        self.server_state_changed(self.server.GetState())
228
381
 
 
382
class AvahiServiceToSyslog(AvahiService):
 
383
    def rename(self):
 
384
        """Add the new name to the syslog messages"""
 
385
        ret = AvahiService.rename(self)
 
386
        syslogger.setFormatter(logging.Formatter
 
387
                               ('Mandos ({0}) [%(process)d]:'
 
388
                                ' %(levelname)s: %(message)s'
 
389
                                .format(self.name)))
 
390
        return ret
 
391
 
 
392
def timedelta_to_milliseconds(td):
 
393
    "Convert a datetime.timedelta() to milliseconds"
 
394
    return ((td.days * 24 * 60 * 60 * 1000)
 
395
            + (td.seconds * 1000)
 
396
            + (td.microseconds // 1000))
229
397
 
230
398
class Client(object):
231
399
    """A representation of a client host served by this server.
232
400
    
233
401
    Attributes:
234
 
    name:       string; from the config file, used in log messages and
235
 
                        D-Bus identifiers
236
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
237
 
                 uniquely identify the client
238
 
    secret:     bytestring; sent verbatim (over TLS) to client
239
 
    host:       string; available for use by the checker command
240
 
    created:    datetime.datetime(); (UTC) object creation
241
 
    last_enabled: datetime.datetime(); (UTC)
242
 
    enabled:    bool()
243
 
    last_checked_ok: datetime.datetime(); (UTC) or None
244
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
245
 
                                      until this client is invalid
246
 
    interval:   datetime.timedelta(); How often to start a new checker
247
 
    disable_hook:  If set, called by disable() as disable_hook(self)
 
402
    approved:   bool(); 'None' if not yet approved/disapproved
 
403
    approval_delay: datetime.timedelta(); Time to wait for approval
 
404
    approval_duration: datetime.timedelta(); Duration of one approval
248
405
    checker:    subprocess.Popen(); a running checker process used
249
406
                                    to see if the client lives.
250
407
                                    'None' if no process is running.
251
 
    checker_initiator_tag: a gobject event source tag, or None
252
 
    disable_initiator_tag: - '' -
253
 
    checker_callback_tag:  - '' -
254
 
    checker_command: string; External command which is run to check if
255
 
                     client lives.  %() expansions are done at
 
408
    checker_callback_tag: a gobject event source tag, or None
 
409
    checker_command: string; External command which is run to check
 
410
                     if client lives.  %() expansions are done at
256
411
                     runtime with vars(self) as dict, so that for
257
412
                     instance %(name)s can be used in the command.
 
413
    checker_initiator_tag: a gobject event source tag, or None
 
414
    created:    datetime.datetime(); (UTC) object creation
 
415
    client_structure: Object describing what attributes a client has
 
416
                      and is used for storing the client at exit
258
417
    current_checker_command: string; current running checker_command
 
418
    disable_initiator_tag: a gobject event source tag, or None
 
419
    enabled:    bool()
 
420
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
421
                 uniquely identify the client
 
422
    host:       string; available for use by the checker command
 
423
    interval:   datetime.timedelta(); How often to start a new checker
 
424
    last_approval_request: datetime.datetime(); (UTC) or None
 
425
    last_checked_ok: datetime.datetime(); (UTC) or None
 
426
    last_checker_status: integer between 0 and 255 reflecting exit
 
427
                         status of last checker. -1 reflects crashed
 
428
                         checker, -2 means no checker completed yet.
 
429
    last_enabled: datetime.datetime(); (UTC) or None
 
430
    name:       string; from the config file, used in log messages and
 
431
                        D-Bus identifiers
 
432
    secret:     bytestring; sent verbatim (over TLS) to client
 
433
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
434
                                      until this client is disabled
 
435
    extended_timeout:   extra long timeout when secret has been sent
 
436
    runtime_expansions: Allowed attributes for runtime expansion.
 
437
    expires:    datetime.datetime(); time (UTC) when a client will be
 
438
                disabled, or None
259
439
    """
260
440
    
261
 
    @staticmethod
262
 
    def _timedelta_to_milliseconds(td):
263
 
        "Convert a datetime.timedelta() to milliseconds"
264
 
        return ((td.days * 24 * 60 * 60 * 1000)
265
 
                + (td.seconds * 1000)
266
 
                + (td.microseconds // 1000))
 
441
    runtime_expansions = ("approval_delay", "approval_duration",
 
442
                          "created", "enabled", "fingerprint",
 
443
                          "host", "interval", "last_checked_ok",
 
444
                          "last_enabled", "name", "timeout")
 
445
    client_defaults = { "timeout": "5m",
 
446
                        "extended_timeout": "15m",
 
447
                        "interval": "2m",
 
448
                        "checker": "fping -q -- %%(host)s",
 
449
                        "host": "",
 
450
                        "approval_delay": "0s",
 
451
                        "approval_duration": "1s",
 
452
                        "approved_by_default": "True",
 
453
                        "enabled": "True",
 
454
                        }
267
455
    
268
456
    def timeout_milliseconds(self):
269
457
        "Return the 'timeout' attribute in milliseconds"
270
 
        return self._timedelta_to_milliseconds(self.timeout)
 
458
        return timedelta_to_milliseconds(self.timeout)
 
459
    
 
460
    def extended_timeout_milliseconds(self):
 
461
        "Return the 'extended_timeout' attribute in milliseconds"
 
462
        return timedelta_to_milliseconds(self.extended_timeout)
271
463
    
272
464
    def interval_milliseconds(self):
273
465
        "Return the 'interval' attribute in milliseconds"
274
 
        return self._timedelta_to_milliseconds(self.interval)
275
 
    
276
 
    def __init__(self, name = None, disable_hook=None, config=None):
277
 
        """Note: the 'checker' key in 'config' sets the
278
 
        'checker_command' attribute and *not* the 'checker'
279
 
        attribute."""
 
466
        return timedelta_to_milliseconds(self.interval)
 
467
    
 
468
    def approval_delay_milliseconds(self):
 
469
        return timedelta_to_milliseconds(self.approval_delay)
 
470
    
 
471
    @staticmethod
 
472
    def config_parser(config):
 
473
        """Construct a new dict of client settings of this form:
 
474
        { client_name: {setting_name: value, ...}, ...}
 
475
        with exceptions for any special settings as defined above.
 
476
        NOTE: Must be a pure function. Must return the same result
 
477
        value given the same arguments.
 
478
        """
 
479
        settings = {}
 
480
        for client_name in config.sections():
 
481
            section = dict(config.items(client_name))
 
482
            client = settings[client_name] = {}
 
483
            
 
484
            client["host"] = section["host"]
 
485
            # Reformat values from string types to Python types
 
486
            client["approved_by_default"] = config.getboolean(
 
487
                client_name, "approved_by_default")
 
488
            client["enabled"] = config.getboolean(client_name,
 
489
                                                  "enabled")
 
490
            
 
491
            client["fingerprint"] = (section["fingerprint"].upper()
 
492
                                     .replace(" ", ""))
 
493
            if "secret" in section:
 
494
                client["secret"] = section["secret"].decode("base64")
 
495
            elif "secfile" in section:
 
496
                with open(os.path.expanduser(os.path.expandvars
 
497
                                             (section["secfile"])),
 
498
                          "rb") as secfile:
 
499
                    client["secret"] = secfile.read()
 
500
            else:
 
501
                raise TypeError("No secret or secfile for section {0}"
 
502
                                .format(section))
 
503
            client["timeout"] = string_to_delta(section["timeout"])
 
504
            client["extended_timeout"] = string_to_delta(
 
505
                section["extended_timeout"])
 
506
            client["interval"] = string_to_delta(section["interval"])
 
507
            client["approval_delay"] = string_to_delta(
 
508
                section["approval_delay"])
 
509
            client["approval_duration"] = string_to_delta(
 
510
                section["approval_duration"])
 
511
            client["checker_command"] = section["checker"]
 
512
            client["last_approval_request"] = None
 
513
            client["last_checked_ok"] = None
 
514
            client["last_checker_status"] = -2
 
515
        
 
516
        return settings
 
517
    
 
518
    def __init__(self, settings, name = None):
280
519
        self.name = name
281
 
        if config is None:
282
 
            config = {}
283
 
        logger.debug(u"Creating client %r", self.name)
 
520
        # adding all client settings
 
521
        for setting, value in settings.iteritems():
 
522
            setattr(self, setting, value)
 
523
        
 
524
        if self.enabled:
 
525
            if not hasattr(self, "last_enabled"):
 
526
                self.last_enabled = datetime.datetime.utcnow()
 
527
            if not hasattr(self, "expires"):
 
528
                self.expires = (datetime.datetime.utcnow()
 
529
                                + self.timeout)
 
530
        else:
 
531
            self.last_enabled = None
 
532
            self.expires = None
 
533
        
 
534
        logger.debug("Creating client %r", self.name)
284
535
        # Uppercase and remove spaces from fingerprint for later
285
536
        # comparison purposes with return value from the fingerprint()
286
537
        # function
287
 
        self.fingerprint = (config[u"fingerprint"].upper()
288
 
                            .replace(u" ", u""))
289
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
290
 
        if u"secret" in config:
291
 
            self.secret = config[u"secret"].decode(u"base64")
292
 
        elif u"secfile" in config:
293
 
            with closing(open(os.path.expanduser
294
 
                              (os.path.expandvars
295
 
                               (config[u"secfile"])),
296
 
                              "rb")) as secfile:
297
 
                self.secret = secfile.read()
298
 
        else:
299
 
            raise TypeError(u"No secret or secfile for client %s"
300
 
                            % self.name)
301
 
        self.host = config.get(u"host", u"")
302
 
        self.created = datetime.datetime.utcnow()
303
 
        self.enabled = False
304
 
        self.last_enabled = None
305
 
        self.last_checked_ok = None
306
 
        self.timeout = string_to_delta(config[u"timeout"])
307
 
        self.interval = string_to_delta(config[u"interval"])
308
 
        self.disable_hook = disable_hook
 
538
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
539
        self.created = settings.get("created",
 
540
                                    datetime.datetime.utcnow())
 
541
        
 
542
        # attributes specific for this server instance
309
543
        self.checker = None
310
544
        self.checker_initiator_tag = None
311
545
        self.disable_initiator_tag = None
312
546
        self.checker_callback_tag = None
313
 
        self.checker_command = config[u"checker"]
314
547
        self.current_checker_command = None
315
 
        self.last_connect = None
 
548
        self.approved = None
 
549
        self.approvals_pending = 0
 
550
        self.changedstate = (multiprocessing_manager
 
551
                             .Condition(multiprocessing_manager
 
552
                                        .Lock()))
 
553
        self.client_structure = [attr for attr in
 
554
                                 self.__dict__.iterkeys()
 
555
                                 if not attr.startswith("_")]
 
556
        self.client_structure.append("client_structure")
 
557
        
 
558
        for name, t in inspect.getmembers(type(self),
 
559
                                          lambda obj:
 
560
                                              isinstance(obj,
 
561
                                                         property)):
 
562
            if not name.startswith("_"):
 
563
                self.client_structure.append(name)
 
564
    
 
565
    # Send notice to process children that client state has changed
 
566
    def send_changedstate(self):
 
567
        with self.changedstate:
 
568
            self.changedstate.notify_all()
316
569
    
317
570
    def enable(self):
318
571
        """Start this client's checker and timeout hooks"""
319
 
        if getattr(self, u"enabled", False):
 
572
        if getattr(self, "enabled", False):
320
573
            # Already enabled
321
574
            return
 
575
        self.send_changedstate()
 
576
        self.expires = datetime.datetime.utcnow() + self.timeout
 
577
        self.enabled = True
322
578
        self.last_enabled = datetime.datetime.utcnow()
 
579
        self.init_checker()
 
580
    
 
581
    def disable(self, quiet=True):
 
582
        """Disable this client."""
 
583
        if not getattr(self, "enabled", False):
 
584
            return False
 
585
        if not quiet:
 
586
            self.send_changedstate()
 
587
        if not quiet:
 
588
            logger.info("Disabling client %s", self.name)
 
589
        if getattr(self, "disable_initiator_tag", False):
 
590
            gobject.source_remove(self.disable_initiator_tag)
 
591
            self.disable_initiator_tag = None
 
592
        self.expires = None
 
593
        if getattr(self, "checker_initiator_tag", False):
 
594
            gobject.source_remove(self.checker_initiator_tag)
 
595
            self.checker_initiator_tag = None
 
596
        self.stop_checker()
 
597
        self.enabled = False
 
598
        # Do not run this again if called by a gobject.timeout_add
 
599
        return False
 
600
    
 
601
    def __del__(self):
 
602
        self.disable()
 
603
    
 
604
    def init_checker(self):
323
605
        # Schedule a new checker to be started an 'interval' from now,
324
606
        # and every interval from then on.
325
607
        self.checker_initiator_tag = (gobject.timeout_add
326
608
                                      (self.interval_milliseconds(),
327
609
                                       self.start_checker))
328
 
        # Also start a new checker *right now*.
329
 
        self.start_checker()
330
610
        # Schedule a disable() when 'timeout' has passed
331
611
        self.disable_initiator_tag = (gobject.timeout_add
332
612
                                   (self.timeout_milliseconds(),
333
613
                                    self.disable))
334
 
        self.enabled = True
335
 
    
336
 
    def disable(self):
337
 
        """Disable this client."""
338
 
        if not getattr(self, "enabled", False):
339
 
            return False
340
 
        logger.info(u"Disabling client %s", self.name)
341
 
        if getattr(self, u"disable_initiator_tag", False):
342
 
            gobject.source_remove(self.disable_initiator_tag)
343
 
            self.disable_initiator_tag = None
344
 
        if getattr(self, u"checker_initiator_tag", False):
345
 
            gobject.source_remove(self.checker_initiator_tag)
346
 
            self.checker_initiator_tag = None
347
 
        self.stop_checker()
348
 
        if self.disable_hook:
349
 
            self.disable_hook(self)
350
 
        self.enabled = False
351
 
        # Do not run this again if called by a gobject.timeout_add
352
 
        return False
353
 
    
354
 
    def __del__(self):
355
 
        self.disable_hook = None
356
 
        self.disable()
 
614
        # Also start a new checker *right now*.
 
615
        self.start_checker()
357
616
    
358
617
    def checker_callback(self, pid, condition, command):
359
618
        """The checker has completed, so take appropriate actions."""
360
619
        self.checker_callback_tag = None
361
620
        self.checker = None
362
621
        if os.WIFEXITED(condition):
363
 
            exitstatus = os.WEXITSTATUS(condition)
364
 
            if exitstatus == 0:
365
 
                logger.info(u"Checker for %(name)s succeeded",
 
622
            self.last_checker_status = os.WEXITSTATUS(condition)
 
623
            if self.last_checker_status == 0:
 
624
                logger.info("Checker for %(name)s succeeded",
366
625
                            vars(self))
367
626
                self.checked_ok()
368
627
            else:
369
 
                logger.info(u"Checker for %(name)s failed",
 
628
                logger.info("Checker for %(name)s failed",
370
629
                            vars(self))
371
630
        else:
372
 
            logger.warning(u"Checker for %(name)s crashed?",
 
631
            self.last_checker_status = -1
 
632
            logger.warning("Checker for %(name)s crashed?",
373
633
                           vars(self))
374
634
    
375
635
    def checked_ok(self):
376
 
        """Bump up the timeout for this client.
377
 
        
378
 
        This should only be called when the client has been seen,
379
 
        alive and well.
380
 
        """
 
636
        """Assert that the client has been seen, alive and well."""
381
637
        self.last_checked_ok = datetime.datetime.utcnow()
382
 
        gobject.source_remove(self.disable_initiator_tag)
383
 
        self.disable_initiator_tag = (gobject.timeout_add
384
 
                                      (self.timeout_milliseconds(),
385
 
                                       self.disable))
 
638
        self.last_checker_status = 0
 
639
        self.bump_timeout()
 
640
    
 
641
    def bump_timeout(self, timeout=None):
 
642
        """Bump up the timeout for this client."""
 
643
        if timeout is None:
 
644
            timeout = self.timeout
 
645
        if self.disable_initiator_tag is not None:
 
646
            gobject.source_remove(self.disable_initiator_tag)
 
647
        if getattr(self, "enabled", False):
 
648
            self.disable_initiator_tag = (gobject.timeout_add
 
649
                                          (timedelta_to_milliseconds
 
650
                                           (timeout), self.disable))
 
651
            self.expires = datetime.datetime.utcnow() + timeout
 
652
    
 
653
    def need_approval(self):
 
654
        self.last_approval_request = datetime.datetime.utcnow()
386
655
    
387
656
    def start_checker(self):
388
657
        """Start a new checker subprocess if one is not running.
390
659
        If a checker already exists, leave it running and do
391
660
        nothing."""
392
661
        # The reason for not killing a running checker is that if we
393
 
        # did that, then if a checker (for some reason) started
394
 
        # running slowly and taking more than 'interval' time, the
395
 
        # client would inevitably timeout, since no checker would get
396
 
        # a chance to run to completion.  If we instead leave running
 
662
        # did that, and if a checker (for some reason) started running
 
663
        # slowly and taking more than 'interval' time, then the client
 
664
        # would inevitably timeout, since no checker would get a
 
665
        # chance to run to completion.  If we instead leave running
397
666
        # checkers alone, the checker would have to take more time
398
 
        # than 'timeout' for the client to be declared invalid, which
399
 
        # is as it should be.
 
667
        # than 'timeout' for the client to be disabled, which is as it
 
668
        # should be.
400
669
        
401
670
        # If a checker exists, make sure it is not a zombie
402
671
        try:
403
672
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
404
 
        except (AttributeError, OSError), error:
 
673
        except (AttributeError, OSError) as error:
405
674
            if (isinstance(error, OSError)
406
675
                and error.errno != errno.ECHILD):
407
676
                raise error
408
677
        else:
409
678
            if pid:
410
 
                logger.warning(u"Checker was a zombie")
 
679
                logger.warning("Checker was a zombie")
411
680
                gobject.source_remove(self.checker_callback_tag)
412
681
                self.checker_callback(pid, status,
413
682
                                      self.current_checker_command)
418
687
                command = self.checker_command % self.host
419
688
            except TypeError:
420
689
                # Escape attributes for the shell
421
 
                escaped_attrs = dict((key,
422
 
                                      re.escape(unicode(str(val),
423
 
                                                        errors=
424
 
                                                        u'replace')))
425
 
                                     for key, val in
426
 
                                     vars(self).iteritems())
 
690
                escaped_attrs = dict(
 
691
                    (attr,
 
692
                     re.escape(unicode(str(getattr(self, attr, "")),
 
693
                                       errors=
 
694
                                       'replace')))
 
695
                    for attr in
 
696
                    self.runtime_expansions)
 
697
                
427
698
                try:
428
699
                    command = self.checker_command % escaped_attrs
429
 
                except TypeError, error:
430
 
                    logger.error(u'Could not format string "%s":'
431
 
                                 u' %s', self.checker_command, error)
 
700
                except TypeError as error:
 
701
                    logger.error('Could not format string "%s"',
 
702
                                 self.checker_command, exc_info=error)
432
703
                    return True # Try again later
433
704
            self.current_checker_command = command
434
705
            try:
435
 
                logger.info(u"Starting checker %r for %s",
 
706
                logger.info("Starting checker %r for %s",
436
707
                            command, self.name)
437
708
                # We don't need to redirect stdout and stderr, since
438
709
                # in normal mode, that is already done by daemon(),
440
711
                # always replaced by /dev/null.)
441
712
                self.checker = subprocess.Popen(command,
442
713
                                                close_fds=True,
443
 
                                                shell=True, cwd=u"/")
 
714
                                                shell=True, cwd="/")
444
715
                self.checker_callback_tag = (gobject.child_watch_add
445
716
                                             (self.checker.pid,
446
717
                                              self.checker_callback,
451
722
                if pid:
452
723
                    gobject.source_remove(self.checker_callback_tag)
453
724
                    self.checker_callback(pid, status, command)
454
 
            except OSError, error:
455
 
                logger.error(u"Failed to start subprocess: %s",
456
 
                             error)
 
725
            except OSError as error:
 
726
                logger.error("Failed to start subprocess",
 
727
                             exc_info=error)
457
728
        # Re-run this periodically if run by gobject.timeout_add
458
729
        return True
459
730
    
462
733
        if self.checker_callback_tag:
463
734
            gobject.source_remove(self.checker_callback_tag)
464
735
            self.checker_callback_tag = None
465
 
        if getattr(self, u"checker", None) is None:
 
736
        if getattr(self, "checker", None) is None:
466
737
            return
467
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
738
        logger.debug("Stopping checker for %(name)s", vars(self))
468
739
        try:
469
 
            os.kill(self.checker.pid, signal.SIGTERM)
470
 
            #os.sleep(0.5)
 
740
            self.checker.terminate()
 
741
            #time.sleep(0.5)
471
742
            #if self.checker.poll() is None:
472
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
473
 
        except OSError, error:
 
743
            #    self.checker.kill()
 
744
        except OSError as error:
474
745
            if error.errno != errno.ESRCH: # No such process
475
746
                raise
476
747
        self.checker = None
477
 
    
478
 
    def still_valid(self):
479
 
        """Has the timeout not yet passed for this client?"""
480
 
        if not getattr(self, u"enabled", False):
481
 
            return False
482
 
        now = datetime.datetime.utcnow()
483
 
        if self.last_checked_ok is None:
484
 
            return now < (self.created + self.timeout)
485
 
        else:
486
 
            return now < (self.last_checked_ok + self.timeout)
487
 
 
488
 
 
489
 
def dbus_service_property(dbus_interface, signature=u"v",
490
 
                          access=u"readwrite", byte_arrays=False):
 
748
 
 
749
 
 
750
def dbus_service_property(dbus_interface, signature="v",
 
751
                          access="readwrite", byte_arrays=False):
491
752
    """Decorators for marking methods of a DBusObjectWithProperties to
492
753
    become properties on the D-Bus.
493
754
    
498
759
    dbus.service.method, except there is only "signature", since the
499
760
    type from Get() and the type sent to Set() is the same.
500
761
    """
 
762
    # Encoding deeply encoded byte arrays is not supported yet by the
 
763
    # "Set" method, so we fail early here:
 
764
    if byte_arrays and signature != "ay":
 
765
        raise ValueError("Byte arrays not supported for non-'ay'"
 
766
                         " signature {0!r}".format(signature))
501
767
    def decorator(func):
502
768
        func._dbus_is_property = True
503
769
        func._dbus_interface = dbus_interface
504
770
        func._dbus_signature = signature
505
771
        func._dbus_access = access
506
772
        func._dbus_name = func.__name__
507
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
773
        if func._dbus_name.endswith("_dbus_property"):
508
774
            func._dbus_name = func._dbus_name[:-14]
509
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
775
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
776
        return func
 
777
    return decorator
 
778
 
 
779
 
 
780
def dbus_interface_annotations(dbus_interface):
 
781
    """Decorator for marking functions returning interface annotations
 
782
    
 
783
    Usage:
 
784
    
 
785
    @dbus_interface_annotations("org.example.Interface")
 
786
    def _foo(self):  # Function name does not matter
 
787
        return {"org.freedesktop.DBus.Deprecated": "true",
 
788
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
789
                    "false"}
 
790
    """
 
791
    def decorator(func):
 
792
        func._dbus_is_interface = True
 
793
        func._dbus_interface = dbus_interface
 
794
        func._dbus_name = dbus_interface
 
795
        return func
 
796
    return decorator
 
797
 
 
798
 
 
799
def dbus_annotations(annotations):
 
800
    """Decorator to annotate D-Bus methods, signals or properties
 
801
    Usage:
 
802
    
 
803
    @dbus_service_property("org.example.Interface", signature="b",
 
804
                           access="r")
 
805
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
806
                        "org.freedesktop.DBus.Property."
 
807
                        "EmitsChangedSignal": "false"})
 
808
    def Property_dbus_property(self):
 
809
        return dbus.Boolean(False)
 
810
    """
 
811
    def decorator(func):
 
812
        func._dbus_annotations = annotations
510
813
        return func
511
814
    return decorator
512
815
 
532
835
 
533
836
class DBusObjectWithProperties(dbus.service.Object):
534
837
    """A D-Bus object with properties.
535
 
 
 
838
    
536
839
    Classes inheriting from this can use the dbus_service_property
537
840
    decorator to expose methods as D-Bus properties.  It exposes the
538
841
    standard Get(), Set(), and GetAll() methods on the D-Bus.
539
842
    """
540
843
    
541
844
    @staticmethod
542
 
    def _is_dbus_property(obj):
543
 
        return getattr(obj, u"_dbus_is_property", False)
 
845
    def _is_dbus_thing(thing):
 
846
        """Returns a function testing if an attribute is a D-Bus thing
 
847
        
 
848
        If called like _is_dbus_thing("method") it returns a function
 
849
        suitable for use as predicate to inspect.getmembers().
 
850
        """
 
851
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
852
                                   False)
544
853
    
545
 
    def _get_all_dbus_properties(self):
 
854
    def _get_all_dbus_things(self, thing):
546
855
        """Returns a generator of (name, attribute) pairs
547
856
        """
548
 
        return ((prop._dbus_name, prop)
549
 
                for name, prop in
550
 
                inspect.getmembers(self, self._is_dbus_property))
 
857
        return ((getattr(athing.__get__(self), "_dbus_name",
 
858
                         name),
 
859
                 athing.__get__(self))
 
860
                for cls in self.__class__.__mro__
 
861
                for name, athing in
 
862
                inspect.getmembers(cls,
 
863
                                   self._is_dbus_thing(thing)))
551
864
    
552
865
    def _get_dbus_property(self, interface_name, property_name):
553
866
        """Returns a bound method if one exists which is a D-Bus
554
867
        property with the specified name and interface.
555
868
        """
556
 
        for name in (property_name,
557
 
                     property_name + u"_dbus_property"):
558
 
            prop = getattr(self, name, None)
559
 
            if (prop is None
560
 
                or not self._is_dbus_property(prop)
561
 
                or prop._dbus_name != property_name
562
 
                or (interface_name and prop._dbus_interface
563
 
                    and interface_name != prop._dbus_interface)):
564
 
                continue
565
 
            return prop
 
869
        for cls in  self.__class__.__mro__:
 
870
            for name, value in (inspect.getmembers
 
871
                                (cls,
 
872
                                 self._is_dbus_thing("property"))):
 
873
                if (value._dbus_name == property_name
 
874
                    and value._dbus_interface == interface_name):
 
875
                    return value.__get__(self)
 
876
        
566
877
        # No such property
567
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
568
 
                                   + interface_name + u"."
 
878
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
879
                                   + interface_name + "."
569
880
                                   + property_name)
570
881
    
571
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
572
 
                         out_signature=u"v")
 
882
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
883
                         out_signature="v")
573
884
    def Get(self, interface_name, property_name):
574
885
        """Standard D-Bus property Get() method, see D-Bus standard.
575
886
        """
576
887
        prop = self._get_dbus_property(interface_name, property_name)
577
 
        if prop._dbus_access == u"write":
 
888
        if prop._dbus_access == "write":
578
889
            raise DBusPropertyAccessException(property_name)
579
890
        value = prop()
580
 
        if not hasattr(value, u"variant_level"):
 
891
        if not hasattr(value, "variant_level"):
581
892
            return value
582
893
        return type(value)(value, variant_level=value.variant_level+1)
583
894
    
584
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
895
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
585
896
    def Set(self, interface_name, property_name, value):
586
897
        """Standard D-Bus property Set() method, see D-Bus standard.
587
898
        """
588
899
        prop = self._get_dbus_property(interface_name, property_name)
589
 
        if prop._dbus_access == u"read":
 
900
        if prop._dbus_access == "read":
590
901
            raise DBusPropertyAccessException(property_name)
591
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
592
 
            value = dbus.ByteArray(''.join(unichr(byte)
593
 
                                           for byte in value))
 
902
        if prop._dbus_get_args_options["byte_arrays"]:
 
903
            # The byte_arrays option is not supported yet on
 
904
            # signatures other than "ay".
 
905
            if prop._dbus_signature != "ay":
 
906
                raise ValueError
 
907
            value = dbus.ByteArray(b''.join(chr(byte)
 
908
                                            for byte in value))
594
909
        prop(value)
595
910
    
596
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
 
                         out_signature=u"a{sv}")
 
911
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
912
                         out_signature="a{sv}")
598
913
    def GetAll(self, interface_name):
599
914
        """Standard D-Bus property GetAll() method, see D-Bus
600
915
        standard.
601
 
 
 
916
        
602
917
        Note: Will not include properties with access="write".
603
918
        """
604
 
        all = {}
605
 
        for name, prop in self._get_all_dbus_properties():
 
919
        properties = {}
 
920
        for name, prop in self._get_all_dbus_things("property"):
606
921
            if (interface_name
607
922
                and interface_name != prop._dbus_interface):
608
923
                # Interface non-empty but did not match
609
924
                continue
610
925
            # Ignore write-only properties
611
 
            if prop._dbus_access == u"write":
 
926
            if prop._dbus_access == "write":
612
927
                continue
613
928
            value = prop()
614
 
            if not hasattr(value, u"variant_level"):
615
 
                all[name] = value
 
929
            if not hasattr(value, "variant_level"):
 
930
                properties[name] = value
616
931
                continue
617
 
            all[name] = type(value)(value, variant_level=
618
 
                                    value.variant_level+1)
619
 
        return dbus.Dictionary(all, signature=u"sv")
 
932
            properties[name] = type(value)(value, variant_level=
 
933
                                           value.variant_level+1)
 
934
        return dbus.Dictionary(properties, signature="sv")
620
935
    
621
936
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
622
 
                         out_signature=u"s",
 
937
                         out_signature="s",
623
938
                         path_keyword='object_path',
624
939
                         connection_keyword='connection')
625
940
    def Introspect(self, object_path, connection):
626
 
        """Standard D-Bus method, overloaded to insert property tags.
 
941
        """Overloading of standard D-Bus method.
 
942
        
 
943
        Inserts property tags and interface annotation tags.
627
944
        """
628
945
        xmlstring = dbus.service.Object.Introspect(self, object_path,
629
946
                                                   connection)
630
947
        try:
631
948
            document = xml.dom.minidom.parseString(xmlstring)
632
949
            def make_tag(document, name, prop):
633
 
                e = document.createElement(u"property")
634
 
                e.setAttribute(u"name", name)
635
 
                e.setAttribute(u"type", prop._dbus_signature)
636
 
                e.setAttribute(u"access", prop._dbus_access)
 
950
                e = document.createElement("property")
 
951
                e.setAttribute("name", name)
 
952
                e.setAttribute("type", prop._dbus_signature)
 
953
                e.setAttribute("access", prop._dbus_access)
637
954
                return e
638
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
955
            for if_tag in document.getElementsByTagName("interface"):
 
956
                # Add property tags
639
957
                for tag in (make_tag(document, name, prop)
640
958
                            for name, prop
641
 
                            in self._get_all_dbus_properties()
 
959
                            in self._get_all_dbus_things("property")
642
960
                            if prop._dbus_interface
643
 
                            == if_tag.getAttribute(u"name")):
 
961
                            == if_tag.getAttribute("name")):
644
962
                    if_tag.appendChild(tag)
 
963
                # Add annotation tags
 
964
                for typ in ("method", "signal", "property"):
 
965
                    for tag in if_tag.getElementsByTagName(typ):
 
966
                        annots = dict()
 
967
                        for name, prop in (self.
 
968
                                           _get_all_dbus_things(typ)):
 
969
                            if (name == tag.getAttribute("name")
 
970
                                and prop._dbus_interface
 
971
                                == if_tag.getAttribute("name")):
 
972
                                annots.update(getattr
 
973
                                              (prop,
 
974
                                               "_dbus_annotations",
 
975
                                               {}))
 
976
                        for name, value in annots.iteritems():
 
977
                            ann_tag = document.createElement(
 
978
                                "annotation")
 
979
                            ann_tag.setAttribute("name", name)
 
980
                            ann_tag.setAttribute("value", value)
 
981
                            tag.appendChild(ann_tag)
 
982
                # Add interface annotation tags
 
983
                for annotation, value in dict(
 
984
                    itertools.chain.from_iterable(
 
985
                        annotations().iteritems()
 
986
                        for name, annotations in
 
987
                        self._get_all_dbus_things("interface")
 
988
                        if name == if_tag.getAttribute("name")
 
989
                        )).iteritems():
 
990
                    ann_tag = document.createElement("annotation")
 
991
                    ann_tag.setAttribute("name", annotation)
 
992
                    ann_tag.setAttribute("value", value)
 
993
                    if_tag.appendChild(ann_tag)
645
994
                # Add the names to the return values for the
646
995
                # "org.freedesktop.DBus.Properties" methods
647
 
                if (if_tag.getAttribute(u"name")
648
 
                    == u"org.freedesktop.DBus.Properties"):
649
 
                    for cn in if_tag.getElementsByTagName(u"method"):
650
 
                        if cn.getAttribute(u"name") == u"Get":
651
 
                            for arg in cn.getElementsByTagName(u"arg"):
652
 
                                if (arg.getAttribute(u"direction")
653
 
                                    == u"out"):
654
 
                                    arg.setAttribute(u"name", u"value")
655
 
                        elif cn.getAttribute(u"name") == u"GetAll":
656
 
                            for arg in cn.getElementsByTagName(u"arg"):
657
 
                                if (arg.getAttribute(u"direction")
658
 
                                    == u"out"):
659
 
                                    arg.setAttribute(u"name", u"props")
660
 
            xmlstring = document.toxml(u"utf-8")
 
996
                if (if_tag.getAttribute("name")
 
997
                    == "org.freedesktop.DBus.Properties"):
 
998
                    for cn in if_tag.getElementsByTagName("method"):
 
999
                        if cn.getAttribute("name") == "Get":
 
1000
                            for arg in cn.getElementsByTagName("arg"):
 
1001
                                if (arg.getAttribute("direction")
 
1002
                                    == "out"):
 
1003
                                    arg.setAttribute("name", "value")
 
1004
                        elif cn.getAttribute("name") == "GetAll":
 
1005
                            for arg in cn.getElementsByTagName("arg"):
 
1006
                                if (arg.getAttribute("direction")
 
1007
                                    == "out"):
 
1008
                                    arg.setAttribute("name", "props")
 
1009
            xmlstring = document.toxml("utf-8")
661
1010
            document.unlink()
662
1011
        except (AttributeError, xml.dom.DOMException,
663
 
                xml.parsers.expat.ExpatError), error:
664
 
            logger.error(u"Failed to override Introspection method",
665
 
                         error)
 
1012
                xml.parsers.expat.ExpatError) as error:
 
1013
            logger.error("Failed to override Introspection method",
 
1014
                         exc_info=error)
666
1015
        return xmlstring
667
1016
 
668
1017
 
 
1018
def datetime_to_dbus (dt, variant_level=0):
 
1019
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1020
    if dt is None:
 
1021
        return dbus.String("", variant_level = variant_level)
 
1022
    return dbus.String(dt.isoformat(),
 
1023
                       variant_level=variant_level)
 
1024
 
 
1025
 
 
1026
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1027
    """A class decorator; applied to a subclass of
 
1028
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1029
    interface names according to the "alt_interface_names" mapping.
 
1030
    Usage:
 
1031
    
 
1032
    @alternate_dbus_names({"org.example.Interface":
 
1033
                               "net.example.AlternateInterface"})
 
1034
    class SampleDBusObject(dbus.service.Object):
 
1035
        @dbus.service.method("org.example.Interface")
 
1036
        def SampleDBusMethod():
 
1037
            pass
 
1038
    
 
1039
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1040
    reachable via two interfaces: "org.example.Interface" and
 
1041
    "net.example.AlternateInterface", the latter of which will have
 
1042
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1043
    "true", unless "deprecate" is passed with a False value.
 
1044
    
 
1045
    This works for methods and signals, and also for D-Bus properties
 
1046
    (from DBusObjectWithProperties) and interfaces (from the
 
1047
    dbus_interface_annotations decorator).
 
1048
    """
 
1049
    def wrapper(cls):
 
1050
        for orig_interface_name, alt_interface_name in (
 
1051
            alt_interface_names.iteritems()):
 
1052
            attr = {}
 
1053
            interface_names = set()
 
1054
            # Go though all attributes of the class
 
1055
            for attrname, attribute in inspect.getmembers(cls):
 
1056
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1057
                # with the wrong interface name
 
1058
                if (not hasattr(attribute, "_dbus_interface")
 
1059
                    or not attribute._dbus_interface
 
1060
                    .startswith(orig_interface_name)):
 
1061
                    continue
 
1062
                # Create an alternate D-Bus interface name based on
 
1063
                # the current name
 
1064
                alt_interface = (attribute._dbus_interface
 
1065
                                 .replace(orig_interface_name,
 
1066
                                          alt_interface_name))
 
1067
                interface_names.add(alt_interface)
 
1068
                # Is this a D-Bus signal?
 
1069
                if getattr(attribute, "_dbus_is_signal", False):
 
1070
                    # Extract the original non-method function by
 
1071
                    # black magic
 
1072
                    nonmethod_func = (dict(
 
1073
                            zip(attribute.func_code.co_freevars,
 
1074
                                attribute.__closure__))["func"]
 
1075
                                      .cell_contents)
 
1076
                    # Create a new, but exactly alike, function
 
1077
                    # object, and decorate it to be a new D-Bus signal
 
1078
                    # with the alternate D-Bus interface name
 
1079
                    new_function = (dbus.service.signal
 
1080
                                    (alt_interface,
 
1081
                                     attribute._dbus_signature)
 
1082
                                    (types.FunctionType(
 
1083
                                nonmethod_func.func_code,
 
1084
                                nonmethod_func.func_globals,
 
1085
                                nonmethod_func.func_name,
 
1086
                                nonmethod_func.func_defaults,
 
1087
                                nonmethod_func.func_closure)))
 
1088
                    # Copy annotations, if any
 
1089
                    try:
 
1090
                        new_function._dbus_annotations = (
 
1091
                            dict(attribute._dbus_annotations))
 
1092
                    except AttributeError:
 
1093
                        pass
 
1094
                    # Define a creator of a function to call both the
 
1095
                    # original and alternate functions, so both the
 
1096
                    # original and alternate signals gets sent when
 
1097
                    # the function is called
 
1098
                    def fixscope(func1, func2):
 
1099
                        """This function is a scope container to pass
 
1100
                        func1 and func2 to the "call_both" function
 
1101
                        outside of its arguments"""
 
1102
                        def call_both(*args, **kwargs):
 
1103
                            """This function will emit two D-Bus
 
1104
                            signals by calling func1 and func2"""
 
1105
                            func1(*args, **kwargs)
 
1106
                            func2(*args, **kwargs)
 
1107
                        return call_both
 
1108
                    # Create the "call_both" function and add it to
 
1109
                    # the class
 
1110
                    attr[attrname] = fixscope(attribute, new_function)
 
1111
                # Is this a D-Bus method?
 
1112
                elif getattr(attribute, "_dbus_is_method", False):
 
1113
                    # Create a new, but exactly alike, function
 
1114
                    # object.  Decorate it to be a new D-Bus method
 
1115
                    # with the alternate D-Bus interface name.  Add it
 
1116
                    # to the class.
 
1117
                    attr[attrname] = (dbus.service.method
 
1118
                                      (alt_interface,
 
1119
                                       attribute._dbus_in_signature,
 
1120
                                       attribute._dbus_out_signature)
 
1121
                                      (types.FunctionType
 
1122
                                       (attribute.func_code,
 
1123
                                        attribute.func_globals,
 
1124
                                        attribute.func_name,
 
1125
                                        attribute.func_defaults,
 
1126
                                        attribute.func_closure)))
 
1127
                    # Copy annotations, if any
 
1128
                    try:
 
1129
                        attr[attrname]._dbus_annotations = (
 
1130
                            dict(attribute._dbus_annotations))
 
1131
                    except AttributeError:
 
1132
                        pass
 
1133
                # Is this a D-Bus property?
 
1134
                elif getattr(attribute, "_dbus_is_property", False):
 
1135
                    # Create a new, but exactly alike, function
 
1136
                    # object, and decorate it to be a new D-Bus
 
1137
                    # property with the alternate D-Bus interface
 
1138
                    # name.  Add it to the class.
 
1139
                    attr[attrname] = (dbus_service_property
 
1140
                                      (alt_interface,
 
1141
                                       attribute._dbus_signature,
 
1142
                                       attribute._dbus_access,
 
1143
                                       attribute
 
1144
                                       ._dbus_get_args_options
 
1145
                                       ["byte_arrays"])
 
1146
                                      (types.FunctionType
 
1147
                                       (attribute.func_code,
 
1148
                                        attribute.func_globals,
 
1149
                                        attribute.func_name,
 
1150
                                        attribute.func_defaults,
 
1151
                                        attribute.func_closure)))
 
1152
                    # Copy annotations, if any
 
1153
                    try:
 
1154
                        attr[attrname]._dbus_annotations = (
 
1155
                            dict(attribute._dbus_annotations))
 
1156
                    except AttributeError:
 
1157
                        pass
 
1158
                # Is this a D-Bus interface?
 
1159
                elif getattr(attribute, "_dbus_is_interface", False):
 
1160
                    # Create a new, but exactly alike, function
 
1161
                    # object.  Decorate it to be a new D-Bus interface
 
1162
                    # with the alternate D-Bus interface name.  Add it
 
1163
                    # to the class.
 
1164
                    attr[attrname] = (dbus_interface_annotations
 
1165
                                      (alt_interface)
 
1166
                                      (types.FunctionType
 
1167
                                       (attribute.func_code,
 
1168
                                        attribute.func_globals,
 
1169
                                        attribute.func_name,
 
1170
                                        attribute.func_defaults,
 
1171
                                        attribute.func_closure)))
 
1172
            if deprecate:
 
1173
                # Deprecate all alternate interfaces
 
1174
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1175
                for interface_name in interface_names:
 
1176
                    @dbus_interface_annotations(interface_name)
 
1177
                    def func(self):
 
1178
                        return { "org.freedesktop.DBus.Deprecated":
 
1179
                                     "true" }
 
1180
                    # Find an unused name
 
1181
                    for aname in (iname.format(i)
 
1182
                                  for i in itertools.count()):
 
1183
                        if aname not in attr:
 
1184
                            attr[aname] = func
 
1185
                            break
 
1186
            if interface_names:
 
1187
                # Replace the class with a new subclass of it with
 
1188
                # methods, signals, etc. as created above.
 
1189
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1190
                           (cls,), attr)
 
1191
        return cls
 
1192
    return wrapper
 
1193
 
 
1194
 
 
1195
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1196
                                "se.bsnet.fukt.Mandos"})
669
1197
class ClientDBus(Client, DBusObjectWithProperties):
670
1198
    """A Client class using D-Bus
671
1199
    
673
1201
    dbus_object_path: dbus.ObjectPath
674
1202
    bus: dbus.SystemBus()
675
1203
    """
 
1204
    
 
1205
    runtime_expansions = (Client.runtime_expansions
 
1206
                          + ("dbus_object_path",))
 
1207
    
676
1208
    # dbus.service.Object doesn't use super(), so we can't either.
677
1209
    
678
1210
    def __init__(self, bus = None, *args, **kwargs):
680
1212
        Client.__init__(self, *args, **kwargs)
681
1213
        # Only now, when this client is initialized, can it show up on
682
1214
        # the D-Bus
 
1215
        client_object_name = unicode(self.name).translate(
 
1216
            {ord("."): ord("_"),
 
1217
             ord("-"): ord("_")})
683
1218
        self.dbus_object_path = (dbus.ObjectPath
684
 
                                 (u"/clients/"
685
 
                                  + self.name.replace(u".", u"_")))
 
1219
                                 ("/clients/" + client_object_name))
686
1220
        DBusObjectWithProperties.__init__(self, self.bus,
687
1221
                                          self.dbus_object_path)
688
1222
    
689
 
    @staticmethod
690
 
    def _datetime_to_dbus(dt, variant_level=0):
691
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
692
 
        return dbus.String(dt.isoformat(),
693
 
                           variant_level=variant_level)
694
 
    
695
 
    def enable(self):
696
 
        oldstate = getattr(self, u"enabled", False)
697
 
        r = Client.enable(self)
698
 
        if oldstate != self.enabled:
699
 
            # Emit D-Bus signals
700
 
            self.PropertyChanged(dbus.String(u"enabled"),
701
 
                                 dbus.Boolean(True, variant_level=1))
702
 
            self.PropertyChanged(
703
 
                dbus.String(u"last_enabled"),
704
 
                self._datetime_to_dbus(self.last_enabled,
705
 
                                       variant_level=1))
706
 
        return r
707
 
    
708
 
    def disable(self, signal = True):
709
 
        oldstate = getattr(self, u"enabled", False)
710
 
        r = Client.disable(self)
711
 
        if signal and oldstate != self.enabled:
712
 
            # Emit D-Bus signal
713
 
            self.PropertyChanged(dbus.String(u"enabled"),
714
 
                                 dbus.Boolean(False, variant_level=1))
715
 
        return r
 
1223
    def notifychangeproperty(transform_func,
 
1224
                             dbus_name, type_func=lambda x: x,
 
1225
                             variant_level=1):
 
1226
        """ Modify a variable so that it's a property which announces
 
1227
        its changes to DBus.
 
1228
        
 
1229
        transform_fun: Function that takes a value and a variant_level
 
1230
                       and transforms it to a D-Bus type.
 
1231
        dbus_name: D-Bus name of the variable
 
1232
        type_func: Function that transform the value before sending it
 
1233
                   to the D-Bus.  Default: no transform
 
1234
        variant_level: D-Bus variant level.  Default: 1
 
1235
        """
 
1236
        attrname = "_{0}".format(dbus_name)
 
1237
        def setter(self, value):
 
1238
            if hasattr(self, "dbus_object_path"):
 
1239
                if (not hasattr(self, attrname) or
 
1240
                    type_func(getattr(self, attrname, None))
 
1241
                    != type_func(value)):
 
1242
                    dbus_value = transform_func(type_func(value),
 
1243
                                                variant_level
 
1244
                                                =variant_level)
 
1245
                    self.PropertyChanged(dbus.String(dbus_name),
 
1246
                                         dbus_value)
 
1247
            setattr(self, attrname, value)
 
1248
        
 
1249
        return property(lambda self: getattr(self, attrname), setter)
 
1250
    
 
1251
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1252
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1253
                                             "ApprovalPending",
 
1254
                                             type_func = bool)
 
1255
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1256
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1257
                                        "LastEnabled")
 
1258
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1259
                                   type_func = lambda checker:
 
1260
                                       checker is not None)
 
1261
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1262
                                           "LastCheckedOK")
 
1263
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1264
                                               "LastCheckerStatus")
 
1265
    last_approval_request = notifychangeproperty(
 
1266
        datetime_to_dbus, "LastApprovalRequest")
 
1267
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1268
                                               "ApprovedByDefault")
 
1269
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1270
                                          "ApprovalDelay",
 
1271
                                          type_func =
 
1272
                                          timedelta_to_milliseconds)
 
1273
    approval_duration = notifychangeproperty(
 
1274
        dbus.UInt64, "ApprovalDuration",
 
1275
        type_func = timedelta_to_milliseconds)
 
1276
    host = notifychangeproperty(dbus.String, "Host")
 
1277
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1278
                                   type_func =
 
1279
                                   timedelta_to_milliseconds)
 
1280
    extended_timeout = notifychangeproperty(
 
1281
        dbus.UInt64, "ExtendedTimeout",
 
1282
        type_func = timedelta_to_milliseconds)
 
1283
    interval = notifychangeproperty(dbus.UInt64,
 
1284
                                    "Interval",
 
1285
                                    type_func =
 
1286
                                    timedelta_to_milliseconds)
 
1287
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1288
    
 
1289
    del notifychangeproperty
716
1290
    
717
1291
    def __del__(self, *args, **kwargs):
718
1292
        try:
719
1293
            self.remove_from_connection()
720
1294
        except LookupError:
721
1295
            pass
722
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
1296
        if hasattr(DBusObjectWithProperties, "__del__"):
723
1297
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
724
1298
        Client.__del__(self, *args, **kwargs)
725
1299
    
727
1301
                         *args, **kwargs):
728
1302
        self.checker_callback_tag = None
729
1303
        self.checker = None
730
 
        # Emit D-Bus signal
731
 
        self.PropertyChanged(dbus.String(u"checker_running"),
732
 
                             dbus.Boolean(False, variant_level=1))
733
1304
        if os.WIFEXITED(condition):
734
1305
            exitstatus = os.WEXITSTATUS(condition)
735
1306
            # Emit D-Bus signal
745
1316
        return Client.checker_callback(self, pid, condition, command,
746
1317
                                       *args, **kwargs)
747
1318
    
748
 
    def checked_ok(self, *args, **kwargs):
749
 
        r = Client.checked_ok(self, *args, **kwargs)
750
 
        # Emit D-Bus signal
751
 
        self.PropertyChanged(
752
 
            dbus.String(u"last_checked_ok"),
753
 
            (self._datetime_to_dbus(self.last_checked_ok,
754
 
                                    variant_level=1)))
755
 
        return r
756
 
    
757
1319
    def start_checker(self, *args, **kwargs):
758
1320
        old_checker = self.checker
759
1321
        if self.checker is not None:
766
1328
            and old_checker_pid != self.checker.pid):
767
1329
            # Emit D-Bus signal
768
1330
            self.CheckerStarted(self.current_checker_command)
769
 
            self.PropertyChanged(
770
 
                dbus.String(u"checker_running"),
771
 
                dbus.Boolean(True, variant_level=1))
772
 
        return r
773
 
    
774
 
    def stop_checker(self, *args, **kwargs):
775
 
        old_checker = getattr(self, u"checker", None)
776
 
        r = Client.stop_checker(self, *args, **kwargs)
777
 
        if (old_checker is not None
778
 
            and getattr(self, u"checker", None) is None):
779
 
            self.PropertyChanged(dbus.String(u"checker_running"),
780
 
                                 dbus.Boolean(False, variant_level=1))
781
 
        return r
782
 
    
783
 
    ## D-Bus methods & signals
784
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
785
 
    
786
 
    # CheckedOK - method
787
 
    @dbus.service.method(_interface)
788
 
    def CheckedOK(self):
789
 
        return self.checked_ok()
 
1331
        return r
 
1332
    
 
1333
    def _reset_approved(self):
 
1334
        self.approved = None
 
1335
        return False
 
1336
    
 
1337
    def approve(self, value=True):
 
1338
        self.send_changedstate()
 
1339
        self.approved = value
 
1340
        gobject.timeout_add(timedelta_to_milliseconds
 
1341
                            (self.approval_duration),
 
1342
                            self._reset_approved)
 
1343
    
 
1344
    ## D-Bus methods, signals & properties
 
1345
    _interface = "se.recompile.Mandos.Client"
 
1346
    
 
1347
    ## Interfaces
 
1348
    
 
1349
    @dbus_interface_annotations(_interface)
 
1350
    def _foo(self):
 
1351
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1352
                     "false"}
 
1353
    
 
1354
    ## Signals
790
1355
    
791
1356
    # CheckerCompleted - signal
792
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
1357
    @dbus.service.signal(_interface, signature="nxs")
793
1358
    def CheckerCompleted(self, exitcode, waitstatus, command):
794
1359
        "D-Bus signal"
795
1360
        pass
796
1361
    
797
1362
    # CheckerStarted - signal
798
 
    @dbus.service.signal(_interface, signature=u"s")
 
1363
    @dbus.service.signal(_interface, signature="s")
799
1364
    def CheckerStarted(self, command):
800
1365
        "D-Bus signal"
801
1366
        pass
802
1367
    
803
1368
    # PropertyChanged - signal
804
 
    @dbus.service.signal(_interface, signature=u"sv")
 
1369
    @dbus.service.signal(_interface, signature="sv")
805
1370
    def PropertyChanged(self, property, value):
806
1371
        "D-Bus signal"
807
1372
        pass
809
1374
    # GotSecret - signal
810
1375
    @dbus.service.signal(_interface)
811
1376
    def GotSecret(self):
812
 
        "D-Bus signal"
 
1377
        """D-Bus signal
 
1378
        Is sent after a successful transfer of secret from the Mandos
 
1379
        server to mandos-client
 
1380
        """
813
1381
        pass
814
1382
    
815
1383
    # Rejected - signal
816
 
    @dbus.service.signal(_interface)
817
 
    def Rejected(self):
 
1384
    @dbus.service.signal(_interface, signature="s")
 
1385
    def Rejected(self, reason):
818
1386
        "D-Bus signal"
819
1387
        pass
820
1388
    
 
1389
    # NeedApproval - signal
 
1390
    @dbus.service.signal(_interface, signature="tb")
 
1391
    def NeedApproval(self, timeout, default):
 
1392
        "D-Bus signal"
 
1393
        return self.need_approval()
 
1394
    
 
1395
    ## Methods
 
1396
    
 
1397
    # Approve - method
 
1398
    @dbus.service.method(_interface, in_signature="b")
 
1399
    def Approve(self, value):
 
1400
        self.approve(value)
 
1401
    
 
1402
    # CheckedOK - method
 
1403
    @dbus.service.method(_interface)
 
1404
    def CheckedOK(self):
 
1405
        self.checked_ok()
 
1406
    
821
1407
    # Enable - method
822
1408
    @dbus.service.method(_interface)
823
1409
    def Enable(self):
841
1427
    def StopChecker(self):
842
1428
        self.stop_checker()
843
1429
    
844
 
    # name - property
845
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
846
 
    def name_dbus_property(self):
 
1430
    ## Properties
 
1431
    
 
1432
    # ApprovalPending - property
 
1433
    @dbus_service_property(_interface, signature="b", access="read")
 
1434
    def ApprovalPending_dbus_property(self):
 
1435
        return dbus.Boolean(bool(self.approvals_pending))
 
1436
    
 
1437
    # ApprovedByDefault - property
 
1438
    @dbus_service_property(_interface, signature="b",
 
1439
                           access="readwrite")
 
1440
    def ApprovedByDefault_dbus_property(self, value=None):
 
1441
        if value is None:       # get
 
1442
            return dbus.Boolean(self.approved_by_default)
 
1443
        self.approved_by_default = bool(value)
 
1444
    
 
1445
    # ApprovalDelay - property
 
1446
    @dbus_service_property(_interface, signature="t",
 
1447
                           access="readwrite")
 
1448
    def ApprovalDelay_dbus_property(self, value=None):
 
1449
        if value is None:       # get
 
1450
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1451
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
1452
    
 
1453
    # ApprovalDuration - property
 
1454
    @dbus_service_property(_interface, signature="t",
 
1455
                           access="readwrite")
 
1456
    def ApprovalDuration_dbus_property(self, value=None):
 
1457
        if value is None:       # get
 
1458
            return dbus.UInt64(timedelta_to_milliseconds(
 
1459
                    self.approval_duration))
 
1460
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
1461
    
 
1462
    # Name - property
 
1463
    @dbus_service_property(_interface, signature="s", access="read")
 
1464
    def Name_dbus_property(self):
847
1465
        return dbus.String(self.name)
848
1466
    
849
 
    # fingerprint - property
850
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
851
 
    def fingerprint_dbus_property(self):
 
1467
    # Fingerprint - property
 
1468
    @dbus_service_property(_interface, signature="s", access="read")
 
1469
    def Fingerprint_dbus_property(self):
852
1470
        return dbus.String(self.fingerprint)
853
1471
    
854
 
    # host - property
855
 
    @dbus_service_property(_interface, signature=u"s",
856
 
                           access=u"readwrite")
857
 
    def host_dbus_property(self, value=None):
 
1472
    # Host - property
 
1473
    @dbus_service_property(_interface, signature="s",
 
1474
                           access="readwrite")
 
1475
    def Host_dbus_property(self, value=None):
858
1476
        if value is None:       # get
859
1477
            return dbus.String(self.host)
860
 
        self.host = value
861
 
        # Emit D-Bus signal
862
 
        self.PropertyChanged(dbus.String(u"host"),
863
 
                             dbus.String(value, variant_level=1))
864
 
    
865
 
    # created - property
866
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
867
 
    def created_dbus_property(self):
868
 
        return dbus.String(self._datetime_to_dbus(self.created))
869
 
    
870
 
    # last_enabled - property
871
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
872
 
    def last_enabled_dbus_property(self):
873
 
        if self.last_enabled is None:
874
 
            return dbus.String(u"")
875
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
 
    
877
 
    # enabled - property
878
 
    @dbus_service_property(_interface, signature=u"b",
879
 
                           access=u"readwrite")
880
 
    def enabled_dbus_property(self, value=None):
 
1478
        self.host = unicode(value)
 
1479
    
 
1480
    # Created - property
 
1481
    @dbus_service_property(_interface, signature="s", access="read")
 
1482
    def Created_dbus_property(self):
 
1483
        return datetime_to_dbus(self.created)
 
1484
    
 
1485
    # LastEnabled - property
 
1486
    @dbus_service_property(_interface, signature="s", access="read")
 
1487
    def LastEnabled_dbus_property(self):
 
1488
        return datetime_to_dbus(self.last_enabled)
 
1489
    
 
1490
    # Enabled - property
 
1491
    @dbus_service_property(_interface, signature="b",
 
1492
                           access="readwrite")
 
1493
    def Enabled_dbus_property(self, value=None):
881
1494
        if value is None:       # get
882
1495
            return dbus.Boolean(self.enabled)
883
1496
        if value:
885
1498
        else:
886
1499
            self.disable()
887
1500
    
888
 
    # last_checked_ok - property
889
 
    @dbus_service_property(_interface, signature=u"s",
890
 
                           access=u"readwrite")
891
 
    def last_checked_ok_dbus_property(self, value=None):
 
1501
    # LastCheckedOK - property
 
1502
    @dbus_service_property(_interface, signature="s",
 
1503
                           access="readwrite")
 
1504
    def LastCheckedOK_dbus_property(self, value=None):
892
1505
        if value is not None:
893
1506
            self.checked_ok()
894
1507
            return
895
 
        if self.last_checked_ok is None:
896
 
            return dbus.String(u"")
897
 
        return dbus.String(self._datetime_to_dbus(self
898
 
                                                  .last_checked_ok))
899
 
    
900
 
    # timeout - property
901
 
    @dbus_service_property(_interface, signature=u"t",
902
 
                           access=u"readwrite")
903
 
    def timeout_dbus_property(self, value=None):
 
1508
        return datetime_to_dbus(self.last_checked_ok)
 
1509
    
 
1510
    # LastCheckerStatus - property
 
1511
    @dbus_service_property(_interface, signature="n",
 
1512
                           access="read")
 
1513
    def LastCheckerStatus_dbus_property(self):
 
1514
        return dbus.Int16(self.last_checker_status)
 
1515
    
 
1516
    # Expires - property
 
1517
    @dbus_service_property(_interface, signature="s", access="read")
 
1518
    def Expires_dbus_property(self):
 
1519
        return datetime_to_dbus(self.expires)
 
1520
    
 
1521
    # LastApprovalRequest - property
 
1522
    @dbus_service_property(_interface, signature="s", access="read")
 
1523
    def LastApprovalRequest_dbus_property(self):
 
1524
        return datetime_to_dbus(self.last_approval_request)
 
1525
    
 
1526
    # Timeout - property
 
1527
    @dbus_service_property(_interface, signature="t",
 
1528
                           access="readwrite")
 
1529
    def Timeout_dbus_property(self, value=None):
904
1530
        if value is None:       # get
905
1531
            return dbus.UInt64(self.timeout_milliseconds())
906
1532
        self.timeout = datetime.timedelta(0, 0, 0, value)
907
 
        # Emit D-Bus signal
908
 
        self.PropertyChanged(dbus.String(u"timeout"),
909
 
                             dbus.UInt64(value, variant_level=1))
910
 
        if getattr(self, u"disable_initiator_tag", None) is None:
911
 
            return
912
1533
        # Reschedule timeout
913
 
        gobject.source_remove(self.disable_initiator_tag)
914
 
        self.disable_initiator_tag = None
915
 
        time_to_die = (self.
916
 
                       _timedelta_to_milliseconds((self
917
 
                                                   .last_checked_ok
918
 
                                                   + self.timeout)
919
 
                                                  - datetime.datetime
920
 
                                                  .utcnow()))
921
 
        if time_to_die <= 0:
922
 
            # The timeout has passed
923
 
            self.disable()
924
 
        else:
925
 
            self.disable_initiator_tag = (gobject.timeout_add
926
 
                                          (time_to_die, self.disable))
927
 
    
928
 
    # interval - property
929
 
    @dbus_service_property(_interface, signature=u"t",
930
 
                           access=u"readwrite")
931
 
    def interval_dbus_property(self, value=None):
 
1534
        if self.enabled:
 
1535
            now = datetime.datetime.utcnow()
 
1536
            time_to_die = timedelta_to_milliseconds(
 
1537
                (self.last_checked_ok + self.timeout) - now)
 
1538
            if time_to_die <= 0:
 
1539
                # The timeout has passed
 
1540
                self.disable()
 
1541
            else:
 
1542
                self.expires = (now +
 
1543
                                datetime.timedelta(milliseconds =
 
1544
                                                   time_to_die))
 
1545
                if (getattr(self, "disable_initiator_tag", None)
 
1546
                    is None):
 
1547
                    return
 
1548
                gobject.source_remove(self.disable_initiator_tag)
 
1549
                self.disable_initiator_tag = (gobject.timeout_add
 
1550
                                              (time_to_die,
 
1551
                                               self.disable))
 
1552
    
 
1553
    # ExtendedTimeout - property
 
1554
    @dbus_service_property(_interface, signature="t",
 
1555
                           access="readwrite")
 
1556
    def ExtendedTimeout_dbus_property(self, value=None):
 
1557
        if value is None:       # get
 
1558
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1559
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1560
    
 
1561
    # Interval - property
 
1562
    @dbus_service_property(_interface, signature="t",
 
1563
                           access="readwrite")
 
1564
    def Interval_dbus_property(self, value=None):
932
1565
        if value is None:       # get
933
1566
            return dbus.UInt64(self.interval_milliseconds())
934
1567
        self.interval = datetime.timedelta(0, 0, 0, value)
935
 
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"interval"),
937
 
                             dbus.UInt64(value, variant_level=1))
938
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1568
        if getattr(self, "checker_initiator_tag", None) is None:
939
1569
            return
940
 
        # Reschedule checker run
941
 
        gobject.source_remove(self.checker_initiator_tag)
942
 
        self.checker_initiator_tag = (gobject.timeout_add
943
 
                                      (value, self.start_checker))
944
 
        self.start_checker()    # Start one now, too
945
 
 
946
 
    # checker - property
947
 
    @dbus_service_property(_interface, signature=u"s",
948
 
                           access=u"readwrite")
949
 
    def checker_dbus_property(self, value=None):
 
1570
        if self.enabled:
 
1571
            # Reschedule checker run
 
1572
            gobject.source_remove(self.checker_initiator_tag)
 
1573
            self.checker_initiator_tag = (gobject.timeout_add
 
1574
                                          (value, self.start_checker))
 
1575
            self.start_checker()    # Start one now, too
 
1576
    
 
1577
    # Checker - property
 
1578
    @dbus_service_property(_interface, signature="s",
 
1579
                           access="readwrite")
 
1580
    def Checker_dbus_property(self, value=None):
950
1581
        if value is None:       # get
951
1582
            return dbus.String(self.checker_command)
952
 
        self.checker_command = value
953
 
        # Emit D-Bus signal
954
 
        self.PropertyChanged(dbus.String(u"checker"),
955
 
                             dbus.String(self.checker_command,
956
 
                                         variant_level=1))
 
1583
        self.checker_command = unicode(value)
957
1584
    
958
 
    # checker_running - property
959
 
    @dbus_service_property(_interface, signature=u"b",
960
 
                           access=u"readwrite")
961
 
    def checker_running_dbus_property(self, value=None):
 
1585
    # CheckerRunning - property
 
1586
    @dbus_service_property(_interface, signature="b",
 
1587
                           access="readwrite")
 
1588
    def CheckerRunning_dbus_property(self, value=None):
962
1589
        if value is None:       # get
963
1590
            return dbus.Boolean(self.checker is not None)
964
1591
        if value:
966
1593
        else:
967
1594
            self.stop_checker()
968
1595
    
969
 
    # object_path - property
970
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
971
 
    def object_path_dbus_property(self):
 
1596
    # ObjectPath - property
 
1597
    @dbus_service_property(_interface, signature="o", access="read")
 
1598
    def ObjectPath_dbus_property(self):
972
1599
        return self.dbus_object_path # is already a dbus.ObjectPath
973
1600
    
974
 
    # secret = property
975
 
    @dbus_service_property(_interface, signature=u"ay",
976
 
                           access=u"write", byte_arrays=True)
977
 
    def secret_dbus_property(self, value):
 
1601
    # Secret = property
 
1602
    @dbus_service_property(_interface, signature="ay",
 
1603
                           access="write", byte_arrays=True)
 
1604
    def Secret_dbus_property(self, value):
978
1605
        self.secret = str(value)
979
1606
    
980
1607
    del _interface
981
1608
 
982
1609
 
 
1610
class ProxyClient(object):
 
1611
    def __init__(self, child_pipe, fpr, address):
 
1612
        self._pipe = child_pipe
 
1613
        self._pipe.send(('init', fpr, address))
 
1614
        if not self._pipe.recv():
 
1615
            raise KeyError()
 
1616
    
 
1617
    def __getattribute__(self, name):
 
1618
        if name == '_pipe':
 
1619
            return super(ProxyClient, self).__getattribute__(name)
 
1620
        self._pipe.send(('getattr', name))
 
1621
        data = self._pipe.recv()
 
1622
        if data[0] == 'data':
 
1623
            return data[1]
 
1624
        if data[0] == 'function':
 
1625
            def func(*args, **kwargs):
 
1626
                self._pipe.send(('funcall', name, args, kwargs))
 
1627
                return self._pipe.recv()[1]
 
1628
            return func
 
1629
    
 
1630
    def __setattr__(self, name, value):
 
1631
        if name == '_pipe':
 
1632
            return super(ProxyClient, self).__setattr__(name, value)
 
1633
        self._pipe.send(('setattr', name, value))
 
1634
 
 
1635
 
983
1636
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1637
    """A class to handle client connections.
985
1638
    
987
1640
    Note: This will run in its own forked process."""
988
1641
    
989
1642
    def handle(self):
990
 
        logger.info(u"TCP connection from: %s",
991
 
                    unicode(self.client_address))
992
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
993
 
        # Open IPC pipe to parent process
994
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
 
1643
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1644
            logger.info("TCP connection from: %s",
 
1645
                        unicode(self.client_address))
 
1646
            logger.debug("Pipe FD: %d",
 
1647
                         self.server.child_pipe.fileno())
 
1648
            
995
1649
            session = (gnutls.connection
996
1650
                       .ClientSession(self.request,
997
1651
                                      gnutls.connection
998
1652
                                      .X509Credentials()))
999
1653
            
1000
 
            line = self.request.makefile().readline()
1001
 
            logger.debug(u"Protocol version: %r", line)
1002
 
            try:
1003
 
                if int(line.strip().split()[0]) > 1:
1004
 
                    raise RuntimeError
1005
 
            except (ValueError, IndexError, RuntimeError), error:
1006
 
                logger.error(u"Unknown protocol version: %s", error)
1007
 
                return
1008
 
            
1009
1654
            # Note: gnutls.connection.X509Credentials is really a
1010
1655
            # generic GnuTLS certificate credentials object so long as
1011
1656
            # no X.509 keys are added to it.  Therefore, we can use it
1012
1657
            # here despite using OpenPGP certificates.
1013
1658
            
1014
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1015
 
            #                      u"+AES-256-CBC", u"+SHA1",
1016
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1017
 
            #                      u"+DHE-DSS"))
 
1659
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1660
            #                      "+AES-256-CBC", "+SHA1",
 
1661
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1662
            #                      "+DHE-DSS"))
1018
1663
            # Use a fallback default, since this MUST be set.
1019
1664
            priority = self.server.gnutls_priority
1020
1665
            if priority is None:
1021
 
                priority = u"NORMAL"
 
1666
                priority = "NORMAL"
1022
1667
            (gnutls.library.functions
1023
1668
             .gnutls_priority_set_direct(session._c_object,
1024
1669
                                         priority, None))
1025
1670
            
 
1671
            # Start communication using the Mandos protocol
 
1672
            # Get protocol number
 
1673
            line = self.request.makefile().readline()
 
1674
            logger.debug("Protocol version: %r", line)
 
1675
            try:
 
1676
                if int(line.strip().split()[0]) > 1:
 
1677
                    raise RuntimeError
 
1678
            except (ValueError, IndexError, RuntimeError) as error:
 
1679
                logger.error("Unknown protocol version: %s", error)
 
1680
                return
 
1681
            
 
1682
            # Start GnuTLS connection
1026
1683
            try:
1027
1684
                session.handshake()
1028
 
            except gnutls.errors.GNUTLSError, error:
1029
 
                logger.warning(u"Handshake failed: %s", error)
 
1685
            except gnutls.errors.GNUTLSError as error:
 
1686
                logger.warning("Handshake failed: %s", error)
1030
1687
                # Do not run session.bye() here: the session is not
1031
1688
                # established.  Just abandon the request.
1032
1689
                return
1033
 
            logger.debug(u"Handshake succeeded")
 
1690
            logger.debug("Handshake succeeded")
 
1691
            
 
1692
            approval_required = False
1034
1693
            try:
1035
 
                fpr = self.fingerprint(self.peer_certificate(session))
1036
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
1037
 
                logger.warning(u"Bad certificate: %s", error)
1038
 
                session.bye()
1039
 
                return
1040
 
            logger.debug(u"Fingerprint: %s", fpr)
 
1694
                try:
 
1695
                    fpr = self.fingerprint(self.peer_certificate
 
1696
                                           (session))
 
1697
                except (TypeError,
 
1698
                        gnutls.errors.GNUTLSError) as error:
 
1699
                    logger.warning("Bad certificate: %s", error)
 
1700
                    return
 
1701
                logger.debug("Fingerprint: %s", fpr)
 
1702
                
 
1703
                try:
 
1704
                    client = ProxyClient(child_pipe, fpr,
 
1705
                                         self.client_address)
 
1706
                except KeyError:
 
1707
                    return
 
1708
                
 
1709
                if client.approval_delay:
 
1710
                    delay = client.approval_delay
 
1711
                    client.approvals_pending += 1
 
1712
                    approval_required = True
 
1713
                
 
1714
                while True:
 
1715
                    if not client.enabled:
 
1716
                        logger.info("Client %s is disabled",
 
1717
                                       client.name)
 
1718
                        if self.server.use_dbus:
 
1719
                            # Emit D-Bus signal
 
1720
                            client.Rejected("Disabled")
 
1721
                        return
 
1722
                    
 
1723
                    if client.approved or not client.approval_delay:
 
1724
                        #We are approved or approval is disabled
 
1725
                        break
 
1726
                    elif client.approved is None:
 
1727
                        logger.info("Client %s needs approval",
 
1728
                                    client.name)
 
1729
                        if self.server.use_dbus:
 
1730
                            # Emit D-Bus signal
 
1731
                            client.NeedApproval(
 
1732
                                client.approval_delay_milliseconds(),
 
1733
                                client.approved_by_default)
 
1734
                    else:
 
1735
                        logger.warning("Client %s was not approved",
 
1736
                                       client.name)
 
1737
                        if self.server.use_dbus:
 
1738
                            # Emit D-Bus signal
 
1739
                            client.Rejected("Denied")
 
1740
                        return
 
1741
                    
 
1742
                    #wait until timeout or approved
 
1743
                    time = datetime.datetime.now()
 
1744
                    client.changedstate.acquire()
 
1745
                    (client.changedstate.wait
 
1746
                     (float(client.timedelta_to_milliseconds(delay)
 
1747
                            / 1000)))
 
1748
                    client.changedstate.release()
 
1749
                    time2 = datetime.datetime.now()
 
1750
                    if (time2 - time) >= delay:
 
1751
                        if not client.approved_by_default:
 
1752
                            logger.warning("Client %s timed out while"
 
1753
                                           " waiting for approval",
 
1754
                                           client.name)
 
1755
                            if self.server.use_dbus:
 
1756
                                # Emit D-Bus signal
 
1757
                                client.Rejected("Approval timed out")
 
1758
                            return
 
1759
                        else:
 
1760
                            break
 
1761
                    else:
 
1762
                        delay -= time2 - time
 
1763
                
 
1764
                sent_size = 0
 
1765
                while sent_size < len(client.secret):
 
1766
                    try:
 
1767
                        sent = session.send(client.secret[sent_size:])
 
1768
                    except gnutls.errors.GNUTLSError as error:
 
1769
                        logger.warning("gnutls send failed",
 
1770
                                       exc_info=error)
 
1771
                        return
 
1772
                    logger.debug("Sent: %d, remaining: %d",
 
1773
                                 sent, len(client.secret)
 
1774
                                 - (sent_size + sent))
 
1775
                    sent_size += sent
 
1776
                
 
1777
                logger.info("Sending secret to %s", client.name)
 
1778
                # bump the timeout using extended_timeout
 
1779
                client.bump_timeout(client.extended_timeout)
 
1780
                if self.server.use_dbus:
 
1781
                    # Emit D-Bus signal
 
1782
                    client.GotSecret()
1041
1783
            
1042
 
            for c in self.server.clients:
1043
 
                if c.fingerprint == fpr:
1044
 
                    client = c
1045
 
                    break
1046
 
            else:
1047
 
                ipc.write(u"NOTFOUND %s %s\n"
1048
 
                          % (fpr, unicode(self.client_address)))
1049
 
                session.bye()
1050
 
                return
1051
 
            # Have to check if client.still_valid(), since it is
1052
 
            # possible that the client timed out while establishing
1053
 
            # the GnuTLS session.
1054
 
            if not client.still_valid():
1055
 
                ipc.write(u"INVALID %s\n" % client.name)
1056
 
                session.bye()
1057
 
                return
1058
 
            ipc.write(u"SENDING %s\n" % client.name)
1059
 
            sent_size = 0
1060
 
            while sent_size < len(client.secret):
1061
 
                sent = session.send(client.secret[sent_size:])
1062
 
                logger.debug(u"Sent: %d, remaining: %d",
1063
 
                             sent, len(client.secret)
1064
 
                             - (sent_size + sent))
1065
 
                sent_size += sent
1066
 
            session.bye()
 
1784
            finally:
 
1785
                if approval_required:
 
1786
                    client.approvals_pending -= 1
 
1787
                try:
 
1788
                    session.bye()
 
1789
                except gnutls.errors.GNUTLSError as error:
 
1790
                    logger.warning("GnuTLS bye failed",
 
1791
                                   exc_info=error)
1067
1792
    
1068
1793
    @staticmethod
1069
1794
    def peer_certificate(session):
1079
1804
                     .gnutls_certificate_get_peers
1080
1805
                     (session._c_object, ctypes.byref(list_size)))
1081
1806
        if not bool(cert_list) and list_size.value != 0:
1082
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1083
 
                                            u" certificate")
 
1807
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1808
                                            " certificate")
1084
1809
        if list_size.value == 0:
1085
1810
            return None
1086
1811
        cert = cert_list[0]
1112
1837
        if crtverify.value != 0:
1113
1838
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1114
1839
            raise (gnutls.errors.CertificateSecurityError
1115
 
                   (u"Verify failed"))
 
1840
                   ("Verify failed"))
1116
1841
        # New buffer for the fingerprint
1117
1842
        buf = ctypes.create_string_buffer(20)
1118
1843
        buf_len = ctypes.c_size_t()
1125
1850
        # Convert the buffer to a Python bytestring
1126
1851
        fpr = ctypes.string_at(buf, buf_len.value)
1127
1852
        # Convert the bytestring to hexadecimal notation
1128
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1853
        hex_fpr = binascii.hexlify(fpr).upper()
1129
1854
        return hex_fpr
1130
1855
 
1131
1856
 
1132
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1133
 
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
 
1857
class MultiprocessingMixIn(object):
 
1858
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1859
    def sub_process_main(self, request, address):
 
1860
        try:
 
1861
            self.finish_request(request, address)
 
1862
        except Exception:
 
1863
            self.handle_error(request, address)
 
1864
        self.close_request(request)
 
1865
    
 
1866
    def process_request(self, request, address):
 
1867
        """Start a new process to process the request."""
 
1868
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1869
                                       args = (request, address))
 
1870
        proc.start()
 
1871
        return proc
 
1872
 
 
1873
 
 
1874
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1875
    """ adds a pipe to the MixIn """
1134
1876
    def process_request(self, request, client_address):
1135
1877
        """Overrides and wraps the original process_request().
1136
1878
        
1137
1879
        This function creates a new pipe in self.pipe
1138
1880
        """
1139
 
        self.pipe = os.pipe()
1140
 
        super(ForkingMixInWithPipe,
1141
 
              self).process_request(request, client_address)
1142
 
        os.close(self.pipe[1])  # close write end
1143
 
        self.add_pipe(self.pipe[0])
1144
 
    def add_pipe(self, pipe):
 
1881
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1882
        
 
1883
        proc = MultiprocessingMixIn.process_request(self, request,
 
1884
                                                    client_address)
 
1885
        self.child_pipe.close()
 
1886
        self.add_pipe(parent_pipe, proc)
 
1887
    
 
1888
    def add_pipe(self, parent_pipe, proc):
1145
1889
        """Dummy function; override as necessary"""
1146
 
        os.close(pipe)
1147
 
 
1148
 
 
1149
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
1890
        raise NotImplementedError
 
1891
 
 
1892
 
 
1893
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1150
1894
                     socketserver.TCPServer, object):
1151
1895
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1152
1896
    
1168
1912
        bind to an address or port if they were not specified."""
1169
1913
        if self.interface is not None:
1170
1914
            if SO_BINDTODEVICE is None:
1171
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1172
 
                             u" cannot bind to interface %s",
 
1915
                logger.error("SO_BINDTODEVICE does not exist;"
 
1916
                             " cannot bind to interface %s",
1173
1917
                             self.interface)
1174
1918
            else:
1175
1919
                try:
1176
1920
                    self.socket.setsockopt(socket.SOL_SOCKET,
1177
1921
                                           SO_BINDTODEVICE,
1178
1922
                                           str(self.interface
1179
 
                                               + u'\0'))
1180
 
                except socket.error, error:
 
1923
                                               + '\0'))
 
1924
                except socket.error as error:
1181
1925
                    if error[0] == errno.EPERM:
1182
 
                        logger.error(u"No permission to"
1183
 
                                     u" bind to interface %s",
 
1926
                        logger.error("No permission to"
 
1927
                                     " bind to interface %s",
1184
1928
                                     self.interface)
1185
1929
                    elif error[0] == errno.ENOPROTOOPT:
1186
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1187
 
                                     u" cannot bind to interface %s",
 
1930
                        logger.error("SO_BINDTODEVICE not available;"
 
1931
                                     " cannot bind to interface %s",
1188
1932
                                     self.interface)
1189
1933
                    else:
1190
1934
                        raise
1192
1936
        if self.server_address[0] or self.server_address[1]:
1193
1937
            if not self.server_address[0]:
1194
1938
                if self.address_family == socket.AF_INET6:
1195
 
                    any_address = u"::" # in6addr_any
 
1939
                    any_address = "::" # in6addr_any
1196
1940
                else:
1197
1941
                    any_address = socket.INADDR_ANY
1198
1942
                self.server_address = (any_address,
1225
1969
        self.enabled = False
1226
1970
        self.clients = clients
1227
1971
        if self.clients is None:
1228
 
            self.clients = set()
 
1972
            self.clients = {}
1229
1973
        self.use_dbus = use_dbus
1230
1974
        self.gnutls_priority = gnutls_priority
1231
1975
        IPv6_TCPServer.__init__(self, server_address,
1235
1979
    def server_activate(self):
1236
1980
        if self.enabled:
1237
1981
            return socketserver.TCPServer.server_activate(self)
 
1982
    
1238
1983
    def enable(self):
1239
1984
        self.enabled = True
1240
 
    def add_pipe(self, pipe):
 
1985
    
 
1986
    def add_pipe(self, parent_pipe, proc):
1241
1987
        # Call "handle_ipc" for both data and EOF events
1242
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1243
 
                             self.handle_ipc)
1244
 
    def handle_ipc(self, source, condition, file_objects={}):
1245
 
        condition_names = {
1246
 
            gobject.IO_IN: u"IN",   # There is data to read.
1247
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
1248
 
                                    # blocking).
1249
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1250
 
            gobject.IO_ERR: u"ERR", # Error condition.
1251
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1252
 
                                    # broken, usually for pipes and
1253
 
                                    # sockets).
1254
 
            }
1255
 
        conditions_string = ' | '.join(name
1256
 
                                       for cond, name in
1257
 
                                       condition_names.iteritems()
1258
 
                                       if cond & condition)
1259
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1260
 
                     conditions_string)
1261
 
        
1262
 
        # Turn the pipe file descriptor into a Python file object
1263
 
        if source not in file_objects:
1264
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1265
 
        
1266
 
        # Read a line from the file object
1267
 
        cmdline = file_objects[source].readline()
1268
 
        if not cmdline:             # Empty line means end of file
1269
 
            # close the IPC pipe
1270
 
            file_objects[source].close()
1271
 
            del file_objects[source]
1272
 
            
1273
 
            # Stop calling this function
1274
 
            return False
1275
 
        
1276
 
        logger.debug(u"IPC command: %r", cmdline)
1277
 
        
1278
 
        # Parse and act on command
1279
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1280
 
        
1281
 
        if cmd == u"NOTFOUND":
1282
 
            logger.warning(u"Client not found for fingerprint: %s",
1283
 
                           args)
1284
 
            if self.use_dbus:
1285
 
                # Emit D-Bus signal
1286
 
                mandos_dbus_service.ClientNotFound(args)
1287
 
        elif cmd == u"INVALID":
1288
 
            for client in self.clients:
1289
 
                if client.name == args:
1290
 
                    logger.warning(u"Client %s is invalid", args)
1291
 
                    if self.use_dbus:
1292
 
                        # Emit D-Bus signal
1293
 
                        client.Rejected()
1294
 
                    break
1295
 
            else:
1296
 
                logger.error(u"Unknown client %s is invalid", args)
1297
 
        elif cmd == u"SENDING":
1298
 
            for client in self.clients:
1299
 
                if client.name == args:
1300
 
                    logger.info(u"Sending secret to %s", client.name)
1301
 
                    client.checked_ok()
1302
 
                    if self.use_dbus:
1303
 
                        # Emit D-Bus signal
1304
 
                        client.GotSecret()
1305
 
                    break
1306
 
            else:
1307
 
                logger.error(u"Sending secret to unknown client %s",
1308
 
                             args)
1309
 
        else:
1310
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1311
 
        
1312
 
        # Keep calling this function
 
1988
        gobject.io_add_watch(parent_pipe.fileno(),
 
1989
                             gobject.IO_IN | gobject.IO_HUP,
 
1990
                             functools.partial(self.handle_ipc,
 
1991
                                               parent_pipe =
 
1992
                                               parent_pipe,
 
1993
                                               proc = proc))
 
1994
    
 
1995
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1996
                   proc = None, client_object=None):
 
1997
        # error, or the other end of multiprocessing.Pipe has closed
 
1998
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1999
            # Wait for other process to exit
 
2000
            proc.join()
 
2001
            return False
 
2002
        
 
2003
        # Read a request from the child
 
2004
        request = parent_pipe.recv()
 
2005
        command = request[0]
 
2006
        
 
2007
        if command == 'init':
 
2008
            fpr = request[1]
 
2009
            address = request[2]
 
2010
            
 
2011
            for c in self.clients.itervalues():
 
2012
                if c.fingerprint == fpr:
 
2013
                    client = c
 
2014
                    break
 
2015
            else:
 
2016
                logger.info("Client not found for fingerprint: %s, ad"
 
2017
                            "dress: %s", fpr, address)
 
2018
                if self.use_dbus:
 
2019
                    # Emit D-Bus signal
 
2020
                    mandos_dbus_service.ClientNotFound(fpr,
 
2021
                                                       address[0])
 
2022
                parent_pipe.send(False)
 
2023
                return False
 
2024
            
 
2025
            gobject.io_add_watch(parent_pipe.fileno(),
 
2026
                                 gobject.IO_IN | gobject.IO_HUP,
 
2027
                                 functools.partial(self.handle_ipc,
 
2028
                                                   parent_pipe =
 
2029
                                                   parent_pipe,
 
2030
                                                   proc = proc,
 
2031
                                                   client_object =
 
2032
                                                   client))
 
2033
            parent_pipe.send(True)
 
2034
            # remove the old hook in favor of the new above hook on
 
2035
            # same fileno
 
2036
            return False
 
2037
        if command == 'funcall':
 
2038
            funcname = request[1]
 
2039
            args = request[2]
 
2040
            kwargs = request[3]
 
2041
            
 
2042
            parent_pipe.send(('data', getattr(client_object,
 
2043
                                              funcname)(*args,
 
2044
                                                         **kwargs)))
 
2045
        
 
2046
        if command == 'getattr':
 
2047
            attrname = request[1]
 
2048
            if callable(client_object.__getattribute__(attrname)):
 
2049
                parent_pipe.send(('function',))
 
2050
            else:
 
2051
                parent_pipe.send(('data', client_object
 
2052
                                  .__getattribute__(attrname)))
 
2053
        
 
2054
        if command == 'setattr':
 
2055
            attrname = request[1]
 
2056
            value = request[2]
 
2057
            setattr(client_object, attrname, value)
 
2058
        
1313
2059
        return True
1314
2060
 
1315
2061
 
1316
2062
def string_to_delta(interval):
1317
2063
    """Parse a string and return a datetime.timedelta
1318
2064
    
1319
 
    >>> string_to_delta(u'7d')
 
2065
    >>> string_to_delta('7d')
1320
2066
    datetime.timedelta(7)
1321
 
    >>> string_to_delta(u'60s')
 
2067
    >>> string_to_delta('60s')
1322
2068
    datetime.timedelta(0, 60)
1323
 
    >>> string_to_delta(u'60m')
 
2069
    >>> string_to_delta('60m')
1324
2070
    datetime.timedelta(0, 3600)
1325
 
    >>> string_to_delta(u'24h')
 
2071
    >>> string_to_delta('24h')
1326
2072
    datetime.timedelta(1)
1327
 
    >>> string_to_delta(u'1w')
 
2073
    >>> string_to_delta('1w')
1328
2074
    datetime.timedelta(7)
1329
 
    >>> string_to_delta(u'5m 30s')
 
2075
    >>> string_to_delta('5m 30s')
1330
2076
    datetime.timedelta(0, 330)
1331
2077
    """
1332
2078
    timevalue = datetime.timedelta(0)
1334
2080
        try:
1335
2081
            suffix = unicode(s[-1])
1336
2082
            value = int(s[:-1])
1337
 
            if suffix == u"d":
 
2083
            if suffix == "d":
1338
2084
                delta = datetime.timedelta(value)
1339
 
            elif suffix == u"s":
 
2085
            elif suffix == "s":
1340
2086
                delta = datetime.timedelta(0, value)
1341
 
            elif suffix == u"m":
 
2087
            elif suffix == "m":
1342
2088
                delta = datetime.timedelta(0, 0, 0, 0, value)
1343
 
            elif suffix == u"h":
 
2089
            elif suffix == "h":
1344
2090
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1345
 
            elif suffix == u"w":
 
2091
            elif suffix == "w":
1346
2092
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1347
2093
            else:
1348
 
                raise ValueError
1349
 
        except (ValueError, IndexError):
1350
 
            raise ValueError
 
2094
                raise ValueError("Unknown suffix {0!r}"
 
2095
                                 .format(suffix))
 
2096
        except (ValueError, IndexError) as e:
 
2097
            raise ValueError(*(e.args))
1351
2098
        timevalue += delta
1352
2099
    return timevalue
1353
2100
 
1354
2101
 
1355
 
def if_nametoindex(interface):
1356
 
    """Call the C function if_nametoindex(), or equivalent
1357
 
    
1358
 
    Note: This function cannot accept a unicode string."""
1359
 
    global if_nametoindex
1360
 
    try:
1361
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1362
 
                          (ctypes.util.find_library(u"c"))
1363
 
                          .if_nametoindex)
1364
 
    except (OSError, AttributeError):
1365
 
        logger.warning(u"Doing if_nametoindex the hard way")
1366
 
        def if_nametoindex(interface):
1367
 
            "Get an interface index the hard way, i.e. using fcntl()"
1368
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1369
 
            with closing(socket.socket()) as s:
1370
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1371
 
                                    struct.pack(str(u"16s16x"),
1372
 
                                                interface))
1373
 
            interface_index = struct.unpack(str(u"I"),
1374
 
                                            ifreq[16:20])[0]
1375
 
            return interface_index
1376
 
    return if_nametoindex(interface)
1377
 
 
1378
 
 
1379
2102
def daemon(nochdir = False, noclose = False):
1380
2103
    """See daemon(3).  Standard BSD Unix function.
1381
2104
    
1384
2107
        sys.exit()
1385
2108
    os.setsid()
1386
2109
    if not nochdir:
1387
 
        os.chdir(u"/")
 
2110
        os.chdir("/")
1388
2111
    if os.fork():
1389
2112
        sys.exit()
1390
2113
    if not noclose:
1391
2114
        # Close all standard open file descriptors
1392
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2115
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1393
2116
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1394
2117
            raise OSError(errno.ENODEV,
1395
 
                          u"%s not a character device"
1396
 
                          % os.path.devnull)
 
2118
                          "{0} not a character device"
 
2119
                          .format(os.devnull))
1397
2120
        os.dup2(null, sys.stdin.fileno())
1398
2121
        os.dup2(null, sys.stdout.fileno())
1399
2122
        os.dup2(null, sys.stderr.fileno())
1406
2129
    ##################################################################
1407
2130
    # Parsing of options, both command line and config file
1408
2131
    
1409
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1410
 
    parser.add_option("-i", u"--interface", type=u"string",
1411
 
                      metavar="IF", help=u"Bind to interface IF")
1412
 
    parser.add_option("-a", u"--address", type=u"string",
1413
 
                      help=u"Address to listen for requests on")
1414
 
    parser.add_option("-p", u"--port", type=u"int",
1415
 
                      help=u"Port number to receive requests on")
1416
 
    parser.add_option("--check", action=u"store_true",
1417
 
                      help=u"Run self-test")
1418
 
    parser.add_option("--debug", action=u"store_true",
1419
 
                      help=u"Debug mode; run in foreground and log to"
1420
 
                      u" terminal")
1421
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1422
 
                      u" priority string (see GnuTLS documentation)")
1423
 
    parser.add_option("--servicename", type=u"string",
1424
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1425
 
    parser.add_option("--configdir", type=u"string",
1426
 
                      default=u"/etc/mandos", metavar=u"DIR",
1427
 
                      help=u"Directory to search for configuration"
1428
 
                      u" files")
1429
 
    parser.add_option("--no-dbus", action=u"store_false",
1430
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1431
 
                      u" system bus interface")
1432
 
    parser.add_option("--no-ipv6", action=u"store_false",
1433
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1434
 
    options = parser.parse_args()[0]
 
2132
    parser = argparse.ArgumentParser()
 
2133
    parser.add_argument("-v", "--version", action="version",
 
2134
                        version = "%(prog)s {0}".format(version),
 
2135
                        help="show version number and exit")
 
2136
    parser.add_argument("-i", "--interface", metavar="IF",
 
2137
                        help="Bind to interface IF")
 
2138
    parser.add_argument("-a", "--address",
 
2139
                        help="Address to listen for requests on")
 
2140
    parser.add_argument("-p", "--port", type=int,
 
2141
                        help="Port number to receive requests on")
 
2142
    parser.add_argument("--check", action="store_true",
 
2143
                        help="Run self-test")
 
2144
    parser.add_argument("--debug", action="store_true",
 
2145
                        help="Debug mode; run in foreground and log"
 
2146
                        " to terminal")
 
2147
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
2148
                        help="Debug level for stdout output")
 
2149
    parser.add_argument("--priority", help="GnuTLS"
 
2150
                        " priority string (see GnuTLS documentation)")
 
2151
    parser.add_argument("--servicename",
 
2152
                        metavar="NAME", help="Zeroconf service name")
 
2153
    parser.add_argument("--configdir",
 
2154
                        default="/etc/mandos", metavar="DIR",
 
2155
                        help="Directory to search for configuration"
 
2156
                        " files")
 
2157
    parser.add_argument("--no-dbus", action="store_false",
 
2158
                        dest="use_dbus", help="Do not provide D-Bus"
 
2159
                        " system bus interface")
 
2160
    parser.add_argument("--no-ipv6", action="store_false",
 
2161
                        dest="use_ipv6", help="Do not use IPv6")
 
2162
    parser.add_argument("--no-restore", action="store_false",
 
2163
                        dest="restore", help="Do not restore stored"
 
2164
                        " state")
 
2165
    parser.add_argument("--statedir", metavar="DIR",
 
2166
                        help="Directory to save/restore state in")
 
2167
    
 
2168
    options = parser.parse_args()
1435
2169
    
1436
2170
    if options.check:
1437
2171
        import doctest
1439
2173
        sys.exit()
1440
2174
    
1441
2175
    # Default values for config file for server-global settings
1442
 
    server_defaults = { u"interface": u"",
1443
 
                        u"address": u"",
1444
 
                        u"port": u"",
1445
 
                        u"debug": u"False",
1446
 
                        u"priority":
1447
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1448
 
                        u"servicename": u"Mandos",
1449
 
                        u"use_dbus": u"True",
1450
 
                        u"use_ipv6": u"True",
 
2176
    server_defaults = { "interface": "",
 
2177
                        "address": "",
 
2178
                        "port": "",
 
2179
                        "debug": "False",
 
2180
                        "priority":
 
2181
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2182
                        "servicename": "Mandos",
 
2183
                        "use_dbus": "True",
 
2184
                        "use_ipv6": "True",
 
2185
                        "debuglevel": "",
 
2186
                        "restore": "True",
 
2187
                        "statedir": "/var/lib/mandos"
1451
2188
                        }
1452
2189
    
1453
2190
    # Parse config file for server-global settings
1454
2191
    server_config = configparser.SafeConfigParser(server_defaults)
1455
2192
    del server_defaults
1456
2193
    server_config.read(os.path.join(options.configdir,
1457
 
                                    u"mandos.conf"))
 
2194
                                    "mandos.conf"))
1458
2195
    # Convert the SafeConfigParser object to a dict
1459
2196
    server_settings = server_config.defaults()
1460
2197
    # Use the appropriate methods on the non-string config options
1461
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1462
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
2198
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2199
        server_settings[option] = server_config.getboolean("DEFAULT",
1463
2200
                                                           option)
1464
2201
    if server_settings["port"]:
1465
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1466
 
                                                       u"port")
 
2202
        server_settings["port"] = server_config.getint("DEFAULT",
 
2203
                                                       "port")
1467
2204
    del server_config
1468
2205
    
1469
2206
    # Override the settings from the config file with command line
1470
2207
    # options, if set.
1471
 
    for option in (u"interface", u"address", u"port", u"debug",
1472
 
                   u"priority", u"servicename", u"configdir",
1473
 
                   u"use_dbus", u"use_ipv6"):
 
2208
    for option in ("interface", "address", "port", "debug",
 
2209
                   "priority", "servicename", "configdir",
 
2210
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2211
                   "statedir"):
1474
2212
        value = getattr(options, option)
1475
2213
        if value is not None:
1476
2214
            server_settings[option] = value
1484
2222
    ##################################################################
1485
2223
    
1486
2224
    # For convenience
1487
 
    debug = server_settings[u"debug"]
1488
 
    use_dbus = server_settings[u"use_dbus"]
1489
 
    use_ipv6 = server_settings[u"use_ipv6"]
1490
 
    
1491
 
    if not debug:
1492
 
        syslogger.setLevel(logging.WARNING)
1493
 
        console.setLevel(logging.WARNING)
1494
 
    
1495
 
    if server_settings[u"servicename"] != u"Mandos":
 
2225
    debug = server_settings["debug"]
 
2226
    debuglevel = server_settings["debuglevel"]
 
2227
    use_dbus = server_settings["use_dbus"]
 
2228
    use_ipv6 = server_settings["use_ipv6"]
 
2229
    stored_state_path = os.path.join(server_settings["statedir"],
 
2230
                                     stored_state_file)
 
2231
    
 
2232
    if debug:
 
2233
        initlogger(debug, logging.DEBUG)
 
2234
    else:
 
2235
        if not debuglevel:
 
2236
            initlogger(debug)
 
2237
        else:
 
2238
            level = getattr(logging, debuglevel.upper())
 
2239
            initlogger(debug, level)
 
2240
    
 
2241
    if server_settings["servicename"] != "Mandos":
1496
2242
        syslogger.setFormatter(logging.Formatter
1497
 
                               (u'Mandos (%s) [%%(process)d]:'
1498
 
                                u' %%(levelname)s: %%(message)s'
1499
 
                                % server_settings[u"servicename"]))
 
2243
                               ('Mandos ({0}) [%(process)d]:'
 
2244
                                ' %(levelname)s: %(message)s'
 
2245
                                .format(server_settings
 
2246
                                        ["servicename"])))
1500
2247
    
1501
2248
    # Parse config file with clients
1502
 
    client_defaults = { u"timeout": u"1h",
1503
 
                        u"interval": u"5m",
1504
 
                        u"checker": u"fping -q -- %%(host)s",
1505
 
                        u"host": u"",
1506
 
                        }
1507
 
    client_config = configparser.SafeConfigParser(client_defaults)
1508
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1509
 
                                    u"clients.conf"))
 
2249
    client_config = configparser.SafeConfigParser(Client
 
2250
                                                  .client_defaults)
 
2251
    client_config.read(os.path.join(server_settings["configdir"],
 
2252
                                    "clients.conf"))
1510
2253
    
1511
2254
    global mandos_dbus_service
1512
2255
    mandos_dbus_service = None
1513
2256
    
1514
 
    tcp_server = MandosServer((server_settings[u"address"],
1515
 
                               server_settings[u"port"]),
 
2257
    tcp_server = MandosServer((server_settings["address"],
 
2258
                               server_settings["port"]),
1516
2259
                              ClientHandler,
1517
 
                              interface=server_settings[u"interface"],
 
2260
                              interface=(server_settings["interface"]
 
2261
                                         or None),
1518
2262
                              use_ipv6=use_ipv6,
1519
2263
                              gnutls_priority=
1520
 
                              server_settings[u"priority"],
 
2264
                              server_settings["priority"],
1521
2265
                              use_dbus=use_dbus)
1522
 
    pidfilename = u"/var/run/mandos.pid"
1523
 
    try:
1524
 
        pidfile = open(pidfilename, u"w")
1525
 
    except IOError:
1526
 
        logger.error(u"Could not open file %r", pidfilename)
 
2266
    if not debug:
 
2267
        pidfilename = "/var/run/mandos.pid"
 
2268
        try:
 
2269
            pidfile = open(pidfilename, "w")
 
2270
        except IOError as e:
 
2271
            logger.error("Could not open file %r", pidfilename,
 
2272
                         exc_info=e)
1527
2273
    
1528
 
    try:
1529
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1530
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
1531
 
    except KeyError:
 
2274
    for name in ("_mandos", "mandos", "nobody"):
1532
2275
        try:
1533
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1534
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
2276
            uid = pwd.getpwnam(name).pw_uid
 
2277
            gid = pwd.getpwnam(name).pw_gid
 
2278
            break
1535
2279
        except KeyError:
1536
 
            try:
1537
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1538
 
                gid = pwd.getpwnam(u"nobody").pw_gid
1539
 
            except KeyError:
1540
 
                uid = 65534
1541
 
                gid = 65534
 
2280
            continue
 
2281
    else:
 
2282
        uid = 65534
 
2283
        gid = 65534
1542
2284
    try:
1543
2285
        os.setgid(gid)
1544
2286
        os.setuid(uid)
1545
 
    except OSError, error:
 
2287
    except OSError as error:
1546
2288
        if error[0] != errno.EPERM:
1547
2289
            raise error
1548
2290
    
1549
 
    # Enable all possible GnuTLS debugging
1550
2291
    if debug:
 
2292
        # Enable all possible GnuTLS debugging
 
2293
        
1551
2294
        # "Use a log level over 10 to enable all debugging options."
1552
2295
        # - GnuTLS manual
1553
2296
        gnutls.library.functions.gnutls_global_set_log_level(11)
1554
2297
        
1555
2298
        @gnutls.library.types.gnutls_log_func
1556
2299
        def debug_gnutls(level, string):
1557
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
2300
            logger.debug("GnuTLS: %s", string[:-1])
1558
2301
        
1559
2302
        (gnutls.library.functions
1560
2303
         .gnutls_global_set_log_function(debug_gnutls))
 
2304
        
 
2305
        # Redirect stdin so all checkers get /dev/null
 
2306
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2307
        os.dup2(null, sys.stdin.fileno())
 
2308
        if null > 2:
 
2309
            os.close(null)
 
2310
    
 
2311
    # Need to fork before connecting to D-Bus
 
2312
    if not debug:
 
2313
        # Close all input and output, do double fork, etc.
 
2314
        daemon()
 
2315
    
 
2316
    gobject.threads_init()
1561
2317
    
1562
2318
    global main_loop
1563
2319
    # From the Avahi example code
1564
 
    DBusGMainLoop(set_as_default=True )
 
2320
    DBusGMainLoop(set_as_default=True)
1565
2321
    main_loop = gobject.MainLoop()
1566
2322
    bus = dbus.SystemBus()
1567
2323
    # End of Avahi example code
1568
2324
    if use_dbus:
1569
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
2325
        try:
 
2326
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2327
                                            bus, do_not_queue=True)
 
2328
            old_bus_name = (dbus.service.BusName
 
2329
                            ("se.bsnet.fukt.Mandos", bus,
 
2330
                             do_not_queue=True))
 
2331
        except dbus.exceptions.NameExistsException as e:
 
2332
            logger.error("Disabling D-Bus:", exc_info=e)
 
2333
            use_dbus = False
 
2334
            server_settings["use_dbus"] = False
 
2335
            tcp_server.use_dbus = False
1570
2336
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1571
 
    service = AvahiService(name = server_settings[u"servicename"],
1572
 
                           servicetype = u"_mandos._tcp",
1573
 
                           protocol = protocol, bus = bus)
 
2337
    service = AvahiServiceToSyslog(name =
 
2338
                                   server_settings["servicename"],
 
2339
                                   servicetype = "_mandos._tcp",
 
2340
                                   protocol = protocol, bus = bus)
1574
2341
    if server_settings["interface"]:
1575
2342
        service.interface = (if_nametoindex
1576
 
                             (str(server_settings[u"interface"])))
 
2343
                             (str(server_settings["interface"])))
 
2344
    
 
2345
    global multiprocessing_manager
 
2346
    multiprocessing_manager = multiprocessing.Manager()
1577
2347
    
1578
2348
    client_class = Client
1579
2349
    if use_dbus:
1580
2350
        client_class = functools.partial(ClientDBus, bus = bus)
1581
 
    tcp_server.clients.update(set(
1582
 
            client_class(name = section,
1583
 
                         config= dict(client_config.items(section)))
1584
 
            for section in client_config.sections()))
 
2351
    
 
2352
    client_settings = Client.config_parser(client_config)
 
2353
    old_client_settings = {}
 
2354
    clients_data = {}
 
2355
    
 
2356
    # Get client data and settings from last running state.
 
2357
    if server_settings["restore"]:
 
2358
        try:
 
2359
            with open(stored_state_path, "rb") as stored_state:
 
2360
                clients_data, old_client_settings = (pickle.load
 
2361
                                                     (stored_state))
 
2362
            os.remove(stored_state_path)
 
2363
        except IOError as e:
 
2364
            if e.errno == errno.ENOENT:
 
2365
                logger.warning("Could not load persistent state: {0}"
 
2366
                                .format(os.strerror(e.errno)))
 
2367
            else:
 
2368
                logger.critical("Could not load persistent state:",
 
2369
                                exc_info=e)
 
2370
                raise
 
2371
        except EOFError as e:
 
2372
            logger.warning("Could not load persistent state: "
 
2373
                           "EOFError:", exc_info=e)
 
2374
    
 
2375
    with PGPEngine() as pgp:
 
2376
        for client_name, client in clients_data.iteritems():
 
2377
            # Decide which value to use after restoring saved state.
 
2378
            # We have three different values: Old config file,
 
2379
            # new config file, and saved state.
 
2380
            # New config value takes precedence if it differs from old
 
2381
            # config value, otherwise use saved state.
 
2382
            for name, value in client_settings[client_name].items():
 
2383
                try:
 
2384
                    # For each value in new config, check if it
 
2385
                    # differs from the old config value (Except for
 
2386
                    # the "secret" attribute)
 
2387
                    if (name != "secret" and
 
2388
                        value != old_client_settings[client_name]
 
2389
                        [name]):
 
2390
                        client[name] = value
 
2391
                except KeyError:
 
2392
                    pass
 
2393
            
 
2394
            # Clients who has passed its expire date can still be
 
2395
            # enabled if its last checker was successful.  Clients
 
2396
            # whose checker succeeded before we stored its state is
 
2397
            # assumed to have successfully run all checkers during
 
2398
            # downtime.
 
2399
            if client["enabled"]:
 
2400
                if datetime.datetime.utcnow() >= client["expires"]:
 
2401
                    if not client["last_checked_ok"]:
 
2402
                        logger.warning(
 
2403
                            "disabling client {0} - Client never "
 
2404
                            "performed a successful checker"
 
2405
                            .format(client_name))
 
2406
                        client["enabled"] = False
 
2407
                    elif client["last_checker_status"] != 0:
 
2408
                        logger.warning(
 
2409
                            "disabling client {0} - Client "
 
2410
                            "last checker failed with error code {1}"
 
2411
                            .format(client_name,
 
2412
                                    client["last_checker_status"]))
 
2413
                        client["enabled"] = False
 
2414
                    else:
 
2415
                        client["expires"] = (datetime.datetime
 
2416
                                             .utcnow()
 
2417
                                             + client["timeout"])
 
2418
                        logger.debug("Last checker succeeded,"
 
2419
                                     " keeping {0} enabled"
 
2420
                                     .format(client_name))
 
2421
            try:
 
2422
                client["secret"] = (
 
2423
                    pgp.decrypt(client["encrypted_secret"],
 
2424
                                client_settings[client_name]
 
2425
                                ["secret"]))
 
2426
            except PGPError:
 
2427
                # If decryption fails, we use secret from new settings
 
2428
                logger.debug("Failed to decrypt {0} old secret"
 
2429
                             .format(client_name))
 
2430
                client["secret"] = (
 
2431
                    client_settings[client_name]["secret"])
 
2432
    
 
2433
    # Add/remove clients based on new changes made to config
 
2434
    for client_name in (set(old_client_settings)
 
2435
                        - set(client_settings)):
 
2436
        del clients_data[client_name]
 
2437
    for client_name in (set(client_settings)
 
2438
                        - set(old_client_settings)):
 
2439
        clients_data[client_name] = client_settings[client_name]
 
2440
    
 
2441
    # Create all client objects
 
2442
    for client_name, client in clients_data.iteritems():
 
2443
        tcp_server.clients[client_name] = client_class(
 
2444
            name = client_name, settings = client)
 
2445
    
1585
2446
    if not tcp_server.clients:
1586
 
        logger.warning(u"No clients defined")
1587
 
    
1588
 
    if debug:
1589
 
        # Redirect stdin so all checkers get /dev/null
1590
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1591
 
        os.dup2(null, sys.stdin.fileno())
1592
 
        if null > 2:
1593
 
            os.close(null)
1594
 
    else:
1595
 
        # No console logging
1596
 
        logger.removeHandler(console)
1597
 
        # Close all input and output, do double fork, etc.
1598
 
        daemon()
1599
 
    
1600
 
    try:
1601
 
        with closing(pidfile):
1602
 
            pid = os.getpid()
1603
 
            pidfile.write(str(pid) + "\n")
1604
 
        del pidfile
1605
 
    except IOError:
1606
 
        logger.error(u"Could not write to file %r with PID %d",
1607
 
                     pidfilename, pid)
1608
 
    except NameError:
1609
 
        # "pidfile" was never created
1610
 
        pass
1611
 
    del pidfilename
1612
 
    
1613
 
    def cleanup():
1614
 
        "Cleanup function; run on exit"
1615
 
        service.cleanup()
1616
 
        
1617
 
        while tcp_server.clients:
1618
 
            client = tcp_server.clients.pop()
1619
 
            client.disable_hook = None
1620
 
            client.disable()
1621
 
    
1622
 
    atexit.register(cleanup)
 
2447
        logger.warning("No clients defined")
1623
2448
    
1624
2449
    if not debug:
 
2450
        try:
 
2451
            with pidfile:
 
2452
                pid = os.getpid()
 
2453
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2454
            del pidfile
 
2455
        except IOError:
 
2456
            logger.error("Could not write to file %r with PID %d",
 
2457
                         pidfilename, pid)
 
2458
        except NameError:
 
2459
            # "pidfile" was never created
 
2460
            pass
 
2461
        del pidfilename
1625
2462
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2463
    
1626
2464
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1627
2465
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1628
2466
    
1629
2467
    if use_dbus:
1630
 
        class MandosDBusService(dbus.service.Object):
 
2468
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2469
                                        "se.bsnet.fukt.Mandos"})
 
2470
        class MandosDBusService(DBusObjectWithProperties):
1631
2471
            """A D-Bus proxy object"""
1632
2472
            def __init__(self):
1633
 
                dbus.service.Object.__init__(self, bus, u"/")
1634
 
            _interface = u"se.bsnet.fukt.Mandos"
1635
 
            
1636
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
1637
 
            def ClientAdded(self, objpath, properties):
1638
 
                "D-Bus signal"
1639
 
                pass
1640
 
            
1641
 
            @dbus.service.signal(_interface, signature=u"s")
1642
 
            def ClientNotFound(self, fingerprint):
1643
 
                "D-Bus signal"
1644
 
                pass
1645
 
            
1646
 
            @dbus.service.signal(_interface, signature=u"os")
 
2473
                dbus.service.Object.__init__(self, bus, "/")
 
2474
            _interface = "se.recompile.Mandos"
 
2475
            
 
2476
            @dbus_interface_annotations(_interface)
 
2477
            def _foo(self):
 
2478
                return { "org.freedesktop.DBus.Property"
 
2479
                         ".EmitsChangedSignal":
 
2480
                             "false"}
 
2481
            
 
2482
            @dbus.service.signal(_interface, signature="o")
 
2483
            def ClientAdded(self, objpath):
 
2484
                "D-Bus signal"
 
2485
                pass
 
2486
            
 
2487
            @dbus.service.signal(_interface, signature="ss")
 
2488
            def ClientNotFound(self, fingerprint, address):
 
2489
                "D-Bus signal"
 
2490
                pass
 
2491
            
 
2492
            @dbus.service.signal(_interface, signature="os")
1647
2493
            def ClientRemoved(self, objpath, name):
1648
2494
                "D-Bus signal"
1649
2495
                pass
1650
2496
            
1651
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
2497
            @dbus.service.method(_interface, out_signature="ao")
1652
2498
            def GetAllClients(self):
1653
2499
                "D-Bus method"
1654
2500
                return dbus.Array(c.dbus_object_path
1655
 
                                  for c in tcp_server.clients)
 
2501
                                  for c in
 
2502
                                  tcp_server.clients.itervalues())
1656
2503
            
1657
2504
            @dbus.service.method(_interface,
1658
 
                                 out_signature=u"a{oa{sv}}")
 
2505
                                 out_signature="a{oa{sv}}")
1659
2506
            def GetAllClientsWithProperties(self):
1660
2507
                "D-Bus method"
1661
2508
                return dbus.Dictionary(
1662
 
                    ((c.dbus_object_path, c.GetAll(u""))
1663
 
                     for c in tcp_server.clients),
1664
 
                    signature=u"oa{sv}")
 
2509
                    ((c.dbus_object_path, c.GetAll(""))
 
2510
                     for c in tcp_server.clients.itervalues()),
 
2511
                    signature="oa{sv}")
1665
2512
            
1666
 
            @dbus.service.method(_interface, in_signature=u"o")
 
2513
            @dbus.service.method(_interface, in_signature="o")
1667
2514
            def RemoveClient(self, object_path):
1668
2515
                "D-Bus method"
1669
 
                for c in tcp_server.clients:
 
2516
                for c in tcp_server.clients.itervalues():
1670
2517
                    if c.dbus_object_path == object_path:
1671
 
                        tcp_server.clients.remove(c)
 
2518
                        del tcp_server.clients[c.name]
1672
2519
                        c.remove_from_connection()
1673
2520
                        # Don't signal anything except ClientRemoved
1674
 
                        c.disable(signal=False)
 
2521
                        c.disable(quiet=True)
1675
2522
                        # Emit D-Bus signal
1676
2523
                        self.ClientRemoved(object_path, c.name)
1677
2524
                        return
1678
 
                raise KeyError
 
2525
                raise KeyError(object_path)
1679
2526
            
1680
2527
            del _interface
1681
2528
        
1682
2529
        mandos_dbus_service = MandosDBusService()
1683
2530
    
1684
 
    for client in tcp_server.clients:
 
2531
    def cleanup():
 
2532
        "Cleanup function; run on exit"
 
2533
        service.cleanup()
 
2534
        
 
2535
        multiprocessing.active_children()
 
2536
        if not (tcp_server.clients or client_settings):
 
2537
            return
 
2538
        
 
2539
        # Store client before exiting. Secrets are encrypted with key
 
2540
        # based on what config file has. If config file is
 
2541
        # removed/edited, old secret will thus be unrecovable.
 
2542
        clients = {}
 
2543
        with PGPEngine() as pgp:
 
2544
            for client in tcp_server.clients.itervalues():
 
2545
                key = client_settings[client.name]["secret"]
 
2546
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2547
                                                      key)
 
2548
                client_dict = {}
 
2549
                
 
2550
                # A list of attributes that can not be pickled
 
2551
                # + secret.
 
2552
                exclude = set(("bus", "changedstate", "secret",
 
2553
                               "checker"))
 
2554
                for name, typ in (inspect.getmembers
 
2555
                                  (dbus.service.Object)):
 
2556
                    exclude.add(name)
 
2557
                
 
2558
                client_dict["encrypted_secret"] = (client
 
2559
                                                   .encrypted_secret)
 
2560
                for attr in client.client_structure:
 
2561
                    if attr not in exclude:
 
2562
                        client_dict[attr] = getattr(client, attr)
 
2563
                
 
2564
                clients[client.name] = client_dict
 
2565
                del client_settings[client.name]["secret"]
 
2566
        
 
2567
        try:
 
2568
            with (tempfile.NamedTemporaryFile
 
2569
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2570
                   dir=os.path.dirname(stored_state_path),
 
2571
                   delete=False)) as stored_state:
 
2572
                pickle.dump((clients, client_settings), stored_state)
 
2573
                tempname=stored_state.name
 
2574
            os.rename(tempname, stored_state_path)
 
2575
        except (IOError, OSError) as e:
 
2576
            if not debug:
 
2577
                try:
 
2578
                    os.remove(tempname)
 
2579
                except NameError:
 
2580
                    pass
 
2581
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2582
                logger.warning("Could not save persistent state: {0}"
 
2583
                               .format(os.strerror(e.errno)))
 
2584
            else:
 
2585
                logger.warning("Could not save persistent state:",
 
2586
                               exc_info=e)
 
2587
                raise e
 
2588
        
 
2589
        # Delete all clients, and settings from config
 
2590
        while tcp_server.clients:
 
2591
            name, client = tcp_server.clients.popitem()
 
2592
            if use_dbus:
 
2593
                client.remove_from_connection()
 
2594
            # Don't signal anything except ClientRemoved
 
2595
            client.disable(quiet=True)
 
2596
            if use_dbus:
 
2597
                # Emit D-Bus signal
 
2598
                mandos_dbus_service.ClientRemoved(client
 
2599
                                                  .dbus_object_path,
 
2600
                                                  client.name)
 
2601
        client_settings.clear()
 
2602
    
 
2603
    atexit.register(cleanup)
 
2604
    
 
2605
    for client in tcp_server.clients.itervalues():
1685
2606
        if use_dbus:
1686
2607
            # Emit D-Bus signal
1687
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1688
 
                                            client.GetAll(u""))
1689
 
        client.enable()
 
2608
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
2609
        # Need to initiate checking of clients
 
2610
        if client.enabled:
 
2611
            client.init_checker()
1690
2612
    
1691
2613
    tcp_server.enable()
1692
2614
    tcp_server.server_activate()
1694
2616
    # Find out what port we got
1695
2617
    service.port = tcp_server.socket.getsockname()[1]
1696
2618
    if use_ipv6:
1697
 
        logger.info(u"Now listening on address %r, port %d,"
1698
 
                    " flowinfo %d, scope_id %d"
1699
 
                    % tcp_server.socket.getsockname())
 
2619
        logger.info("Now listening on address %r, port %d,"
 
2620
                    " flowinfo %d, scope_id %d",
 
2621
                    *tcp_server.socket.getsockname())
1700
2622
    else:                       # IPv4
1701
 
        logger.info(u"Now listening on address %r, port %d"
1702
 
                    % tcp_server.socket.getsockname())
 
2623
        logger.info("Now listening on address %r, port %d",
 
2624
                    *tcp_server.socket.getsockname())
1703
2625
    
1704
2626
    #service.interface = tcp_server.socket.getsockname()[3]
1705
2627
    
1707
2629
        # From the Avahi example code
1708
2630
        try:
1709
2631
            service.activate()
1710
 
        except dbus.exceptions.DBusException, error:
1711
 
            logger.critical(u"DBusException: %s", error)
 
2632
        except dbus.exceptions.DBusException as error:
 
2633
            logger.critical("D-Bus Exception", exc_info=error)
 
2634
            cleanup()
1712
2635
            sys.exit(1)
1713
2636
        # End of Avahi example code
1714
2637
        
1717
2640
                             (tcp_server.handle_request
1718
2641
                              (*args[2:], **kwargs) or True))
1719
2642
        
1720
 
        logger.debug(u"Starting main loop")
 
2643
        logger.debug("Starting main loop")
1721
2644
        main_loop.run()
1722
 
    except AvahiError, error:
1723
 
        logger.critical(u"AvahiError: %s", error)
 
2645
    except AvahiError as error:
 
2646
        logger.critical("Avahi Error", exc_info=error)
 
2647
        cleanup()
1724
2648
        sys.exit(1)
1725
2649
    except KeyboardInterrupt:
1726
2650
        if debug:
1727
 
            print >> sys.stderr
1728
 
        logger.debug(u"Server received KeyboardInterrupt")
1729
 
    logger.debug(u"Server exiting")
 
2651
            print("", file=sys.stderr)
 
2652
        logger.debug("Server received KeyboardInterrupt")
 
2653
    logger.debug("Server exiting")
 
2654
    # Must run before the D-Bus bus name gets deregistered
 
2655
    cleanup()
1730
2656
 
1731
2657
if __name__ == '__main__':
1732
2658
    main()