/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-03-27 13:33:17 UTC
  • mfrom: (288.1.2 mandos-pipe-ipc)
  • Revision ID: teddy@fukt.bsnet.se-20090327133317-riwt5s5orrisozuj
Merge from pipe IPC branch.

* mandos (AvahiService.rename, main): Include PID in log messages when
                                      using a different service name.
  (Client.ReceivedSecret, Client.Rejected): New D-Bus signals.
  (TCP_handler.handle): Send IPC to parent process.
  (ForkingMixInWithPipe): New mixin class.
  (IPv6_TCPServer): Inherit from ForkingMixInWithPipe instead of
                    SocketServer.ForkingMixIn.
  (IPv6_TCPServer.handle_ipc): New method.
  (main/mandos_server): Renamed to "mandos_dbus_service" and made
                        global.
  (main/MandosServer): Renamed to "MandosDBusService".
  (main/MandosDBusService.ClientNotFound): New D-Bus signal.

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
31
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
38
import optparse
40
39
import datetime
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
 
59
from contextlib import closing
65
60
 
66
61
import dbus
67
62
import dbus.service
70
65
from dbus.mainloop.glib import DBusGMainLoop
71
66
import ctypes
72
67
import ctypes.util
73
 
import xml.dom.minidom
74
 
import inspect
75
 
 
76
 
try:
77
 
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
78
 
except AttributeError:
79
 
    try:
80
 
        from IN import SO_BINDTODEVICE
81
 
    except ImportError:
82
 
        SO_BINDTODEVICE = None
83
 
 
84
 
 
85
 
version = "1.2.3"
86
 
 
87
 
#logger = logging.getLogger('mandos')
 
68
 
 
69
version = "1.0.8"
 
70
 
88
71
logger = logging.Logger('mandos')
89
72
syslogger = (logging.handlers.SysLogHandler
90
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
 
              address = str("/dev/log")))
 
74
              address = "/dev/log"))
92
75
syslogger.setFormatter(logging.Formatter
93
76
                       ('Mandos [%(process)d]: %(levelname)s:'
94
77
                        ' %(message)s'))
96
79
 
97
80
console = logging.StreamHandler()
98
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
 
82
                                       ' %(levelname)s: %(message)s'))
101
83
logger.addHandler(console)
102
84
 
103
85
class AvahiError(Exception):
116
98
 
117
99
class AvahiService(object):
118
100
    """An Avahi (Zeroconf) service.
119
 
    
120
101
    Attributes:
121
102
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
103
               Used to optionally bind to the specified interface.
130
111
    max_renames: integer; maximum number of renames
131
112
    rename_count: integer; counter so we only rename after collisions
132
113
                  a sensible number of times
133
 
    group: D-Bus Entry Group
134
 
    server: D-Bus Server
135
 
    bus: dbus.SystemBus()
136
114
    """
137
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
116
                 servicetype = None, port = None, TXT = None,
139
117
                 domain = "", host = "", max_renames = 32768,
140
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
118
                 protocol = avahi.PROTO_UNSPEC):
141
119
        self.interface = interface
142
120
        self.name = name
143
121
        self.type = servicetype
148
126
        self.rename_count = 0
149
127
        self.max_renames = max_renames
150
128
        self.protocol = protocol
151
 
        self.group = None       # our entry group
152
 
        self.server = None
153
 
        self.bus = bus
154
129
    def rename(self):
155
130
        """Derived from the Avahi example code"""
156
131
        if self.rename_count >= self.max_renames:
157
 
            logger.critical("No suitable Zeroconf service name found"
158
 
                            " after %i retries, exiting.",
 
132
            logger.critical(u"No suitable Zeroconf service name found"
 
133
                            u" after %i retries, exiting.",
159
134
                            self.rename_count)
160
 
            raise AvahiServiceError("Too many renames")
161
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
162
 
        logger.info("Changing Zeroconf service name to %r ...",
163
 
                    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))
164
139
        syslogger.setFormatter(logging.Formatter
165
140
                               ('Mandos (%s) [%%(process)d]:'
166
141
                                ' %%(levelname)s: %%(message)s'
167
142
                                % self.name))
168
143
        self.remove()
169
 
        try:
170
 
            self.add()
171
 
        except dbus.exceptions.DBusException, error:
172
 
            logger.critical("DBusException: %s", error)
173
 
            self.cleanup()
174
 
            os._exit(1)
 
144
        self.add()
175
145
        self.rename_count += 1
176
146
    def remove(self):
177
147
        """Derived from the Avahi example code"""
178
 
        if self.group is not None:
179
 
            self.group.Reset()
 
148
        if group is not None:
 
149
            group.Reset()
180
150
    def add(self):
181
151
        """Derived from the Avahi example code"""
182
 
        if self.group is None:
183
 
            self.group = dbus.Interface(
184
 
                self.bus.get_object(avahi.DBUS_NAME,
185
 
                                    self.server.EntryGroupNew()),
186
 
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
187
 
            self.group.connect_to_signal('StateChanged',
188
 
                                         self
189
 
                                         .entry_group_state_changed)
190
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
191
 
                     self.name, self.type)
192
 
        self.group.AddService(
193
 
            self.interface,
194
 
            self.protocol,
195
 
            dbus.UInt32(0),     # flags
196
 
            self.name, self.type,
197
 
            self.domain, self.host,
198
 
            dbus.UInt16(self.port),
199
 
            avahi.string_array_to_txt_array(self.TXT))
200
 
        self.group.Commit()
201
 
    def entry_group_state_changed(self, state, error):
202
 
        """Derived from the Avahi example code"""
203
 
        logger.debug("Avahi entry group state change: %i", state)
204
 
        
205
 
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
206
 
            logger.debug("Zeroconf service established.")
207
 
        elif state == avahi.ENTRY_GROUP_COLLISION:
208
 
            logger.info("Zeroconf service name collision.")
209
 
            self.rename()
210
 
        elif state == avahi.ENTRY_GROUP_FAILURE:
211
 
            logger.critical("Avahi: Error in group state changed %s",
212
 
                            unicode(error))
213
 
            raise AvahiGroupError("State changed: %s"
214
 
                                  % unicode(error))
215
 
    def cleanup(self):
216
 
        """Derived from the Avahi example code"""
217
 
        if self.group is not None:
218
 
            self.group.Free()
219
 
            self.group = None
220
 
    def server_state_changed(self, state):
221
 
        """Derived from the Avahi example code"""
222
 
        logger.debug("Avahi server state change: %i", state)
223
 
        if state == avahi.SERVER_COLLISION:
224
 
            logger.error("Zeroconf server name collision")
225
 
            self.remove()
226
 
        elif state == avahi.SERVER_RUNNING:
227
 
            self.add()
228
 
    def activate(self):
229
 
        """Derived from the Avahi example code"""
230
 
        if self.server is None:
231
 
            self.server = dbus.Interface(
232
 
                self.bus.get_object(avahi.DBUS_NAME,
233
 
                                    avahi.DBUS_PATH_SERVER),
234
 
                avahi.DBUS_INTERFACE_SERVER)
235
 
        self.server.connect_to_signal("StateChanged",
236
 
                                 self.server_state_changed)
237
 
        self.server_state_changed(self.server.GetState())
238
 
 
239
 
 
240
 
class Client(object):
 
152
        global group
 
153
        if group is None:
 
154
            group = dbus.Interface(bus.get_object
 
155
                                   (avahi.DBUS_NAME,
 
156
                                    server.EntryGroupNew()),
 
157
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
158
            group.connect_to_signal('StateChanged',
 
159
                                    entry_group_state_changed)
 
160
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
161
                     service.name, service.type)
 
162
        group.AddService(
 
163
                self.interface,         # interface
 
164
                self.protocol,          # protocol
 
165
                dbus.UInt32(0),         # flags
 
166
                self.name, self.type,
 
167
                self.domain, self.host,
 
168
                dbus.UInt16(self.port),
 
169
                avahi.string_array_to_txt_array(self.TXT))
 
170
        group.Commit()
 
171
 
 
172
# From the Avahi example code:
 
173
group = None                            # our entry group
 
174
# End of Avahi example code
 
175
 
 
176
 
 
177
def _datetime_to_dbus(dt, variant_level=0):
 
178
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
179
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
180
 
 
181
 
 
182
class Client(dbus.service.Object):
241
183
    """A representation of a client host served by this server.
242
 
    
243
184
    Attributes:
244
 
    _approved:   bool(); 'None' if not yet approved/disapproved
245
 
    approval_delay: datetime.timedelta(); Time to wait for approval
246
 
    approval_duration: datetime.timedelta(); Duration of one approval
 
185
    name:       string; from the config file, used in log messages and
 
186
                        D-Bus identifiers
 
187
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
188
                 uniquely identify the client
 
189
    secret:     bytestring; sent verbatim (over TLS) to client
 
190
    host:       string; available for use by the checker command
 
191
    created:    datetime.datetime(); (UTC) object creation
 
192
    last_enabled: datetime.datetime(); (UTC)
 
193
    enabled:    bool()
 
194
    last_checked_ok: datetime.datetime(); (UTC) or None
 
195
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
196
                                      until this client is invalid
 
197
    interval:   datetime.timedelta(); How often to start a new checker
 
198
    disable_hook:  If set, called by disable() as disable_hook(self)
247
199
    checker:    subprocess.Popen(); a running checker process used
248
200
                                    to see if the client lives.
249
201
                                    'None' if no process is running.
250
 
    checker_callback_tag: a gobject event source tag, or None
251
 
    checker_command: string; External command which is run to check
252
 
                     if client lives.  %() expansions are done at
 
202
    checker_initiator_tag: a gobject event source tag, or None
 
203
    disable_initiator_tag:    - '' -
 
204
    checker_callback_tag:  - '' -
 
205
    checker_command: string; External command which is run to check if
 
206
                     client lives.  %() expansions are done at
253
207
                     runtime with vars(self) as dict, so that for
254
208
                     instance %(name)s can be used in the command.
255
 
    checker_initiator_tag: a gobject event source tag, or None
256
 
    created:    datetime.datetime(); (UTC) object creation
257
209
    current_checker_command: string; current running checker_command
258
 
    disable_hook:  If set, called by disable() as disable_hook(self)
259
 
    disable_initiator_tag: a gobject event source tag, or None
260
 
    enabled:    bool()
261
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
262
 
                 uniquely identify the client
263
 
    host:       string; available for use by the checker command
264
 
    interval:   datetime.timedelta(); How often to start a new checker
265
 
    last_approval_request: datetime.datetime(); (UTC) or None
266
 
    last_checked_ok: datetime.datetime(); (UTC) or None
267
 
    last_enabled: datetime.datetime(); (UTC)
268
 
    name:       string; from the config file, used in log messages and
269
 
                        D-Bus identifiers
270
 
    secret:     bytestring; sent verbatim (over TLS) to client
271
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
272
 
                                      until this client is disabled
273
 
    runtime_expansions: Allowed attributes for runtime expansion.
 
210
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
211
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
274
212
    """
275
 
    
276
 
    runtime_expansions = ("approval_delay", "approval_duration",
277
 
                          "created", "enabled", "fingerprint",
278
 
                          "host", "interval", "last_checked_ok",
279
 
                          "last_enabled", "name", "timeout")
280
 
    
281
 
    @staticmethod
282
 
    def _timedelta_to_milliseconds(td):
283
 
        "Convert a datetime.timedelta() to milliseconds"
