/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

Tags: version-1.0.10-1
* Makefile (version): Changed to "1.0.10".
* NEWS (Version 1.0.10): New entry.
* debian/changelog (1.0.10-1): - '' -

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