/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2014-03-01 09:39:25 UTC
  • Revision ID: teddy@recompile.se-20140301093925-0x6nwf21f0zljk6e
* debian/copyright: Change year to "2014".
* mandos-ctl: - '' -
* mandos-monitor: - '' -
* plugins.d/mandos-client.xml: - '' -

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