284
 
        return ((td.days * 24 * 60 * 60 * 1000)
285
 
                + (td.seconds * 1000)
286
 
                + (td.microseconds // 1000))
287
 
    
288
213
    def timeout_milliseconds(self):
289
214
        "Return the 'timeout' attribute in milliseconds"
290
 
        return self._timedelta_to_milliseconds(self.timeout)
 
215
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
216
                + (self.timeout.seconds * 1000)
 
217
                + (self.timeout.microseconds // 1000))
291
218
    
292
219
    def interval_milliseconds(self):
293
220
        "Return the 'interval' attribute in milliseconds"
294
 
        return self._timedelta_to_milliseconds(self.interval)
295
 
 
296
 
    def approval_delay_milliseconds(self):
297
 
        return self._timedelta_to_milliseconds(self.approval_delay)
 
221
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
222
                + (self.interval.seconds * 1000)
 
223
                + (self.interval.microseconds // 1000))
298
224
    
299
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
225
    def __init__(self, name = None, disable_hook=None, config=None,
 
226
                 use_dbus=True):
300
227
        """Note: the 'checker' key in 'config' sets the
301
228
        'checker_command' attribute and *not* the 'checker'
302
229
        attribute."""
303
230
        self.name = name
304
231
        if config is None:
305
232
            config = {}
306
 
        logger.debug("Creating client %r", self.name)
 
233
        logger.debug(u"Creating client %r", self.name)
 
234
        self.use_dbus = False   # During __init__
307
235
        # Uppercase and remove spaces from fingerprint for later
308
236
        # comparison purposes with return value from the fingerprint()
309
237
        # function
310
238
        self.fingerprint = (config["fingerprint"].upper()
311
 
                            .replace(" ", ""))
312
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
239
                            .replace(u" ", u""))
 
240
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
313
241
        if "secret" in config:
314
 
            self.secret = config["secret"].decode("base64")
 
242
            self.secret = config["secret"].decode(u"base64")
315
243
        elif "secfile" in config:
316
 
            with open(os.path.expanduser(os.path.expandvars
317
 
                                         (config["secfile"])),
318
 
                      "rb") as secfile:
 
244
            with closing(open(os.path.expanduser
 
245
                              (os.path.expandvars
 
246
                               (config["secfile"])))) as secfile:
319
247
                self.secret = secfile.read()
320
248
        else:
321
 
            raise TypeError("No secret or secfile for client %s"
 
249
            raise TypeError(u"No secret or secfile for client %s"
322
250
                            % self.name)
323
251
        self.host = config.get("host", "")
324
252
        self.created = datetime.datetime.utcnow()
325
253
        self.enabled = False
326
 
        self.last_approval_request = None
327
254
        self.last_enabled = None
328
255
        self.last_checked_ok = None
329
256
        self.timeout = string_to_delta(config["timeout"])
336
263
        self.checker_command = config["checker"]
337
264
        self.current_checker_command = None
338
265
        self.last_connect = None
339
 
        self._approved = None
340
 
        self.approved_by_default = config.get("approved_by_default",
341
 
                                              True)
342
 
        self.approvals_pending = 0
343
 
        self.approval_delay = string_to_delta(
344
 
            config["approval_delay"])
345
 
        self.approval_duration = string_to_delta(
346
 
            config["approval_duration"])
347
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
266
        # Only now, when this client is initialized, can it show up on
 
267
        # the D-Bus
 
268
        self.use_dbus = use_dbus
 
269
        if self.use_dbus:
 
270
            self.dbus_object_path = (dbus.ObjectPath
 
271
                                     ("/clients/"
 
272
                                      + self.name.replace(".", "_")))
 
273
            dbus.service.Object.__init__(self, bus,
 
274
                                         self.dbus_object_path)
348
275
    
349
 
    def send_changedstate(self):
350
 
        self.changedstate.acquire()
351
 
        self.changedstate.notify_all()
352
 
        self.changedstate.release()
353
 
        
354
276
    def enable(self):
355
277
        """Start this client's checker and timeout hooks"""
356
 
        if getattr(self, "enabled", False):
357
 
            # Already enabled
358
 
            return
359
 
        self.send_changedstate()
360
278
        self.last_enabled = datetime.datetime.utcnow()
361
279
        # Schedule a new checker to be started an 'interval' from now,
362
280
        # and every interval from then on.
363
281
        self.checker_initiator_tag = (gobject.timeout_add
364
282
                                      (self.interval_milliseconds(),
365
283
                                       self.start_checker))
 
284
        # Also start a new checker *right now*.
 
285
        self.start_checker()
366
286
        # Schedule a disable() when 'timeout' has passed
367
287
        self.disable_initiator_tag = (gobject.timeout_add
368
288
                                   (self.timeout_milliseconds(),
369
289
                                    self.disable))
370
290
        self.enabled = True
371
 
        # Also start a new checker *right now*.
372
 
        self.start_checker()
 
291
        if self.use_dbus:
 
292
            # Emit D-Bus signals
 
293
            self.PropertyChanged(dbus.String(u"enabled"),
 
294
                                 dbus.Boolean(True, variant_level=1))
 
295
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
296
                                 (_datetime_to_dbus(self.last_enabled,
 
297
                                                    variant_level=1)))
373
298
    
374
 
    def disable(self, quiet=True):
 
299
    def disable(self):
375
300
        """Disable this client."""
376
301
        if not getattr(self, "enabled", False):
377
302
            return False
378
 
        if not quiet:
379
 
            self.send_changedstate()
380
 
        if not quiet:
381
 
            logger.info("Disabling client %s", self.name)
 
303
        logger.info(u"Disabling client %s", self.name)
382
304
        if getattr(self, "disable_initiator_tag", False):
383
305
            gobject.source_remove(self.disable_initiator_tag)
384
306
            self.disable_initiator_tag = None
389
311
        if self.disable_hook:
390
312
            self.disable_hook(self)
391
313
        self.enabled = False
 
314
        if self.use_dbus:
 
315
            # Emit D-Bus signal
 
316
            self.PropertyChanged(dbus.String(u"enabled"),
 
317
                                 dbus.Boolean(False, variant_level=1))
392
318
        # Do not run this again if called by a gobject.timeout_add
393
319
        return False
394
320
    
400
326
        """The checker has completed, so take appropriate actions."""
401
327
        self.checker_callback_tag = None
402
328
        self.checker = None
 
329
        if self.use_dbus:
 
330
            # Emit D-Bus signal
 
331
            self.PropertyChanged(dbus.String(u"checker_running"),
 
332
                                 dbus.Boolean(False, variant_level=1))
403
333
        if os.WIFEXITED(condition):
404
334
            exitstatus = os.WEXITSTATUS(condition)
405
335
            if exitstatus == 0:
406
 
                logger.info("Checker for %(name)s succeeded",
 
336
                logger.info(u"Checker for %(name)s succeeded",
407
337
                            vars(self))
408
338
                self.checked_ok()
409
339
            else:
410
 
                logger.info("Checker for %(name)s failed",
 
340
                logger.info(u"Checker for %(name)s failed",
411
341
                            vars(self))
 
342
            if self.use_dbus:
 
343
                # Emit D-Bus signal
 
344
                self.CheckerCompleted(dbus.Int16(exitstatus),
 
345
                                      dbus.Int64(condition),
 
346
                                      dbus.String(command))
412
347
        else:
413
 
            logger.warning("Checker for %(name)s crashed?",
 
348
            logger.warning(u"Checker for %(name)s crashed?",
414
349
                           vars(self))
 
350
            if self.use_dbus:
 
351
                # Emit D-Bus signal
 
352
                self.CheckerCompleted(dbus.Int16(-1),
 
353
                                      dbus.Int64(condition),
 
354
                                      dbus.String(command))
415
355
    
416
356
    def checked_ok(self):
417
357
        """Bump up the timeout for this client.
418
 
        
419
358
        This should only be called when the client has been seen,
420
359
        alive and well.
421
360
        """
424
363
        self.disable_initiator_tag = (gobject.timeout_add
425
364
                                      (self.timeout_milliseconds(),
426
365
                                       self.disable))
427
 
    
428
 
    def need_approval(self):
429
 
        self.last_approval_request = datetime.datetime.utcnow()
 
366
        if self.use_dbus:
 
367
            # Emit D-Bus signal
 
368
            self.PropertyChanged(
 
369
                dbus.String(u"last_checked_ok"),
 
370
                (_datetime_to_dbus(self.last_checked_ok,
 
371
                                   variant_level=1)))
430
372
    
431
373
    def start_checker(self):
432
374
        """Start a new checker subprocess if one is not running.
433
 
        
434
375
        If a checker already exists, leave it running and do
435
376
        nothing."""
436
377
        # The reason for not killing a running checker is that if we
439
380
        # client would inevitably timeout, since no checker would get
440
381
        # a chance to run to completion.  If we instead leave running
441
382
        # checkers alone, the checker would have to take more time
442
 
        # than 'timeout' for the client to be disabled, which is as it
443
 
        # should be.
 
383
        # than 'timeout' for the client to be declared invalid, which
 
384
        # is as it should be.
444
385
        
445
386
        # If a checker exists, make sure it is not a zombie
446
 
        try:
 
387
        if self.checker is not None:
447
388
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
448
 
        except (AttributeError, OSError), error:
449
 
            if (isinstance(error, OSError)
450
 
                and error.errno != errno.ECHILD):
451
 
                raise error
452
 
        else:
453
389
            if pid:
454
390
                logger.warning("Checker was a zombie")
455
391
                gobject.source_remove(self.checker_callback_tag)
462
398
                command = self.checker_command % self.host
463
399
            except TypeError:
464
400
                # Escape attributes for the shell
465
 
                escaped_attrs = dict(
466
 
                    (attr,
467
 
                     re.escape(unicode(str(getattr(self, attr, "")),
468
 
                                       errors=
469
 
                                       'replace')))
470
 
                    for attr in
471
 
                    self.runtime_expansions)
472
 
 
 
401
                escaped_attrs = dict((key, re.escape(str(val)))
 
402
                                     for key, val in
 
403
                                     vars(self).iteritems())
473
404
                try:
474
405
                    command = self.checker_command % escaped_attrs
475
406
                except TypeError, error:
476
 
                    logger.error('Could not format string "%s":'
477
 
                                 ' %s', self.checker_command, error)
 
407
                    logger.error(u'Could not format string "%s":'
 
408
                                 u' %s', self.checker_command, error)
478
409
                    return True # Try again later
479
 
            self.current_checker_command = command
 
410
                self.current_checker_command = command
480
411
            try:
481
 
                logger.info("Starting checker %r for %s",
 
412
                logger.info(u"Starting checker %r for %s",
482
413
                            command, self.name)
483
414
                # We don't need to redirect stdout and stderr, since
484
415
                # in normal mode, that is already done by daemon(),
487
418
                self.checker = subprocess.Popen(command,
488
419
                                                close_fds=True,
489
420
                                                shell=True, cwd="/")
 
421
                if self.use_dbus:
 
422
                    # Emit D-Bus signal
 
423
                    self.CheckerStarted(command)
 
424
                    self.PropertyChanged(
 
425
                        dbus.String("checker_running"),
 
426
                        dbus.Boolean(True, variant_level=1))
490
427
                self.checker_callback_tag = (gobject.child_watch_add
491
428
                                             (self.checker.pid,
492
429
                                              self.checker_callback,
498
435
                    gobject.source_remove(self.checker_callback_tag)
499
436
                    self.checker_callback(pid, status, command)
500
437
            except OSError, error:
501
 
                logger.error("Failed to start subprocess: %s",
 
438
                logger.error(u"Failed to start subprocess: %s",
502
439
                             error)
503
440
        # Re-run this periodically if run by gobject.timeout_add
504
441
        return True
510
447
            self.checker_callback_tag = None
511
448
        if getattr(self, "checker", None) is None:
512
449
            return
513
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
450
        logger.debug(u"Stopping checker for %(name)s", vars(self))
514
451
        try:
515
452
            os.kill(self.checker.pid, signal.SIGTERM)
516
 
            #time.sleep(0.5)
 
453
            #os.sleep(0.5)
517
454
            #if self.checker.poll() is None:
518
455
            #    os.kill(self.checker.pid, signal.SIGKILL)
519
456
        except OSError, error:
520
457
            if error.errno != errno.ESRCH: # No such process
521
458
                raise
522
459
        self.checker = None
523
 
 
524
 
def dbus_service_property(dbus_interface, signature="v",
525
 
                          access="readwrite", byte_arrays=False):
526
 
    """Decorators for marking methods of a DBusObjectWithProperties to
527
 
    become properties on the D-Bus.
528
 
    
529
 
    The decorated method will be called with no arguments by "Get"
530
 
    and with one argument by "Set".
531
 
    
532
 
    The parameters, where they are supported, are the same as
533
 
    dbus.service.method, except there is only "signature", since the
534
 
    type from Get() and the type sent to Set() is the same.
535
 
    """
536
 
    # Encoding deeply encoded byte arrays is not supported yet by the
537
 
    # "Set" method, so we fail early here:
538
 
    if byte_arrays and signature != "ay":
539
 
        raise ValueError("Byte arrays not supported for non-'ay'"
540
 
                         " signature %r" % signature)
541
 
    def decorator(func):
542
 
        func._dbus_is_property = True
543
 
        func._dbus_interface = dbus_interface
544
 
        func._dbus_signature = signature
545
 
        func._dbus_access = access
546
 
        func._dbus_name = func.__name__
547
 
        if func._dbus_name.endswith("_dbus_property"):
548
 
            func._dbus_name = func._dbus_name[:-14]
549
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
550
 
        return func
551
 
    return decorator
552
 
 
553
 
 
554
 
class DBusPropertyException(dbus.exceptions.DBusException):
555
 
    """A base class for D-Bus property-related exceptions
556
 
    """
557
 
    def __unicode__(self):
558
 
        return unicode(str(self))
559
 
 
560
 
 
561
 
class DBusPropertyAccessException(DBusPropertyException):
562
 
    """A property's access permissions disallows an operation.
563
 
    """
564
 
    pass
565
 
 
566
 
 
567
 
class DBusPropertyNotFound(DBusPropertyException):
568
 
    """An attempt was made to access a non-existing property.
569
 
    """
570
 
    pass
571
 
 
572
 
 
573
 
class DBusObjectWithProperties(dbus.service.Object):
574
 
    """A D-Bus object with properties.
575
 
 
576
 
    Classes inheriting from this can use the dbus_service_property
577
 
    decorator to expose methods as D-Bus properties.  It exposes the
578
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
579
 
    """
580
 
    
581
 
    @staticmethod
582
 
    def _is_dbus_property(obj):
583
 
        return getattr(obj, "_dbus_is_property", False)
584
 
    
585
 
    def _get_all_dbus_properties(self):
586
 
        """Returns a generator of (name, attribute) pairs
587
 
        """
588
 
        return ((prop._dbus_name, prop)
589
 
                for name, prop in
590
 
                inspect.getmembers(self, self._is_dbus_property))
591
 
    
592
 
    def _get_dbus_property(self, interface_name, property_name):
593
 
        """Returns a bound method if one exists which is a D-Bus
594
 
        property with the specified name and interface.
595
 
        """
596
 
        for name in (property_name,
597
 
                     property_name + "_dbus_property"):
598
 
            prop = getattr(self, name, None)
599
 
            if (prop is None
600
 
                or not self._is_dbus_property(prop)
601
 
                or prop._dbus_name != property_name
602
 
                or (interface_name and prop._dbus_interface
603
 
                    and interface_name != prop._dbus_interface)):
604
 
                continue
605
 
            return prop
606
 
        # No such property
607
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
 
                                   + interface_name + "."
609
 
                                   + property_name)
610
 
    
611
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
612
 
                         out_signature="v")
613
 
    def Get(self, interface_name, property_name):
614
 
        """Standard D-Bus property Get() method, see D-Bus standard.
615
 
        """
616
 
        prop = self._get_dbus_property(interface_name, property_name)
617
 
        if prop._dbus_access == "write":
618
 
            raise DBusPropertyAccessException(property_name)
619
 
        value = prop()
620
 
        if not hasattr(value, "variant_level"):
621
 
            return value
622
 
        return type(value)(value, variant_level=value.variant_level+1)
623
 
    
624
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
625
 
    def Set(self, interface_name, property_name, value):
626
 
        """Standard D-Bus property Set() method, see D-Bus standard.
627
 
        """
628
 
        prop = self._get_dbus_property(interface_name, property_name)
629
 
        if prop._dbus_access == "read":
630
 
            raise DBusPropertyAccessException(property_name)
631
 
        if prop._dbus_get_args_options["byte_arrays"]:
632
 
            # The byte_arrays option is not supported yet on
633
 
            # signatures other than "ay".
634
 
            if prop._dbus_signature != "ay":
635
 
                raise ValueError
636
 
            value = dbus.ByteArray(''.join(unichr(byte)
637
 
                                           for byte in value))
638
 
        prop(value)
639
 
    
640
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
 
                         out_signature="a{sv}")
642
 
    def GetAll(self, interface_name):
643
 
        """Standard D-Bus property GetAll() method, see D-Bus
644
 
        standard.
645
 
 
646
 
        Note: Will not include properties with access="write".
647
 
        """
648
 
        all = {}
649
 
        for name, prop in self._get_all_dbus_properties():
650
 
            if (interface_name
651
 
                and interface_name != prop._dbus_interface):
652
 
                # Interface non-empty but did not match
653
 
                continue
654
 
            # Ignore write-only properties
655
 
            if prop._dbus_access == "write":
656
 
                continue
657
 
            value = prop()
658
 
            if not hasattr(value, "variant_level"):
659
 
                all[name] = value
660
 
                continue
661
 
            all[name] = type(value)(value, variant_level=
662
 
                                    value.variant_level+1)
663
 
        return dbus.Dictionary(all, signature="sv")
664
 
    
665
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
666
 
                         out_signature="s",
667
 
                         path_keyword='object_path',
668
 
                         connection_keyword='connection')
669
 
    def Introspect(self, object_path, connection):
670
 
        """Standard D-Bus method, overloaded to insert property tags.
671
 
        """
672
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
673
 
                                                   connection)
674
 
        try:
675
 
            document = xml.dom.minidom.parseString(xmlstring)
676
 
            def make_tag(document, name, prop):
677
 
                e = document.createElement("property")
678
 
                e.setAttribute("name", name)
679
 
                e.setAttribute("type", prop._dbus_signature)
680
 
                e.setAttribute("access", prop._dbus_access)
681
 
                return e
682
 
            for if_tag in document.getElementsByTagName("interface"):
683
 
                for tag in (make_tag(document, name, prop)
684
 
                            for name, prop
685
 
                            in self._get_all_dbus_properties()
686
 
                            if prop._dbus_interface
687
 
                            == if_tag.getAttribute("name")):
688
 
                    if_tag.appendChild(tag)
689
 
                # Add the names to the return values for the
690
 
                # "org.freedesktop.DBus.Properties" methods
691
 
                if (if_tag.getAttribute("name")
692
 
                    == "org.freedesktop.DBus.Properties"):
693
 
                    for cn in if_tag.getElementsByTagName("method"):
694
 
                        if cn.getAttribute("name") == "Get":
695
 
                            for arg in cn.getElementsByTagName("arg"):
696
 
                                if (arg.getAttribute("direction")
697
 
                                    == "out"):
698
 
                                    arg.setAttribute("name", "value")
699
 
                        elif cn.getAttribute("name") == "GetAll":
700
 
                            for arg in cn.getElementsByTagName("arg"):
701
 
                                if (arg.getAttribute("direction")
702
 
                                    == "out"):
703
 
                                    arg.setAttribute("name", "props")
704
 
            xmlstring = document.toxml("utf-8")
705
 
            document.unlink()
706
 
        except (AttributeError, xml.dom.DOMException,
707
 
                xml.parsers.expat.ExpatError), error:
708
 
            logger.error("Failed to override Introspection method",
709
 
                         error)
710
 
        return xmlstring
711
 
 
712
 
 
713
 
class ClientDBus(Client, DBusObjectWithProperties):
714
 
    """A Client class using D-Bus
715
 
    
716
 
    Attributes:
717
 
    dbus_object_path: dbus.ObjectPath
718
 
    bus: dbus.SystemBus()
719
 
    """
720
 
    
721
 
    runtime_expansions = (Client.runtime_expansions
722
 
                          + ("dbus_object_path",))
723
 
    
724
 
    # dbus.service.Object doesn't use super(), so we can't either.
725
 
    
726
 
    def __init__(self, bus = None, *args, **kwargs):
727
 
        self._approvals_pending = 0
728
 
        self.bus = bus
729
 
        Client.__init__(self, *args, **kwargs)
730
 
        # Only now, when this client is initialized, can it show up on
731
 
        # the D-Bus
732
 
        client_object_name = unicode(self.name).translate(
733
 
            {ord("."): ord("_"),
734
 
             ord("-"): ord("_")})
735
 
        self.dbus_object_path = (dbus.ObjectPath
736
 
                                 ("/clients/" + client_object_name))
737
 
        DBusObjectWithProperties.__init__(self, self.bus,
738
 
                                          self.dbus_object_path)
739
 
        
740
 
    def _get_approvals_pending(self):
741
 
        return self._approvals_pending
742
 
    def _set_approvals_pending(self, value):
743
 
        old_value = self._approvals_pending
744
 
        self._approvals_pending = value
745
 
        bval = bool(value)
746
 
        if (hasattr(self, "dbus_object_path")
747
 
            and bval is not bool(old_value)):
748
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
749
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
750
 
                                 dbus_bool)
751
 
 
752
 
    approvals_pending = property(_get_approvals_pending,
753
 
                                 _set_approvals_pending)
754
 
    del _get_approvals_pending, _set_approvals_pending
755
 
    
756
 
    @staticmethod
757
 
    def _datetime_to_dbus(dt, variant_level=0):
758
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
759
 
        return dbus.String(dt.isoformat(),
760
 
                           variant_level=variant_level)
761
 
    
762
 
    def enable(self):
763
 
        oldstate = getattr(self, "enabled", False)
764
 
        r = Client.enable(self)
765
 
        if oldstate != self.enabled:
766
 
            # Emit D-Bus signals
767
 
            self.PropertyChanged(dbus.String("Enabled"),
768
 
                                 dbus.Boolean(True, variant_level=1))
769
 
            self.PropertyChanged(
770
 
                dbus.String("LastEnabled"),
771
 
                self._datetime_to_dbus(self.last_enabled,
772
 
                                       variant_level=1))
773
 
        return r
774
 
    
775
 
    def disable(self, quiet = False):
776
 
        oldstate = getattr(self, "enabled", False)
777
 
        r = Client.disable(self, quiet=quiet)
778
 
        if not quiet and oldstate != self.enabled:
779
 
            # Emit D-Bus signal
780
 
            self.PropertyChanged(dbus.String("Enabled"),
781
 
                                 dbus.Boolean(False, variant_level=1))
782
 
        return r
783
 
    
784
 
    def __del__(self, *args, **kwargs):
785
 
        try:
786
 
            self.remove_from_connection()
787
 
        except LookupError:
788
 
            pass
789
 
        if hasattr(DBusObjectWithProperties, "__del__"):
790
 
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
791
 
        Client.__del__(self, *args, **kwargs)
792
 
    
793
 
    def checker_callback(self, pid, condition, command,
794
 
                         *args, **kwargs):
795
 
        self.checker_callback_tag = None
796
 
        self.checker = None
797
 
        # Emit D-Bus signal
798
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
799
 
                             dbus.Boolean(False, variant_level=1))
800
 
        if os.WIFEXITED(condition):
801
 
            exitstatus = os.WEXITSTATUS(condition)
802
 
            # Emit D-Bus signal
803
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
804
 
                                  dbus.Int64(condition),
805
 
                                  dbus.String(command))
806
 
        else:
807
 
            # Emit D-Bus signal
808
 
            self.CheckerCompleted(dbus.Int16(-1),
809
 
                                  dbus.Int64(condition),
810
 
                                  dbus.String(command))
811
 
        
812
 
        return Client.checker_callback(self, pid, condition, command,
813
 
                                       *args, **kwargs)
814
 
    
815
 
    def checked_ok(self, *args, **kwargs):
816
 
        r = Client.checked_ok(self, *args, **kwargs)
817
 
        # Emit D-Bus signal
818
 
        self.PropertyChanged(
819
 
            dbus.String("LastCheckedOK"),
820
 
            (self._datetime_to_dbus(self.last_checked_ok,
821
 
                                    variant_level=1)))
822
 
        return r
823
 
    
824
 
    def need_approval(self, *args, **kwargs):
825
 
        r = Client.need_approval(self, *args, **kwargs)
826
 
        # Emit D-Bus signal
827
 
        self.PropertyChanged(
828
 
            dbus.String("LastApprovalRequest"),
829
 
            (self._datetime_to_dbus(self.last_approval_request,
830
 
                                    variant_level=1)))
831
 
        return r
832
 
    
833
 
    def start_checker(self, *args, **kwargs):
834
 
        old_checker = self.checker
835
 
        if self.checker is not None:
836
 
            old_checker_pid = self.checker.pid
837
 
        else:
838
 
            old_checker_pid = None
839
 
        r = Client.start_checker(self, *args, **kwargs)
840
 
        # Only if new checker process was started
841
 
        if (self.checker is not None
842
 
            and old_checker_pid != self.checker.pid):
843
 
            # Emit D-Bus signal
844
 
            self.CheckerStarted(self.current_checker_command)
845
 
            self.PropertyChanged(
846
 
                dbus.String("CheckerRunning"),
847
 
                dbus.Boolean(True, variant_level=1))
848
 
        return r
849
 
    
850
 
    def stop_checker(self, *args, **kwargs):
851
 
        old_checker = getattr(self, "checker", None)
852
 
        r = Client.stop_checker(self, *args, **kwargs)
853
 
        if (old_checker is not None
854
 
            and getattr(self, "checker", None) is None):
855
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
856
 
                                 dbus.Boolean(False, variant_level=1))
857
 
        return r
858
 
 
859
 
    def _reset_approved(self):
860
 
        self._approved = None
861
 
        return False
862
 
    
863
 
    def approve(self, value=True):
864
 
        self.send_changedstate()
865
 
        self._approved = value
866
 
        gobject.timeout_add(self._timedelta_to_milliseconds
867
 
                            (self.approval_duration),
868
 
                            self._reset_approved)
869
 
    
870
 
    
871
 
    ## D-Bus methods, signals & properties
872
 
    _interface = "se.bsnet.fukt.Mandos.Client"
873
 
    
874
 
    ## Signals
 
460
        if self.use_dbus:
 
461
            self.PropertyChanged(dbus.String(u"checker_running"),
 
462
                                 dbus.Boolean(False, variant_level=1))
 
463
    
 
464
    def still_valid(self):
 
465
        """Has the timeout not yet passed for this client?"""
 
466
        if not getattr(self, "enabled", False):
 
467
            return False
 
468
        now = datetime.datetime.utcnow()
 
469
        if self.last_checked_ok is None:
 
470
            return now < (self.created + self.timeout)
 
471
        else:
 
472
            return now < (self.last_checked_ok + self.timeout)
 
473
    
 
474
    ## D-Bus methods & signals
 
475
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
476
    
 
477
    # CheckedOK - method
 
478
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
479
    CheckedOK.__name__ = "CheckedOK"
875
480
    
876
481
    # CheckerCompleted - signal
877
482
    @dbus.service.signal(_interface, signature="nxs")
885
490
        "D-Bus signal"
886
491
        pass
887
492
    
 
493
    # GetAllProperties - method
 
494
    @dbus.service.method(_interface, out_signature="a{sv}")
 
495
    def GetAllProperties(self):
 
496
        "D-Bus method"
 
497
        return dbus.Dictionary({
 
498
                dbus.String("name"):
 
499
                    dbus.String(self.name, variant_level=1),
 
500
                dbus.String("fingerprint"):
 
501
                    dbus.String(self.fingerprint, variant_level=1),
 
502
                dbus.String("host"):
 
503
                    dbus.String(self.host, variant_level=1),
 
504
                dbus.String("created"):
 
505
                    _datetime_to_dbus(self.created, variant_level=1),
 
506
                dbus.String("last_enabled"):
 
507
                    (_datetime_to_dbus(self.last_enabled,
 
508
                                       variant_level=1)
 
509
                     if self.last_enabled is not None
 
510
                     else dbus.Boolean(False, variant_level=1)),
 
511
                dbus.String("enabled"):
 
512
                    dbus.Boolean(self.enabled, variant_level=1),
 
513
                dbus.String("last_checked_ok"):
 
514
                    (_datetime_to_dbus(self.last_checked_ok,
 
515
                                       variant_level=1)
 
516
                     if self.last_checked_ok is not None
 
517
                     else dbus.Boolean (False, variant_level=1)),
 
518
                dbus.String("timeout"):
 
519
                    dbus.UInt64(self.timeout_milliseconds(),
 
520
                                variant_level=1),
 
521
                dbus.String("interval"):
 
522
                    dbus.UInt64(self.interval_milliseconds(),
 
523
                                variant_level=1),
 
524
                dbus.String("checker"):
 
525
                    dbus.String(self.checker_command,
 
526
                                variant_level=1),
 
527
                dbus.String("checker_running"):
 
528
                    dbus.Boolean(self.checker is not None,
 
529
                                 variant_level=1),
 
530
                dbus.String("object_path"):
 
531
                    dbus.ObjectPath(self.dbus_object_path,
 
532
                                    variant_level=1)
 
533
                }, signature="sv")
 
534
    
 
535
    # IsStillValid - method
 
536
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
537
                    (still_valid))
 
