/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos (peer_certificate, fingerprint): Moved into "TCP_handler"
                                          class.
  (TCP_handler.peer_certificate, TCP_handler.fingerprint): Moved here.
  (TCP_handler.handle): Do not log conditions also sent via IPC.
  (IPv6_TCPServer.handle_ipc): Bug fix: Remove extra newline from IPC
                               command log message.  Bug fix:  Strip
                               CR and NL from IPC line.  Log
                               conditions recieved via IPC.  Log error
                               if IPC recieved about unknown client.

Show diffs side-by-side

added added

removed removed

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