538
    IsStillValid.__name__ = "IsStillValid"
 
539
    
888
540
    # PropertyChanged - signal
889
541
    @dbus.service.signal(_interface, signature="sv")
890
542
    def PropertyChanged(self, property, value):
891
543
        "D-Bus signal"
892
544
        pass
893
545
    
894
 
    # GotSecret - signal
 
546
    # ReceivedSecret - signal
895
547
    @dbus.service.signal(_interface)
896
 
    def GotSecret(self):
897
 
        """D-Bus signal
898
 
        Is sent after a successful transfer of secret from the Mandos
899
 
        server to mandos-client
900
 
        """
 
548
    def ReceivedSecret(self):
 
549
        "D-Bus signal"
901
550
        pass
902
551
    
903
552
    # Rejected - signal
904
 
    @dbus.service.signal(_interface, signature="s")
905
 
    def Rejected(self, reason):
 
553
    @dbus.service.signal(_interface)
 
554
    def Rejected(self):
906
555
        "D-Bus signal"
907
556
        pass
908
557
    
909
 
    # NeedApproval - signal
910
 
    @dbus.service.signal(_interface, signature="tb")
911
 
    def NeedApproval(self, timeout, default):
912
 
        "D-Bus signal"
913
 
        return self.need_approval()
914
 
    
915
 
    ## Methods
916
 
    
917
 
    # Approve - method
918
 
    @dbus.service.method(_interface, in_signature="b")
919
 
    def Approve(self, value):
920
 
        self.approve(value)
921
 
    
922
 
    # CheckedOK - method
923
 
    @dbus.service.method(_interface)
924
 
    def CheckedOK(self):
925
 
        return self.checked_ok()
 
558
    # SetChecker - method
 
559
    @dbus.service.method(_interface, in_signature="s")
 
560
    def SetChecker(self, checker):
 
561
        "D-Bus setter method"
 
562
        self.checker_command = checker
 
563
        # Emit D-Bus signal
 
564
        self.PropertyChanged(dbus.String(u"checker"),
 
565
                             dbus.String(self.checker_command,
 
566
                                         variant_level=1))
 
567
    
 
568
    # SetHost - method
 
569
    @dbus.service.method(_interface, in_signature="s")
 
570
    def SetHost(self, host):
 
571
        "D-Bus setter method"
 
572
        self.host = host
 
573
        # Emit D-Bus signal
 
574
        self.PropertyChanged(dbus.String(u"host"),
 
575
                             dbus.String(self.host, variant_level=1))
 
576
    
 
577
    # SetInterval - method
 
578
    @dbus.service.method(_interface, in_signature="t")
 
579
    def SetInterval(self, milliseconds):
 
580
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
581
        # Emit D-Bus signal
 
582
        self.PropertyChanged(dbus.String(u"interval"),
 
583
                             (dbus.UInt64(self.interval_milliseconds(),
 
584
                                          variant_level=1)))
 
585
    
 
586
    # SetSecret - method
 
587
    @dbus.service.method(_interface, in_signature="ay",
 
588
                         byte_arrays=True)
 
589
    def SetSecret(self, secret):
 
590
        "D-Bus setter method"
 
591
        self.secret = str(secret)
 
592
    
 
593
    # SetTimeout - method
 
594
    @dbus.service.method(_interface, in_signature="t")
 
595
    def SetTimeout(self, milliseconds):
 
596
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
597
        # Emit D-Bus signal
 
598
        self.PropertyChanged(dbus.String(u"timeout"),
 
599
                             (dbus.UInt64(self.timeout_milliseconds(),
 
600
                                          variant_level=1)))
926
601
    
927
602
    # Enable - method
928
 
    @dbus.service.method(_interface)
929
 
    def Enable(self):
930
 
        "D-Bus method"
931
 
        self.enable()
 
603
    Enable = dbus.service.method(_interface)(enable)
 
604
    Enable.__name__ = "Enable"
932
605
    
933
606
    # StartChecker - method
934
607
    @dbus.service.method(_interface)
943
616
        self.disable()
944
617
    
945
618
    # StopChecker - method
946
 
    @dbus.service.method(_interface)
947
 
    def StopChecker(self):
948
 
        self.stop_checker()
949
 
    
950
 
    ## Properties
951
 
    
952
 
    # ApprovalPending - property
953
 
    @dbus_service_property(_interface, signature="b", access="read")
954
 
    def ApprovalPending_dbus_property(self):
955
 
        return dbus.Boolean(bool(self.approvals_pending))
956
 
    
957
 
    # ApprovedByDefault - property
958
 
    @dbus_service_property(_interface, signature="b",
959
 
                           access="readwrite")
960
 
    def ApprovedByDefault_dbus_property(self, value=None):
961
 
        if value is None:       # get
962
 
            return dbus.Boolean(self.approved_by_default)
963
 
        self.approved_by_default = bool(value)
964
 
        # Emit D-Bus signal
965
 
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
966
 
                             dbus.Boolean(value, variant_level=1))
967
 
    
968
 
    # ApprovalDelay - property
969
 
    @dbus_service_property(_interface, signature="t",
970
 
                           access="readwrite")
971
 
    def ApprovalDelay_dbus_property(self, value=None):
972
 
        if value is None:       # get
973
 
            return dbus.UInt64(self.approval_delay_milliseconds())
974
 
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
 
        # Emit D-Bus signal
976
 
        self.PropertyChanged(dbus.String("ApprovalDelay"),
977
 
                             dbus.UInt64(value, variant_level=1))
978
 
    
979
 
    # ApprovalDuration - property
980
 
    @dbus_service_property(_interface, signature="t",
981
 
                           access="readwrite")
982
 
    def ApprovalDuration_dbus_property(self, value=None):
983
 
        if value is None:       # get
984
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
985
 
                    self.approval_duration))
986
 
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
 
        # Emit D-Bus signal
988
 
        self.PropertyChanged(dbus.String("ApprovalDuration"),
989
 
                             dbus.UInt64(value, variant_level=1))
990
 
    
991
 
    # Name - property
992
 
    @dbus_service_property(_interface, signature="s", access="read")
993
 
    def Name_dbus_property(self):
994
 
        return dbus.String(self.name)
995
 
    
996
 
    # Fingerprint - property
997
 
    @dbus_service_property(_interface, signature="s", access="read")
998
 
    def Fingerprint_dbus_property(self):
999
 
        return dbus.String(self.fingerprint)
1000
 
    
1001
 
    # Host - property
1002
 
    @dbus_service_property(_interface, signature="s",
1003
 
                           access="readwrite")
1004
 
    def Host_dbus_property(self, value=None):
1005
 
        if value is None:       # get
1006
 
            return dbus.String(self.host)
1007
 
        self.host = value
1008
 
        # Emit D-Bus signal
1009
 
        self.PropertyChanged(dbus.String("Host"),
1010
 
                             dbus.String(value, variant_level=1))
1011
 
    
1012
 
    # Created - property
1013
 
    @dbus_service_property(_interface, signature="s", access="read")
1014
 
    def Created_dbus_property(self):
1015
 
        return dbus.String(self._datetime_to_dbus(self.created))
1016
 
    
1017
 
    # LastEnabled - property
1018
 
    @dbus_service_property(_interface, signature="s", access="read")
1019
 
    def LastEnabled_dbus_property(self):
1020
 
        if self.last_enabled is None:
1021
 
            return dbus.String("")
1022
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1023
 
    
1024
 
    # Enabled - property
1025
 
    @dbus_service_property(_interface, signature="b",
1026
 
                           access="readwrite")
1027
 
    def Enabled_dbus_property(self, value=None):
1028
 
        if value is None:       # get
1029
 
            return dbus.Boolean(self.enabled)
1030
 
        if value:
1031
 
            self.enable()
1032
 
        else:
1033
 
            self.disable()
1034
 
    
1035
 
    # LastCheckedOK - property
1036
 
    @dbus_service_property(_interface, signature="s",
1037
 
                           access="readwrite")
1038
 
    def LastCheckedOK_dbus_property(self, value=None):
1039
 
        if value is not None:
1040
 
            self.checked_ok()
1041
 
            return
1042
 
        if self.last_checked_ok is None:
1043
 
            return dbus.String("")
1044
 
        return dbus.String(self._datetime_to_dbus(self
1045
 
                                                  .last_checked_ok))
1046
 
    
1047
 
    # LastApprovalRequest - property
1048
 
    @dbus_service_property(_interface, signature="s", access="read")
1049
 
    def LastApprovalRequest_dbus_property(self):
1050
 
        if self.last_approval_request is None:
1051
 
            return dbus.String("")
1052
 
        return dbus.String(self.
1053
 
                           _datetime_to_dbus(self
1054
 
                                             .last_approval_request))
1055
 
    
1056
 
    # Timeout - property
1057
 
    @dbus_service_property(_interface, signature="t",
1058
 
                           access="readwrite")
1059
 
    def Timeout_dbus_property(self, value=None):
1060
 
        if value is None:       # get
1061
 
            return dbus.UInt64(self.timeout_milliseconds())
1062
 
        self.timeout = datetime.timedelta(0, 0, 0, value)
1063
 
        # Emit D-Bus signal
1064
 
        self.PropertyChanged(dbus.String("Timeout"),
1065
 
                             dbus.UInt64(value, variant_level=1))
1066
 
        if getattr(self, "disable_initiator_tag", None) is None:
1067
 
            return
1068
 
        # Reschedule timeout
1069
 
        gobject.source_remove(self.disable_initiator_tag)
1070
 
        self.disable_initiator_tag = None
1071
 
        time_to_die = (self.
1072
 
                       _timedelta_to_milliseconds((self
1073
 
                                                   .last_checked_ok
1074
 
                                                   + self.timeout)
1075
 
                                                  - datetime.datetime
1076
 
                                                  .utcnow()))
1077
 
        if time_to_die <= 0:
1078
 
            # The timeout has passed
1079
 
            self.disable()
1080
 
        else:
1081
 
            self.disable_initiator_tag = (gobject.timeout_add
1082
 
                                          (time_to_die, self.disable))
1083
 
    
1084
 
    # Interval - property
1085
 
    @dbus_service_property(_interface, signature="t",
1086
 
                           access="readwrite")
1087
 
    def Interval_dbus_property(self, value=None):
1088
 
        if value is None:       # get
1089
 
            return dbus.UInt64(self.interval_milliseconds())
1090
 
        self.interval = datetime.timedelta(0, 0, 0, value)
1091
 
        # Emit D-Bus signal
1092
 
        self.PropertyChanged(dbus.String("Interval"),
1093
 
                             dbus.UInt64(value, variant_level=1))
1094
 
        if getattr(self, "checker_initiator_tag", None) is None:
1095
 
            return
1096
 
        # Reschedule checker run
1097
 
        gobject.source_remove(self.checker_initiator_tag)
1098
 
        self.checker_initiator_tag = (gobject.timeout_add
1099
 
                                      (value, self.start_checker))
1100
 
        self.start_checker()    # Start one now, too
1101
 
 
1102
 
    # Checker - property
1103
 
    @dbus_service_property(_interface, signature="s",
1104
 
                           access="readwrite")
1105
 
    def Checker_dbus_property(self, value=None):
1106
 
        if value is None:       # get
1107
 
            return dbus.String(self.checker_command)
1108
 
        self.checker_command = value
1109
 
        # Emit D-Bus signal
1110
 
        self.PropertyChanged(dbus.String("Checker"),
1111
 
                             dbus.String(self.checker_command,
1112
 
                                         variant_level=1))
1113
 
    
1114
 
    # CheckerRunning - property
1115
 
    @dbus_service_property(_interface, signature="b",
1116
 
                           access="readwrite")
1117
 
    def CheckerRunning_dbus_property(self, value=None):
1118
 
        if value is None:       # get
1119
 
            return dbus.Boolean(self.checker is not None)
1120
 
        if value:
1121
 
            self.start_checker()
1122
 
        else:
1123
 
            self.stop_checker()
1124
 
    
1125
 
    # ObjectPath - property
1126
 
    @dbus_service_property(_interface, signature="o", access="read")
1127
 
    def ObjectPath_dbus_property(self):
1128
 
        return self.dbus_object_path # is already a dbus.ObjectPath
1129
 
    
1130
 
    # Secret = property
1131
 
    @dbus_service_property(_interface, signature="ay",
1132
 
                           access="write", byte_arrays=True)
1133
 
    def Secret_dbus_property(self, value):
1134
 
        self.secret = str(value)
 
619
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
620
    StopChecker.__name__ = "StopChecker"
1135
621
    
1136
622
    del _interface
1137
623
 
1138
624
 
1139
 
class ProxyClient(object):
1140
 
    def __init__(self, child_pipe, fpr, address):
1141
 
        self._pipe = child_pipe
1142
 
        self._pipe.send(('init', fpr, address))
1143
 
        if not self._pipe.recv():
1144
 
            raise KeyError()
1145
 
 
1146
 
    def __getattribute__(self, name):
1147
 
        if(name == '_pipe'):
1148
 
            return super(ProxyClient, self).__getattribute__(name)
1149
 
        self._pipe.send(('getattr', name))
1150
 
        data = self._pipe.recv()
1151
 
        if data[0] == 'data':
1152
 
            return data[1]
1153
 
        if data[0] == 'function':
1154
 
            def func(*args, **kwargs):
1155
 
                self._pipe.send(('funcall', name, args, kwargs))
1156
 
                return self._pipe.recv()[1]
1157
 
            return func
1158
 
 
1159
 
    def __setattr__(self, name, value):
1160
 
        if(name == '_pipe'):
1161
 
            return super(ProxyClient, self).__setattr__(name, value)
1162
 
        self._pipe.send(('setattr', name, value))
1163
 
 
1164
 
 
1165
 
class ClientHandler(socketserver.BaseRequestHandler, object):
1166
 
    """A class to handle client connections.
1167
 
    
1168
 
    Instantiated once for each connection to handle it.
 
625
def peer_certificate(session):
 
626
    "Return the peer's OpenPGP certificate as a bytestring"
 
627
    # If not an OpenPGP certificate...
 
628
    if (gnutls.library.functions
 
629
        .gnutls_certificate_type_get(session._c_object)
 
630
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
631
        # ...do the normal thing
 
632
        return session.peer_certificate
 
633
    list_size = ctypes.c_uint(1)
 
634
    cert_list = (gnutls.library.functions
 
635
                 .gnutls_certificate_get_peers
 
636
                 (session._c_object, ctypes.byref(list_size)))
 
637
    if not bool(cert_list) and list_size.value != 0:
 
638
        raise gnutls.errors.GNUTLSError("error getting peer"
 
639
                                        " certificate")
 
640
    if list_size.value == 0:
 
641
        return None
 
642
    cert = cert_list[0]
 
643
    return ctypes.string_at(cert.data, cert.size)
 
644
 
 
645
 
 
646
def fingerprint(openpgp):
 
647
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
648
    # New GnuTLS "datum" with the OpenPGP public key
 
649
    datum = (gnutls.library.types
 
650
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
651
                                         ctypes.POINTER
 
652
                                         (ctypes.c_ubyte)),
 
653
                             ctypes.c_uint(len(openpgp))))
 
654
    # New empty GnuTLS certificate
 
655
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
656
    (gnutls.library.functions
 
657
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
658
    # Import the OpenPGP public key into the certificate
 
659
    (gnutls.library.functions
 
660
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
661
                                gnutls.library.constants
 
662
                                .GNUTLS_OPENPGP_FMT_RAW))
 
663
    # Verify the self signature in the key
 
664
    crtverify = ctypes.c_uint()
 
665
    (gnutls.library.functions
 
666
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
667
    if crtverify.value != 0:
 
668
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
669
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
670
    # New buffer for the fingerprint
 
671
    buf = ctypes.create_string_buffer(20)
 
672
    buf_len = ctypes.c_size_t()
 
673
    # Get the fingerprint from the certificate into the buffer
 
674
    (gnutls.library.functions
 
675
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
676
                                         ctypes.byref(buf_len)))
 
677
    # Deinit the certificate
 
678
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
679
    # Convert the buffer to a Python bytestring
 
680
    fpr = ctypes.string_at(buf, buf_len.value)
 
681
    # Convert the bytestring to hexadecimal notation
 
682
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
683
    return hex_fpr
 
684
 
 
685
 
 
686
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
687
    """A TCP request handler class.
 
688
    Instantiated by IPv6_TCPServer for each request to handle it.
1169
689
    Note: This will run in its own forked process."""
1170
690
    
1171
691
    def handle(self):
1172
 
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1173
 
            logger.info("TCP connection from: %s",
1174
 
                        unicode(self.client_address))
1175
 
            logger.debug("Pipe FD: %d",
1176
 
                         self.server.child_pipe.fileno())
1177
 
 
 
692
        logger.info(u"TCP connection from: %s",
 
693
                    unicode(self.client_address))
 
694
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
 
695
        # Open IPC pipe to parent process
 
696
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
1178
697
            session = (gnutls.connection
1179
698
                       .ClientSession(self.request,
1180
699
                                      gnutls.connection
1181
700
                                      .X509Credentials()))
1182
 
 
 
701
            
 
702
            line = self.request.makefile().readline()
 
703
            logger.debug(u"Protocol version: %r", line)
 
704
            try:
 
705
                if int(line.strip().split()[0]) > 1:
 
706
                    raise RuntimeError
 
707
            except (ValueError, IndexError, RuntimeError), error:
 
708
                logger.error(u"Unknown protocol version: %s", error)
 
709
                return
 
710
            
1183
711
            # Note: gnutls.connection.X509Credentials is really a
1184
712
            # generic GnuTLS certificate credentials object so long as
1185
713
            # no X.509 keys are added to it.  Therefore, we can use it
1186
714
            # here despite using OpenPGP certificates.
1187
 
 
 
715
            
1188
716
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
 
            #                      "+AES-256-CBC", "+SHA1",
1190
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1191
 
            #                      "+DHE-DSS"))
 
717
            #                     "+AES-256-CBC", "+SHA1",
 
718
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
 
719
            #                     "+DHE-DSS"))
1192
720
            # Use a fallback default, since this MUST be set.
1193
 
            priority = self.server.gnutls_priority
1194
 
            if priority is None:
1195
 
                priority = "NORMAL"
 
721
            priority = self.server.settings.get("priority", "NORMAL")
1196
722
            (gnutls.library.functions
1197
723
             .gnutls_priority_set_direct(session._c_object,
1198
724
                                         priority, None))
1199
 
 
1200
 
            # Start communication using the Mandos protocol
1201
 
            # Get protocol number
1202
 
            line = self.request.makefile().readline()
1203
 
            logger.debug("Protocol version: %r", line)
1204
 
            try:
1205
 
                if int(line.strip().split()[0]) > 1:
1206
 
                    raise RuntimeError
1207
 
            except (ValueError, IndexError, RuntimeError), error:
1208
 
                logger.error("Unknown protocol version: %s", error)
1209
 
                return
1210
 
 
1211
 
            # Start GnuTLS connection
 
725
            
1212
726
            try:
1213
727
                session.handshake()
1214
728
            except gnutls.errors.GNUTLSError, error:
1215
 
                logger.warning("Handshake failed: %s", error)
 
729
                logger.warning(u"Handshake failed: %s", error)
1216
730
                # Do not run session.bye() here: the session is not
1217
731
                # established.  Just abandon the request.
1218
732
                return
1219
 
            logger.debug("Handshake succeeded")
1220
 
 
1221
 
            approval_required = False
 
733
            logger.debug(u"Handshake succeeded")
1222
734
            try:
1223
 
                try:
1224
 
                    fpr = self.fingerprint(self.peer_certificate
1225
 
                                           (session))
1226
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1227
 
                    logger.warning("Bad certificate: %s", error)
1228
 
                    return
1229
 
                logger.debug("Fingerprint: %s", fpr)
1230
 
 
1231
 
                try:
1232
 
                    client = ProxyClient(child_pipe, fpr,
1233
 
                                         self.client_address)
1234
 
                except KeyError:
1235
 
                    return
1236
 
                
1237
 
                if client.approval_delay:
1238
 
                    delay = client.approval_delay
1239
 
                    client.approvals_pending += 1
1240
 
                    approval_required = True
1241
 
                
1242
 
                while True:
1243
 
                    if not client.enabled:
1244
 
                        logger.warning("Client %s is disabled",
1245
 
                                       client.name)
1246
 
                        if self.server.use_dbus:
1247
 
                            # Emit D-Bus signal
1248
 
                            client.Rejected("Disabled")                    
1249
 
                        return
1250
 
                    
1251
 
                    if client._approved or not client.approval_delay:
1252
 
                        #We are approved or approval is disabled
1253
 
                        break
1254
 
                    elif client._approved is None:
1255
 
                        logger.info("Client %s needs approval",
1256
 
                                    client.name)
1257
 
                        if self.server.use_dbus:
1258
 
                            # Emit D-Bus signal
1259
 
                            client.NeedApproval(
1260
 
                                client.approval_delay_milliseconds(),
1261
 
                                client.approved_by_default)
1262
 
                    else:
1263
 
                        logger.warning("Client %s was not approved",
1264
 
                                       client.name)
1265
 
                        if self.server.use_dbus:
1266
 
                            # Emit D-Bus signal
1267
 
                            client.Rejected("Denied")
1268
 
                        return
1269
 
                    
1270
 
                    #wait until timeout or approved
1271
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1272
 
                    time = datetime.datetime.now()
1273
 
                    client.changedstate.acquire()
1274
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1275
 
                    client.changedstate.release()
1276
 
                    time2 = datetime.datetime.now()
1277
 
                    if (time2 - time) >= delay:
1278
 
                        if not client.approved_by_default:
1279
 
                            logger.warning("Client %s timed out while"
1280
 
                                           " waiting for approval",
1281
 
                                           client.name)
1282
 
                            if self.server.use_dbus:
1283
 
                                # Emit D-Bus signal
1284
 
                                client.Rejected("Approval timed out")
1285
 
                            return
1286
 
                        else:
1287
 
                            break
1288
 
                    else:
1289
 
                        delay -= time2 - time
1290
 
                
1291
 
                sent_size = 0
1292
 
                while sent_size < len(client.secret):
1293
 
                    try:
1294
 
                        sent = session.send(client.secret[sent_size:])
1295
 
                    except (gnutls.errors.GNUTLSError), error:
1296
 
                        logger.warning("gnutls send failed")
1297
 
                        return
1298
 
                    logger.debug("Sent: %d, remaining: %d",
1299
 
                                 sent, len(client.secret)
1300
 
                                 - (sent_size + sent))
1301
 
                    sent_size += sent
1302
 
 
1303
 
                logger.info("Sending secret to %s", client.name)
1304
 
                # bump the timeout as if seen
1305
 
                client.checked_ok()
1306
 
                if self.server.use_dbus:
1307
 
                    # Emit D-Bus signal
1308
 
                    client.GotSecret()
1309
 
            
1310
 
            finally:
1311
 
                if approval_required:
1312
 
                    client.approvals_pending -= 1
1313
 
                try:
1314
 
                    session.bye()
1315
 
                except (gnutls.errors.GNUTLSError), error:
1316
 
                    logger.warning("GnuTLS bye failed")
1317
 
    
1318
 
    @staticmethod
1319
 
    def peer_certificate(session):
1320
 
        "Return the peer's OpenPGP certificate as a bytestring"
1321
 
        # If not an OpenPGP certificate...
1322
 
        if (gnutls.library.functions
1323
 
            .gnutls_certificate_type_get(session._c_object)
1324
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1325
 
            # ...do the normal thing
1326
 
            return session.peer_certificate
1327
 
        list_size = ctypes.c_uint(1)
1328
 
        cert_list = (gnutls.library.functions
1329
 
                     .gnutls_certificate_get_peers
1330
 
                     (session._c_object, ctypes.byref(list_size)))
1331
 
        if not bool(cert_list) and list_size.value != 0:
1332
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1333
 
                                            " certificate")
1334
 
        if list_size.value == 0:
1335
 
            return None
1336
 
        cert = cert_list[0]
1337
 
        return ctypes.string_at(cert.data, cert.size)
1338
 
    
1339
 
    @staticmethod
1340
 
    def fingerprint(openpgp):
1341
 
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1342
 
        # New GnuTLS "datum" with the OpenPGP public key
1343
 
        datum = (gnutls.library.types
1344
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1345
 
                                             ctypes.POINTER
1346
 
                                             (ctypes.c_ubyte)),
1347
 
                                 ctypes.c_uint(len(openpgp))))
1348
 
        # New empty GnuTLS certificate
1349
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1350
 
        (gnutls.library.functions
1351
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1352
 
        # Import the OpenPGP public key into the certificate
1353
 
        (gnutls.library.functions
1354
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1355
 
                                    gnutls.library.constants
1356
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
1357
 
        # Verify the self signature in the key
1358
 
        crtverify = ctypes.c_uint()
1359
 
        (gnutls.library.functions
1360
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1361
 
                                         ctypes.byref(crtverify)))
1362
 
        if crtverify.value != 0:
1363
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1364
 
            raise (gnutls.errors.CertificateSecurityError
1365
 
                   ("Verify failed"))
1366
 
        # New buffer for the fingerprint
1367
 
        buf = ctypes.create_string_buffer(20)
1368
 
        buf_len = ctypes.c_size_t()
1369
 
        # Get the fingerprint from the certificate into the buffer
1370
 
        (gnutls.library.functions
1371
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1372
 
                                             ctypes.byref(buf_len)))
1373
 
        # Deinit the certificate
1374
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1375
 
        # Convert the buffer to a Python bytestring
1376
 
        fpr = ctypes.string_at(buf, buf_len.value)
1377
 
        # Convert the bytestring to hexadecimal notation
1378
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1379
 
        return hex_fpr
1380
 
 
1381
 
 
1382
 
class MultiprocessingMixIn(object):
1383
 
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1384
 
    def sub_process_main(self, request, address):
1385
 
        try:
1386
 
            self.finish_request(request, address)
1387
 
        except:
1388
 
            self.handle_error(request, address)
1389
 
        self.close_request(request)
1390
 
            
1391
 
    def process_request(self, request, address):
1392
 
        """Start a new process to process the request."""
1393
 
        multiprocessing.Process(target = self.sub_process_main,
1394
 
                                args = (request, address)).start()
1395
 
 
1396
 
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1397
 
    """ adds a pipe to the MixIn """
 
735
                fpr = fingerprint(peer_certificate(session))
 
736
            except (TypeError, gnutls.errors.GNUTLSError), error:
 
737
                logger.warning(u"Bad certificate: %s", error)
 
738
                session.bye()
 
739
                return
 
740
            logger.debug(u"Fingerprint: %s", fpr)
 
741
            
 
742
            for c in self.server.clients:
 
743
                if c.fingerprint == fpr:
 
744
                    client = c
 
745
                    break
 
746
            else:
 
747
                logger.warning(u"Client not found for fingerprint: %s",
 
748
                               fpr)
 
749
                ipc.write("NOTFOUND %s\n" % fpr)
 
750
                session.bye()
 
751
                return
 
752
            # Have to check if client.still_valid(), since it is
 
753
            # possible that the client timed out while establishing
 
754
            # the GnuTLS session.
 
755
            if not client.still_valid():
 
756
                logger.warning(u"Client %(name)s is invalid",
 
757
                               vars(client))
 
758
                ipc.write("INVALID %s\n" % client.name)
 
759
                session.bye()
 
760
                return
 
761
            ipc.write("SENDING %s\n" % client.name)
 
762
            sent_size = 0
 
763
            while sent_size < len(client.secret):
 
764
                sent = session.send(client.secret[sent_size:])
 
765
                logger.debug(u"Sent: %d, remaining: %d",
 
766
                             sent, len(client.secret)
 
767
                             - (sent_size + sent))
 
768
                sent_size += sent
 
769
            session.bye()
 
770
 
 
771
 
 
772
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
 
773
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
 
774
    Assumes a gobject.MainLoop event loop.
 
775
    """
1398
776
    def process_request(self, request, client_address):
1399
 
        """Overrides and wraps the original process_request().
1400
 
        
1401
 
        This function creates a new pipe in self.pipe
 
777
        """This overrides and wraps the original process_request().
 
778
        This function creates a new pipe in self.pipe 
1402
779
        """
1403
 
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1404
 
 
1405
 
        super(MultiprocessingMixInWithPipe,
 
780
        self.pipe = os.pipe()
 
781
        super(ForkingMixInWithPipe,
1406
782
              self).process_request(request, client_address)
1407
 
        self.child_pipe.close()
1408
 
        self.add_pipe(parent_pipe)
1409
 
 
1410
 
    def add_pipe(self, parent_pipe):
 
783
        os.close(self.pipe[1])  # close write end
 
784
        # Call "handle_ipc" for both data and EOF events
 
785
        gobject.io_add_watch(self.pipe[0],
 
786
                             gobject.IO_IN | gobject.IO_HUP,
 
787
                             self.handle_ipc)
 
788
    def handle_ipc(source, condition):
1411
789
        """Dummy function; override as necessary"""
1412
 
        raise NotImplementedError
1413
 
 
1414
 
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1415
 
                     socketserver.TCPServer, object):
 
790
        os.close(source)
 
791
        return False
 
792
 
 
793
 
 
794
class IPv6_TCPServer(ForkingMixInWithPipe,
 
795
                     SocketServer.TCPServer, object):
1416
796
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1417
 
    
1418
797
    Attributes:
 
798
        settings:       Server settings
 
799
        clients:        Set() of Client objects
1419
800
        enabled:        Boolean; whether this server is activated yet
1420
 
        interface:      None or a network interface name (string)
1421
 
        use_ipv6:       Boolean; to use IPv6 or not
1422
801
    """
1423
 
    def __init__(self, server_address, RequestHandlerClass,
1424
 
                 interface=None, use_ipv6=True):
1425
 
        self.interface = interface
1426
 
        if use_ipv6:
1427
 
            self.address_family = socket.AF_INET6
1428
 
        socketserver.TCPServer.__init__(self, server_address,
1429
 
                                        RequestHandlerClass)
 
802
    address_family = socket.AF_INET6
 
803
    def __init__(self, *args, **kwargs):
 
804
        if "settings" in kwargs:
 
805
            self.settings = kwargs["settings"]
 
806
            del kwargs["settings"]
 
807
        if "clients" in kwargs:
 
808
            self.clients = kwargs["clients"]
 
809
            del kwargs["clients"]
 
810
        if "use_ipv6" in kwargs:
 
811
            if not kwargs["use_ipv6"]:
 
812
                self.address_family = socket.AF_INET
 
813
            del kwargs["use_ipv6"]
 
814
        self.enabled = False
 
815
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
1430
816
    def server_bind(self):
1431
817
        """This overrides the normal server_bind() function
1432
818
        to bind to an interface if one was specified, and also NOT to
1433
819
        bind to an address or port if they were not specified."""
1434
 
        if self.interface is not None:
1435
 
            if SO_BINDTODEVICE is None:
1436
 
                logger.error("SO_BINDTODEVICE does not exist;"
1437
 
                             " cannot bind to interface %s",
1438
 
                             self.interface)
1439
 
            else:
1440
 
                try:
1441
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1442
 
                                           SO_BINDTODEVICE,
1443
 
                                           str(self.interface
1444
 
                                               + '\0'))
1445
 
                except socket.error, error:
1446
 
                    if error[0] == errno.EPERM:
1447
 
                        logger.error("No permission to"
1448
 
                                     " bind to interface %s",
1449
 
                                     self.interface)
1450
 
                    elif error[0] == errno.ENOPROTOOPT:
1451
 
                        logger.error("SO_BINDTODEVICE not available;"
1452
 
                                     " cannot bind to interface %s",
1453
 
                                     self.interface)
1454
 
                    else:
1455
 
                        raise
 
820
        if self.settings["interface"]:
 
821
            # 25 is from /usr/include/asm-i486/socket.h
 
822
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
 
823
            try:
 
824
                self.socket.setsockopt(socket.SOL_SOCKET,
 
825
                                       SO_BINDTODEVICE,
 
826
                                       self.settings["interface"])
 
827
            except socket.error, error:
 
828
                if error[0] == errno.EPERM:
 
829
                    logger.error(u"No permission to"
 
830
                                 u" bind to interface %s",
 
831
                                 self.settings["interface"])
 
832
                else:
 
833
                    raise
1456
834
        # Only bind(2) the socket if we really need to.
1457
835
        if self.server_address[0] or self.server_address[1]:
1458
836
            if not self.server_address[0]:
1465
843
            elif not self.server_address[1]:
1466
844
                self.server_address = (self.server_address[0],
1467
845
                                       0)
1468
 
#                 if self.interface:
 
846
#                 if self.settings["interface"]:
1469
847
#                     self.server_address = (self.server_address[0],
1470
848
#                                            0, # port
1471
849
#                                            0, # flowinfo
1472
850
#                                            if_nametoindex
1473
 
#                                            (self.interface))
1474
 
            return socketserver.TCPServer.server_bind(self)
1475
 
 
1476
 
 
1477
 
class MandosServer(IPv6_TCPServer):
1478
 
    """Mandos server.
1479
 
    
1480
 
    Attributes:
1481
 
        clients:        set of Client objects
1482
 
        gnutls_priority GnuTLS priority string
1483
 
        use_dbus:       Boolean; to emit D-Bus signals or not
1484
 
    
1485
 
    Assumes a gobject.MainLoop event loop.
1486
 
    """
1487
 
    def __init__(self, server_address, RequestHandlerClass,
1488
 
                 interface=None, use_ipv6=True, clients=None,
1489
 
                 gnutls_priority=None, use_dbus=True):
1490
 
        self.enabled = False
1491
 
        self.clients = clients
1492
 
        if self.clients is None:
1493
 
            self.clients = set()
1494
 
        self.use_dbus = use_dbus
1495
 
        self.gnutls_priority = gnutls_priority
1496
 
        IPv6_TCPServer.__init__(self, server_address,
1497
 
                                RequestHandlerClass,
1498
 
                                interface = interface,
1499
 
                                use_ipv6 = use_ipv6)
 
851
#                                            (self.settings
 
852
#                                             ["interface"]))
 
853
            return super(IPv6_TCPServer, self).server_bind()
1500
854
    def server_activate(self):
1501
855
        if self.enabled:
1502
 
            return socketserver.TCPServer.server_activate(self)
 
856
            return super(IPv6_TCPServer, self).server_activate()
1503
857
    def enable(self):
1504
858
        self.enabled = True
1505
 
    def add_pipe(self, parent_pipe):
1506
 
        # Call "handle_ipc" for both data and EOF events
1507
 
        gobject.io_add_watch(parent_pipe.fileno(),
1508
 
                             gobject.IO_IN | gobject.IO_HUP,
1509
 
                             functools.partial(self.handle_ipc,
1510
 
                                               parent_pipe = parent_pipe))
1511
 
        
1512
 
    def handle_ipc(self, source, condition, parent_pipe=None,
1513
 
                   client_object=None):
 
859
    def handle_ipc(self, source, condition, file_objects={}):
1514
860
        condition_names = {
1515
 
            gobject.IO_IN: "IN",   # There is data to read.
 
861
            gobject.IO_IN: "IN", # There is data to read.
1516
862
            gobject.IO_OUT: "OUT", # Data can be written (without
1517
 
                                    # blocking).
 
863
                                   # blocking).
1518
864
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1519
865
            gobject.IO_ERR: "ERR", # Error condition.
1520
866
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1521
 
                                    # broken, usually for pipes and
1522
 
                                    # sockets).
 
867
                                   # broken, usually for pipes and
 
868
                                   # sockets).
1523
869
            }
1524
870
        conditions_string = ' | '.join(name
1525
871
                                       for cond, name in
1526
872
                                       condition_names.iteritems()
1527
873
                                       if cond & condition)
1528
 
        # error or the other end of multiprocessing.Pipe has closed
1529
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
874
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
 
875
                     conditions_string)
 
876
        
 
877
        # Turn the pipe file descriptor into a Python file object
 
878
        if source not in file_objects:
 
879
            file_objects[source] = os.fdopen(source, "r", 1)
 
880
        
 
881
        # Read a line from the file object
 
882
        cmdline = file_objects[source].readline()
 
883
        if not cmdline:             # Empty line means end of file
 
884
            # close the IPC pipe
 
885
            file_objects[source].close()
 
886
            del file_objects[source]
 
887
            
 
888
            # Stop calling this function
1530
889
            return False
1531
890
        
1532
 
        # Read a request from the child
1533
 
        request = parent_pipe.recv()
1534
 
        command = request[0]
 
891
        logger.debug("IPC command: %r\n" % cmdline)
1535
892
        
1536
 
        if command == 'init':
1537
 
            fpr = request[1]
1538
 
            address = request[2]
1539
 
            
1540
 
            for c in self.clients:
1541
 
                if c.fingerprint == fpr:
1542
 
                    client = c
 
893
        # Parse and act on command
 
894
        cmd, args = cmdline.split(None, 1)
 
895
        if cmd == "NOTFOUND":
 
896
            if self.settings["use_dbus"]:
 
897
                # Emit D-Bus signal
 
898
                mandos_dbus_service.ClientNotFound(args)
 
899
        elif cmd == "INVALID":
 
900
            if self.settings["use_dbus"]:
 
901
                for client in self.clients:
 
902
                    if client.name == args:
 
903
                        # Emit D-Bus signal
 
904
                        client.Rejected()
 
905
                        break
 
906
        elif cmd == "SENDING":
 
907
            for client in self.clients:
 
908
                if client.name == args:
 
909
                    client.checked_ok()
 
910
                    if self.settings["use_dbus"]:
 
911
                        # Emit D-Bus signal
 
912
                        client.ReceivedSecret()
1543
913
                    break
1544
 
            else:
1545
 
                logger.warning("Client not found for fingerprint: %s, ad"
1546
 
                               "dress: %s", fpr, address)
1547
 
                if self.use_dbus:
1548
 
                    # Emit D-Bus signal
1549
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1550
 
                parent_pipe.send(False)
1551
 
                return False
1552
 
            
1553
 
            gobject.io_add_watch(parent_pipe.fileno(),
1554
 
                                 gobject.IO_IN | gobject.IO_HUP,
1555
 
                                 functools.partial(self.handle_ipc,
1556
 
                                                   parent_pipe = parent_pipe,
1557
 
                                                   client_object = client))
1558
 
            parent_pipe.send(True)
1559
 
            # remove the old hook in favor of the new above hook on same fileno
1560
 
            return False
1561
 
        if command == 'funcall':
1562
 
            funcname = request[1]
1563
 
            args = request[2]
1564
 
            kwargs = request[3]
1565
 
            
1566
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
 
 
1568
 
        if command == 'getattr':
1569
 
            attrname = request[1]
1570
 
            if callable(client_object.__getattribute__(attrname)):
1571
 
                parent_pipe.send(('function',))
1572
 
            else:
1573
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
914
        else:
 
915
            logger.error("Unknown IPC command: %r", cmdline)
1574
916
        
1575
 
        if command == 'setattr':
1576
 
            attrname = request[1]
1577
 
            value = request[2]
1578
 
            setattr(client_object, attrname, value)
1579
 
 
 
917
        # Keep calling this function
1580
918
        return True
1581
919
 
1582
920
 
1591
929
    datetime.timedelta(0, 3600)
1592
930
    >>> string_to_delta('24h')
1593
931
    datetime.timedelta(1)
1594
 
    >>> string_to_delta('1w')
 
932
    >>> string_to_delta(u'1w')
1595
933
    datetime.timedelta(7)
1596
934
    >>> string_to_delta('5m 30s')
1597
935
    datetime.timedelta(0, 330)
1601
939
        try:
1602
940
            suffix = unicode(s[-1])
1603
941
            value = int(s[:-1])
1604
 
            if suffix == "d":
 
942
            if suffix == u"d":
1605
943
                delta = datetime.timedelta(value)
1606
 
            elif suffix == "s":
 
944
            elif suffix == u"s":
1607
945
                delta = datetime.timedelta(0, value)
1608
 
            elif suffix == "m":
 
946
            elif suffix == u"m":
1609
947
                delta = datetime.timedelta(0, 0, 0, 0, value)
1610
 
            elif suffix == "h":
 
948
            elif suffix == u"h":
1611
949
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1612
 
            elif suffix == "w":
 
950
            elif suffix == u"w":
1613
951
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1614
952
            else:
1615
 
                raise ValueError("Unknown suffix %r" % suffix)
1616
 
        except (ValueError, IndexError), e:
1617
 
            raise ValueError(*(e.args))
 
953
                raise ValueError
 
954
        except (ValueError, IndexError):
 
955
            raise ValueError
1618
956
        timevalue += delta
1619
957
    return timevalue
1620
958
 
1621
959
 
 
960
def server_state_changed(state):
 
961
    """Derived from the Avahi example code"""
 
962
    if state == avahi.SERVER_COLLISION:
 
963
        logger.error(u"Zeroconf server name collision")
 
964
        service.remove()
 
965
    elif state == avahi.SERVER_RUNNING:
 
966
        service.add()
 
967
 
 
968
 
 
969
def entry_group_state_changed(state, error):
 
970
    """Derived from the Avahi example code"""
 
971
    logger.debug(u"Avahi state change: %i", state)
 
972
    
 
973
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
974
        logger.debug(u"Zeroconf service established.")
 
975
    elif state == avahi.ENTRY_GROUP_COLLISION:
 
976
        logger.warning(u"Zeroconf service name collision.")
 
977
        service.rename()
 
978
    elif state == avahi.ENTRY_GROUP_FAILURE:
 
979
        logger.critical(u"Avahi: Error in group state changed %s",
 
980
                        unicode(error))
 
981
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
982
 
1622
983
def if_nametoindex(interface):
1623
 
    """Call the C function if_nametoindex(), or equivalent
1624
 
    
1625
 
    Note: This function cannot accept a unicode string."""
 
984
    """Call the C function if_nametoindex(), or equivalent"""
1626
985
    global if_nametoindex
1627
986
    try:
1628
987
        if_nametoindex = (ctypes.cdll.LoadLibrary
1629
988
                          (ctypes.util.find_library("c"))
1630
989
                          .if_nametoindex)
1631
990
    except (OSError, AttributeError):
1632
 
        logger.warning("Doing if_nametoindex the hard way")
 
991
        if "struct" not in sys.modules:
 
992
            import struct
 
993
        if "fcntl" not in sys.modules:
 
994
            import fcntl
1633
995
        def if_nametoindex(interface):
1634
996
            "Get an interface index the hard way, i.e. using fcntl()"
1635
997
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1636
 
            with contextlib.closing(socket.socket()) as s:
 
998
            with closing(socket.socket()) as s:
1637
999
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
 
                                    struct.pack(str("16s16x"),
1639
 
                                                interface))
1640
 
            interface_index = struct.unpack(str("I"),
1641
 
                                            ifreq[16:20])[0]
 
1000
                                    struct.pack("16s16x", interface))
 
1001
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1642
1002
            return interface_index
1643
1003
    return if_nametoindex(interface)
1644
1004
 
1645
1005
 
1646
1006
def daemon(nochdir = False, noclose = False):
1647
1007
    """See daemon(3).  Standard BSD Unix function.
1648
 
    
1649
1008
    This should really exist as os.daemon, but it doesn't (yet)."""
1650
1009
    if os.fork():
1651
1010
        sys.exit()
1659
1018
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1660
1019
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1661
1020
            raise OSError(errno.ENODEV,
1662
 
                          "%s not a character device"
1663
 
                          % os.path.devnull)
 
1021
                          "/dev/null not a character device")
1664
1022
        os.dup2(null, sys.stdin.fileno())
1665
1023
        os.dup2(null, sys.stdout.fileno())
1666
1024
        os.dup2(null, sys.stderr.fileno())
1670
1028
 
1671
1029
def main():
1672
1030
    
1673
 
    ##################################################################
 
1031
    ######################################################################
1674
1032
    # Parsing of options, both command line and config file
1675
1033
    
1676
1034
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1685
1043
    parser.add_option("--debug", action="store_true",
1686
1044
                      help="Debug mode; run in foreground and log to"
1687
1045
                      " terminal")
1688
 
    parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
 
                      help="Debug level for stdout output")
1690
1046
    parser.add_option("--priority", type="string", help="GnuTLS"
1691
1047
                      " priority string (see GnuTLS documentation)")
1692
 
    parser.add_option("--servicename", type="string",
1693
 
                      metavar="NAME", help="Zeroconf service name")
 
1048
    parser.add_option("--servicename", type="string", metavar="NAME",
 
1049
                      help="Zeroconf service name")
1694
1050
    parser.add_option("--configdir", type="string",
1695
1051
                      default="/etc/mandos", metavar="DIR",
1696
1052
                      help="Directory to search for configuration"
1697
1053
                      " files")
1698
1054
    parser.add_option("--no-dbus", action="store_false",
1699
 
                      dest="use_dbus", help="Do not provide D-Bus"
1700
 
                      " system bus interface")
 
1055
                      dest="use_dbus",
 
1056
                      help="Do not provide D-Bus system bus"
 
1057
                      " interface")
1701
1058
    parser.add_option("--no-ipv6", action="store_false",
1702
1059
                      dest="use_ipv6", help="Do not use IPv6")
1703
1060
    options = parser.parse_args()[0]
1717
1074
                        "servicename": "Mandos",
1718
1075
                        "use_dbus": "True",
1719
1076
                        "use_ipv6": "True",
1720
 
                        "debuglevel": "",
1721
1077
                        }
1722
1078
    
1723
1079
    # Parse config file for server-global settings
1724
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
1080
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1725
1081
    del server_defaults
1726
 
    server_config.read(os.path.join(options.configdir,
1727
 
                                    "mandos.conf"))
 
1082
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1728
1083
    # Convert the SafeConfigParser object to a dict
1729
1084
    server_settings = server_config.defaults()
1730
1085
    # Use the appropriate methods on the non-string config options
1731
 
    for option in ("debug", "use_dbus", "use_ipv6"):
1732
 
        server_settings[option] = server_config.getboolean("DEFAULT",
1733
 
                                                           option)
 
1086
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
1087
                                                        "debug")
 
1088
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
1089
                                                           "use_dbus")
 
1090
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
1091
                                                           "use_ipv6")
1734
1092
    if server_settings["port"]:
1735
1093
        server_settings["port"] = server_config.getint("DEFAULT",
1736
1094
                                                       "port")
1740
1098
    # options, if set.
1741
1099
    for option in ("interface", "address", "port", "debug",
1742
1100
                   "priority", "servicename", "configdir",
1743
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1101
                   "use_dbus", "use_ipv6"):
1744
1102
        value = getattr(options, option)
1745
1103
        if value is not None:
1746
1104
            server_settings[option] = value
1747
1105
    del options
1748
 
    # Force all strings to be unicode
1749
 
    for option in server_settings.keys():
1750
 
        if type(server_settings[option]) is str:
1751
 
            server_settings[option] = unicode(server_settings[option])
1752
1106
    # Now we have our good server settings in "server_settings"
1753
1107
    
1754
1108
    ##################################################################
1755
1109
    
1756
1110
    # For convenience
1757
1111
    debug = server_settings["debug"]
1758
 
    debuglevel = server_settings["debuglevel"]
1759
1112
    use_dbus = server_settings["use_dbus"]
1760
1113
    use_ipv6 = server_settings["use_ipv6"]
1761
 
 
 
1114
    
 
1115
    if not debug:
 
1116
        syslogger.setLevel(logging.WARNING)
 
1117
        console.setLevel(logging.WARNING)
 
1118
    
1762
1119
    if server_settings["servicename"] != "Mandos":
1763
1120
        syslogger.setFormatter(logging.Formatter
1764
1121
                               ('Mandos (%s) [%%(process)d]:'
1770
1127
                        "interval": "5m",
1771
1128
                        "checker": "fping -q -- %%(host)s",
1772
1129
                        "host": "",
1773
 
                        "approval_delay": "0s",
1774
 
                        "approval_duration": "1s",
1775
1130
                        }
1776
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
1131
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1777
1132
    client_config.read(os.path.join(server_settings["configdir"],
1778
1133
                                    "clients.conf"))
1779
 
    
 
1134
 
1780
1135
    global mandos_dbus_service
1781
1136
    mandos_dbus_service = None
1782
1137
    
1783
 
    tcp_server = MandosServer((server_settings["address"],
1784
 
                               server_settings["port"]),
1785
 
                              ClientHandler,
1786
 
                              interface=(server_settings["interface"]
1787
 
                                         or None),
1788
 
                              use_ipv6=use_ipv6,
1789
 
                              gnutls_priority=
1790
 
                              server_settings["priority"],
1791
 
                              use_dbus=use_dbus)
1792
 
    if not debug:
1793
 
        pidfilename = "/var/run/mandos.pid"
1794
 
        try:
1795
 
            pidfile = open(pidfilename, "w")
1796
 
        except IOError:
1797
 
            logger.error("Could not open file %r", pidfilename)
 
1138
    clients = Set()
 
1139
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
1140
                                 server_settings["port"]),
 
1141
                                TCP_handler,
 
1142
                                settings=server_settings,
 
1143
                                clients=clients, use_ipv6=use_ipv6)
 
1144
    pidfilename = "/var/run/mandos.pid"
 
1145
    try:
 
1146
        pidfile = open(pidfilename, "w")
 
1147
    except IOError:
 
1148
        logger.error("Could not open file %r", pidfilename)
1798
1149
    
1799
1150
    try:
1800
1151
        uid = pwd.getpwnam("_mandos").pw_uid
1806
1157
        except KeyError:
1807
1158
            try:
1808
1159
                uid = pwd.getpwnam("nobody").pw_uid
1809
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1160
                gid = pwd.getpwnam("nogroup").pw_gid
1810
1161
            except KeyError:
1811
1162
                uid = 65534
1812
1163
                gid = 65534
1817
1168
        if error[0] != errno.EPERM:
1818
1169
            raise error
1819
1170
    
1820
 
    if not debug and not debuglevel:
1821
 
        syslogger.setLevel(logging.WARNING)
1822
 
        console.setLevel(logging.WARNING)
1823
 
    if debuglevel:
1824
 
        level = getattr(logging, debuglevel.upper())
1825
 
        syslogger.setLevel(level)
1826
 
        console.setLevel(level)
1827
 
 
 
1171
    # Enable all possible GnuTLS debugging
1828
1172
    if debug:
1829
 
        # Enable all possible GnuTLS debugging
1830
 
        
1831
1173
        # "Use a log level over 10 to enable all debugging options."
1832
1174
        # - GnuTLS manual
1833
1175
        gnutls.library.functions.gnutls_global_set_log_level(11)
1838
1180
        
1839
1181
        (gnutls.library.functions
1840
1182
         .gnutls_global_set_log_function(debug_gnutls))
1841
 
        
 
1183
    
 
1184
    global service
 
1185
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1186
    service = AvahiService(name = server_settings["servicename"],
 
1187
                           servicetype = "_mandos._tcp",
 
1188
                           protocol = protocol)
 
1189
    if server_settings["interface"]:
 
1190
        service.interface = (if_nametoindex
 
1191
                             (server_settings["interface"]))
 
1192
    
 
1193
    global main_loop
 
1194
    global bus
 
1195
    global server
 
1196
    # From the Avahi example code
 
1197
    DBusGMainLoop(set_as_default=True )
 
1198
    main_loop = gobject.MainLoop()
 
1199
    bus = dbus.SystemBus()
 
1200
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
1201
                                           avahi.DBUS_PATH_SERVER),
 
1202
                            avahi.DBUS_INTERFACE_SERVER)
 
1203
    # End of Avahi example code
 
1204
    if use_dbus:
 
1205
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1206
    
 
1207
    clients.update(Set(Client(name = section,
 
1208
                              config
 
1209
                              = dict(client_config.items(section)),
 
1210
                              use_dbus = use_dbus)
 
1211
                       for section in client_config.sections()))
 
1212
    if not clients:
 
1213
        logger.warning(u"No clients defined")
 
1214
    
 
1215
    if debug:
1842
1216
        # Redirect stdin so all checkers get /dev/null
1843
1217
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1844
1218
        os.dup2(null, sys.stdin.fileno())
1847
1221
    else:
1848
1222
        # No console logging
1849
1223
        logger.removeHandler(console)
1850
 
    
1851
 
    # Need to fork before connecting to D-Bus
1852
 
    if not debug:
1853
1224
        # Close all input and output, do double fork, etc.
1854
1225
        daemon()
1855
1226
    
1856
 
    global main_loop
1857
 
    # From the Avahi example code
1858
 
    DBusGMainLoop(set_as_default=True )
1859
 
    main_loop = gobject.MainLoop()
1860
 
    bus = dbus.SystemBus()
1861
 
    # End of Avahi example code
1862
 
    if use_dbus:
1863
 
        try:
1864
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1865
 
                                            bus, do_not_queue=True)
1866
 
        except dbus.exceptions.NameExistsException, e:
1867
 
            logger.error(unicode(e) + ", disabling D-Bus")
1868
 
            use_dbus = False
1869
 
            server_settings["use_dbus"] = False
1870
 
            tcp_server.use_dbus = False
1871
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1872
 
    service = AvahiService(name = server_settings["servicename"],
1873
 
                           servicetype = "_mandos._tcp",
1874
 
                           protocol = protocol, bus = bus)
1875
 
    if server_settings["interface"]:
1876
 
        service.interface = (if_nametoindex
1877
 
                             (str(server_settings["interface"])))
1878
 
    
1879
 
    global multiprocessing_manager
1880
 
    multiprocessing_manager = multiprocessing.Manager()
1881
 
    
1882
 
    client_class = Client
1883
 
    if use_dbus:
1884
 
        client_class = functools.partial(ClientDBus, bus = bus)
1885
 
    def client_config_items(config, section):
1886
 
        special_settings = {
1887
 
            "approved_by_default":
1888
 
                lambda: config.getboolean(section,
1889
 
                                          "approved_by_default"),
1890
 
            }
1891
 
        for name, value in config.items(section):
1892
 
            try:
1893
 
                yield (name, special_settings[name]())
1894
 
            except KeyError:
1895
 
                yield (name, value)
1896
 
    
1897
 
    tcp_server.clients.update(set(
1898
 
            client_class(name = section,
1899
 
                         config= dict(client_config_items(
1900
 
                        client_config, section)))
1901
 
            for section in client_config.sections()))
1902
 
    if not tcp_server.clients:
1903
 
        logger.warning("No clients defined")
 
1227
    try:
 
1228
        with closing(pidfile):
 
1229
            pid = os.getpid()
 
1230
            pidfile.write(str(pid) + "\n")
 
1231
        del pidfile
 
1232
    except IOError:
 
1233
        logger.error(u"Could not write to file %r with PID %d",
 
1234
                     pidfilename, pid)
 
1235
    except NameError:
 
1236
        # "pidfile" was never created
 
1237
        pass
 
1238
    del pidfilename
 
1239
    
 
1240
    def cleanup():
 
1241
        "Cleanup function; run on exit"
 
1242
        global group
 
1243
        # From the Avahi example code
 
1244
        if not group is None:
 
1245
            group.Free()
 
1246
            group = None
 
1247
        # End of Avahi example code
1904
1248
        
 
1249
        while clients:
 
1250
            client = clients.pop()
 
1251
            client.disable_hook = None
 
1252
            client.disable()
 
1253
    
 
1254
    atexit.register(cleanup)
 
1255
    
1905
1256
    if not debug:
1906
 
        try:
1907
 
            with pidfile:
1908
 
                pid = os.getpid()
1909
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1910
 
            del pidfile
1911
 
        except IOError:
1912
 
            logger.error("Could not write to file %r with PID %d",
1913
 
                         pidfilename, pid)
1914
 
        except NameError:
1915
 
            # "pidfile" was never created
1916
 
            pass
1917
 
        del pidfilename
1918
 
        
1919
1257
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1920
 
 
1921
1258
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1922
1259
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1923
1260
    
1926
1263
            """A D-Bus proxy object"""
1927
1264
            def __init__(self):
1928
1265
                dbus.service.Object.__init__(self, bus, "/")
1929
 
            _interface = "se.bsnet.fukt.Mandos"
 
1266
            _interface = u"se.bsnet.fukt.Mandos"
1930
1267
            
1931
 
            @dbus.service.signal(_interface, signature="o")
1932
 
            def ClientAdded(self, objpath):
 
1268
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1269
            def ClientAdded(self, objpath, properties):
1933
1270
                "D-Bus signal"
1934
1271
                pass
1935
1272
            
1936
 
            @dbus.service.signal(_interface, signature="ss")
1937
 
            def ClientNotFound(self, fingerprint, address):
 
1273
            @dbus.service.signal(_interface, signature="s")
 
1274
            def ClientNotFound(self, fingerprint):
1938
1275
                "D-Bus signal"
1939
1276
                pass
1940
1277
            
1946
1283
            @dbus.service.method(_interface, out_signature="ao")
1947
1284
            def GetAllClients(self):
1948
1285
                "D-Bus method"
1949
 
                return dbus.Array(c.dbus_object_path
1950
 
                                  for c in tcp_server.clients)
 
1286
                return dbus.Array(c.dbus_object_path for c in clients)
1951
1287
            
1952
 
            @dbus.service.method(_interface,
1953
 
                                 out_signature="a{oa{sv}}")
 
1288
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1954
1289
            def GetAllClientsWithProperties(self):
1955
1290
                "D-Bus method"
1956
1291
                return dbus.Dictionary(
1957
 
                    ((c.dbus_object_path, c.GetAll(""))
1958
 
                     for c in tcp_server.clients),
 
1292
                    ((c.dbus_object_path, c.GetAllProperties())
 
1293
                     for c in clients),
1959
1294
                    signature="oa{sv}")
1960
1295
            
1961
1296
            @dbus.service.method(_interface, in_signature="o")
1962
1297
            def RemoveClient(self, object_path):
1963
1298
                "D-Bus method"
1964
 
                for c in tcp_server.clients:
 
1299
                for c in clients:
1965
1300
                    if c.dbus_object_path == object_path:
1966
 
                        tcp_server.clients.remove(c)
1967
 
                        c.remove_from_connection()
 
1301
                        clients.remove(c)
1968
1302
                        # Don't signal anything except ClientRemoved
1969
 
                        c.disable(quiet=True)
 
1303
                        c.use_dbus = False
 
1304
                        c.disable()
1970
1305
                        # Emit D-Bus signal
1971
1306
                        self.ClientRemoved(object_path, c.name)
1972
1307
                        return
1973
 
                raise KeyError(object_path)
 
1308
                raise KeyError
1974
1309
            
1975
1310
            del _interface
1976
1311
        
1977
1312
        mandos_dbus_service = MandosDBusService()
1978
1313
    
1979
 
    def cleanup():
1980
 
        "Cleanup function; run on exit"
1981
 
        service.cleanup()
1982
 
        
1983
 
        while tcp_server.clients:
1984
 
            client = tcp_server.clients.pop()
1985
 
            if use_dbus:
1986
 
                client.remove_from_connection()
1987
 
            client.disable_hook = None
1988
 
            # Don't signal anything except ClientRemoved
1989
 
            client.disable(quiet=True)
1990
 
            if use_dbus:
1991
 
                # Emit D-Bus signal
1992
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1993
 
                                                  client.name)
1994
 
    
1995
 
    atexit.register(cleanup)
1996
 
    
1997
 
    for client in tcp_server.clients:
 
1314
    for client in clients:
1998
1315
        if use_dbus:
1999
1316
            # Emit D-Bus signal
2000
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
1317
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
 
1318
                                            client.GetAllProperties())
2001
1319
        client.enable()
2002
1320
    
2003
1321
    tcp_server.enable()
2006
1324
    # Find out what port we got
2007
1325
    service.port = tcp_server.socket.getsockname()[1]
2008
1326
    if use_ipv6:
2009
 
        logger.info("Now listening on address %r, port %d,"
 
1327
        logger.info(u"Now listening on address %r, port %d,"
2010
1328
                    " flowinfo %d, scope_id %d"
2011
1329
                    % tcp_server.socket.getsockname())
2012
1330
    else:                       # IPv4
2013
 
        logger.info("Now listening on address %r, port %d"
 
1331
        logger.info(u"Now listening on address %r, port %d"
2014
1332
                    % tcp_server.socket.getsockname())
2015
1333
    
2016
1334
    #service.interface = tcp_server.socket.getsockname()[3]
2017
1335
    
2018
1336
    try:
2019
1337
        # From the Avahi example code
 
1338
        server.connect_to_signal("StateChanged", server_state_changed)
2020
1339
        try:
2021
 
            service.activate()
 
1340
            server_state_changed(server.GetState())
2022
1341
        except dbus.exceptions.DBusException, error:
2023
 
            logger.critical("DBusException: %s", error)
2024
 
            cleanup()
 
1342
            logger.critical(u"DBusException: %s", error)
2025
1343
            sys.exit(1)
2026
1344
        # End of Avahi example code
2027
1345
        
2030
1348
                             (tcp_server.handle_request
2031
1349
                              (*args[2:], **kwargs) or True))
2032
1350
        
2033
 
        logger.debug("Starting main loop")
 
1351
        logger.debug(u"Starting main loop")
2034
1352
        main_loop.run()
2035
1353
    except AvahiError, error:
2036
 
        logger.critical("AvahiError: %s", error)
2037
 
        cleanup()
 
1354
        logger.critical(u"AvahiError: %s", error)
2038
1355
        sys.exit(1)
2039
1356
    except KeyboardInterrupt:
2040
1357
        if debug:
2041
 
            print("", file=sys.stderr)
 
1358
            print >> sys.stderr
2042
1359
        logger.debug("Server received KeyboardInterrupt")
2043
1360
    logger.debug("Server exiting")
2044
 
    # Must run before the D-Bus bus name gets deregistered
2045
 
    cleanup()
2046
1361
 
2047
1362
if __name__ == '__main__':
2048
1363
    main()