/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 server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-01 06:56:27 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080801065627-2c7k4ydefjgacgnq
* plugins.d/plugbasedclient.c (set_cloexec_flag): New function.
  (main): Use the set_cloexec_flag function.  Move inserting of global
  arguments to before the fork.

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" and "remove" in the "AvahiService" class, the
10
 
# "server_state_changed" and "entry_group_state_changed" functions,
11
 
# and some lines in "main".
 
9
# following functions: "AvahiService.add", "AvahiService.remove",
 
10
# "server_state_changed", "entry_group_state_changed", and some lines
 
11
# in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
16
15
17
16
# This program is free software: you can redistribute it and/or modify
18
17
# it under the terms of the GNU General Public License as published by
25
24
#     GNU General Public License for more details.
26
25
27
26
# You should have received a copy of the GNU General Public License
28
 
# along with this program.  If not, see
29
 
# <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
30
28
31
29
# Contact the authors at <mandos@fukt.bsnet.se>.
32
30
33
31
 
34
 
from __future__ import division, with_statement, absolute_import
 
32
from __future__ import division
35
33
 
36
34
import SocketServer
37
35
import socket
38
 
import optparse
 
36
import select
 
37
from optparse import OptionParser
39
38
import datetime
40
39
import errno
41
40
import gnutls.crypto
55
54
import stat
56
55
import logging
57
56
import logging.handlers
58
 
import pwd
59
 
from contextlib import closing
60
57
 
61
58
import dbus
62
 
import dbus.service
63
59
import gobject
64
60
import avahi
65
61
from dbus.mainloop.glib import DBusGMainLoop
66
62
import ctypes
67
 
import ctypes.util
68
 
 
69
 
version = "1.0.8"
 
63
 
 
64
# Brief description of the operation of this program:
 
65
 
66
# This server announces itself as a Zeroconf service.  Connecting
 
67
# clients use the TLS protocol, with the unusual quirk that this
 
68
# server program acts as a TLS "client" while a connecting client acts
 
69
# as a TLS "server".  The client (acting as a TLS "server") must
 
70
# supply an OpenPGP certificate, and the fingerprint of this
 
71
# certificate is used by this server to look up (in a list read from a
 
72
# file at start time) which binary blob to give the client.  No other
 
73
# authentication or authorization is done by this server.
 
74
 
70
75
 
71
76
logger = logging.Logger('mandos')
72
 
syslogger = (logging.handlers.SysLogHandler
73
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
 
              address = "/dev/log"))
75
 
syslogger.setFormatter(logging.Formatter
76
 
                       ('Mandos [%(process)d]: %(levelname)s:'
77
 
                        ' %(message)s'))
 
77
syslogger = logging.handlers.SysLogHandler\
 
78
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
 
79
syslogger.setFormatter(logging.Formatter\
 
80
                        ('%(levelname)s: %(message)s'))
78
81
logger.addHandler(syslogger)
 
82
del syslogger
79
83
 
80
 
console = logging.StreamHandler()
81
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
82
 
                                       ' %(levelname)s: %(message)s'))
83
 
logger.addHandler(console)
84
84
 
85
85
class AvahiError(Exception):
86
 
    def __init__(self, value, *args, **kwargs):
 
86
    def __init__(self, value):
87
87
        self.value = value
88
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
89
 
    def __unicode__(self):
90
 
        return unicode(repr(self.value))
 
88
    def __str__(self):
 
89
        return repr(self.value)
91
90
 
92
91
class AvahiServiceError(AvahiError):
93
92
    pass
97
96
 
98
97
 
99
98
class AvahiService(object):
100
 
    """An Avahi (Zeroconf) service.
101
 
    Attributes:
 
99
    """
102
100
    interface: integer; avahi.IF_UNSPEC or an interface index.
103
101
               Used to optionally bind to the specified interface.
104
 
    name: string; Example: 'Mandos'
105
 
    type: string; Example: '_mandos._tcp'.
106
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
107
 
    port: integer; what port to announce
108
 
    TXT: list of strings; TXT record for the service
109
 
    domain: string; Domain to publish on, default to .local if empty.
110
 
    host: string; Host to publish records for, default is localhost
111
 
    max_renames: integer; maximum number of renames
112
 
    rename_count: integer; counter so we only rename after collisions
113
 
                  a sensible number of times
 
102
    name = string; Example: "Mandos"
 
103
    type = string; Example: "_mandos._tcp".
 
104
                   See <http://www.dns-sd.org/ServiceTypes.html>
 
105
    port = integer; what port to announce
 
106
    TXT = list of strings; TXT record for the service
 
107
    domain = string; Domain to publish on, default to .local if empty.
 
108
    host = string; Host to publish records for, default to localhost
 
109
                   if empty.
 
110
    max_renames = integer; maximum number of renames
 
111
    rename_count = integer; counter so we only rename after collisions
 
112
                   a sensible number of times
114
113
    """
115
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
116
 
                 servicetype = None, port = None, TXT = None,
117
 
                 domain = "", host = "", max_renames = 32768,
118
 
                 protocol = avahi.PROTO_UNSPEC):
 
115
                 type = None, port = None, TXT = None, domain = "",
 
116
                 host = "", max_renames = 12):
 
117
        """An Avahi (Zeroconf) service. """
119
118
        self.interface = interface
120
119
        self.name = name
121
 
        self.type = servicetype
 
120
        self.type = type
122
121
        self.port = port
123
 
        self.TXT = TXT if TXT is not None else []
 
122
        if TXT is None:
 
123
            self.TXT = []
 
124
        else:
 
125
            self.TXT = TXT
124
126
        self.domain = domain
125
127
        self.host = host
126
128
        self.rename_count = 0
127
 
        self.max_renames = max_renames
128
 
        self.protocol = protocol
129
129
    def rename(self):
130
130
        """Derived from the Avahi example code"""
131
131
        if self.rename_count >= self.max_renames:
132
 
            logger.critical(u"No suitable Zeroconf service name found"
133
 
                            u" after %i retries, exiting.",
134
 
                            self.rename_count)
135
 
            raise AvahiServiceError(u"Too many renames")
136
 
        self.name = server.GetAlternativeServiceName(self.name)
137
 
        logger.info(u"Changing Zeroconf service name to %r ...",
138
 
                    str(self.name))
139
 
        syslogger.setFormatter(logging.Formatter
140
 
                               ('Mandos (%s) [%%(process)d]:'
141
 
                                ' %%(levelname)s: %%(message)s'
142
 
                                % self.name))
 
132
            logger.critical(u"No suitable service name found after %i"
 
133
                            u" retries, exiting.", rename_count)
 
134
            raise AvahiServiceError("Too many renames")
 
135
        name = server.GetAlternativeServiceName(name)
 
136
        logger.notice(u"Changing name to %r ...", name)
143
137
        self.remove()
144
138
        self.add()
145
139
        self.rename_count += 1
151
145
        """Derived from the Avahi example code"""
152
146
        global group
153
147
        if group is None:
154
 
            group = dbus.Interface(bus.get_object
155
 
                                   (avahi.DBUS_NAME,
 
148
            group = dbus.Interface\
 
149
                    (bus.get_object(avahi.DBUS_NAME,
156
150
                                    server.EntryGroupNew()),
157
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
158
152
            group.connect_to_signal('StateChanged',
159
153
                                    entry_group_state_changed)
160
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
154
        logger.debug(u"Adding service '%s' of type '%s' ...",
161
155
                     service.name, service.type)
162
156
        group.AddService(
163
157
                self.interface,         # interface
164
 
                self.protocol,          # protocol
 
158
                avahi.PROTO_INET6,      # protocol
165
159
                dbus.UInt32(0),         # flags
166
160
                self.name, self.type,
167
161
                self.domain, self.host,
174
168
# End of Avahi example code
175
169
 
176
170
 
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
171
class Client(object):
183
172
    """A representation of a client host served by this server.
184
173
    Attributes:
185
 
    name:       string; from the config file, used in log messages and
186
 
                        D-Bus identifiers
 
174
    name:      string; from the config file, used in log messages
187
175
    fingerprint: string (40 or 32 hexadecimal digits); used to
188
176
                 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)
199
 
    checker:    subprocess.Popen(); a running checker process used
200
 
                                    to see if the client lives.
201
 
                                    'None' if no process is running.
 
177
    secret:    bytestring; sent verbatim (over TLS) to client
 
178
    fqdn:      string (FQDN); available for use by the checker command
 
179
    created:   datetime.datetime(); object creation, not client host
 
180
    last_checked_ok: datetime.datetime() or None if not yet checked OK
 
181
    timeout:   datetime.timedelta(); How long from last_checked_ok
 
182
                                     until this client is invalid
 
183
    interval:  datetime.timedelta(); How often to start a new checker
 
184
    stop_hook: If set, called by stop() as stop_hook(self)
 
185
    checker:   subprocess.Popen(); a running checker process used
 
186
                                   to see if the client lives.
 
187
                                   'None' if no process is running.
202
188
    checker_initiator_tag: a gobject event source tag, or None
203
 
    disable_initiator_tag:    - '' -
 
189
    stop_initiator_tag:    - '' -
204
190
    checker_callback_tag:  - '' -
205
191
    checker_command: string; External command which is run to check if
206
192
                     client lives.  %() expansions are done at
207
193
                     runtime with vars(self) as dict, so that for
208
194
                     instance %(name)s can be used in the command.
209
 
    current_checker_command: string; current running checker_command
 
195
    Private attibutes:
 
196
    _timeout: Real variable for 'timeout'
 
197
    _interval: Real variable for 'interval'
 
198
    _timeout_milliseconds: Used when calling gobject.timeout_add()
 
199
    _interval_milliseconds: - '' -
210
200
    """
211
 
    def timeout_milliseconds(self):
212
 
        "Return the 'timeout' attribute in milliseconds"
213
 
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
214
 
                + (self.timeout.seconds * 1000)
215
 
                + (self.timeout.microseconds // 1000))
216
 
    
217
 
    def interval_milliseconds(self):
218
 
        "Return the 'interval' attribute in milliseconds"
219
 
        return ((self.interval.days * 24 * 60 * 60 * 1000)
220
 
                + (self.interval.seconds * 1000)
221
 
                + (self.interval.microseconds // 1000))
222
 
    
223
 
    def __init__(self, name = None, disable_hook=None, config=None):
224
 
        """Note: the 'checker' key in 'config' sets the
225
 
        'checker_command' attribute and *not* the 'checker'
226
 
        attribute."""
 
201
    def _set_timeout(self, timeout):
 
202
        "Setter function for 'timeout' attribute"
 
203
        self._timeout = timeout
 
204
        self._timeout_milliseconds = ((self.timeout.days
 
205
                                       * 24 * 60 * 60 * 1000)
 
206
                                      + (self.timeout.seconds * 1000)
 
207
                                      + (self.timeout.microseconds
 
208
                                         // 1000))
 
209
    timeout = property(lambda self: self._timeout,
 
210
                       _set_timeout)
 
211
    del _set_timeout
 
212
    def _set_interval(self, interval):
 
213
        "Setter function for 'interval' attribute"
 
214
        self._interval = interval
 
215
        self._interval_milliseconds = ((self.interval.days
 
216
                                        * 24 * 60 * 60 * 1000)
 
217
                                       + (self.interval.seconds
 
218
                                          * 1000)
 
219
                                       + (self.interval.microseconds
 
220
                                          // 1000))
 
221
    interval = property(lambda self: self._interval,
 
222
                        _set_interval)
 
223
    del _set_interval
 
224
    def __init__(self, name=None, stop_hook=None, fingerprint=None,
 
225
                 secret=None, secfile=None, fqdn=None, timeout=None,
 
226
                 interval=-1, checker=None):
 
227
        """Note: the 'checker' argument sets the 'checker_command'
 
228
        attribute and not the 'checker' attribute.."""
227
229
        self.name = name
228
 
        if config is None:
229
 
            config = {}
230
230
        logger.debug(u"Creating client %r", self.name)
231
 
        # Uppercase and remove spaces from fingerprint for later
232
 
        # comparison purposes with return value from the fingerprint()
233
 
        # function
234
 
        self.fingerprint = (config["fingerprint"].upper()
235
 
                            .replace(u" ", u""))
 
231
        # Uppercase and remove spaces from fingerprint
 
232
        # for later comparison purposes with return value of
 
233
        # the fingerprint() function
 
234
        self.fingerprint = fingerprint.upper().replace(u" ", u"")
236
235
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
237
 
        if "secret" in config:
238
 
            self.secret = config["secret"].decode(u"base64")
239
 
        elif "secfile" in config:
240
 
            with closing(open(os.path.expanduser
241
 
                              (os.path.expandvars
242
 
                               (config["secfile"])))) as secfile:
243
 
                self.secret = secfile.read()
 
236
        if secret:
 
237
            self.secret = secret.decode(u"base64")
 
238
        elif secfile:
 
239
            sf = open(secfile)
 
240
            self.secret = sf.read()
 
241
            sf.close()
244
242
        else:
245
243
            raise TypeError(u"No secret or secfile for client %s"
246
244
                            % self.name)
247
 
        self.host = config.get("host", "")
248
 
        self.created = datetime.datetime.utcnow()
249
 
        self.enabled = False
250
 
        self.last_enabled = None
 
245
        self.fqdn = fqdn
 
246
        self.created = datetime.datetime.now()
251
247
        self.last_checked_ok = None
252
 
        self.timeout = string_to_delta(config["timeout"])
253
 
        self.interval = string_to_delta(config["interval"])
254
 
        self.disable_hook = disable_hook
 
248
        self.timeout = string_to_delta(timeout)
 
249
        self.interval = string_to_delta(interval)
 
250
        self.stop_hook = stop_hook
255
251
        self.checker = None
256
252
        self.checker_initiator_tag = None
257
 
        self.disable_initiator_tag = None
 
253
        self.stop_initiator_tag = None
258
254
        self.checker_callback_tag = None
259
 
        self.checker_command = config["checker"]
260
 
        self.current_checker_command = None
261
 
        self.last_connect = None
262
 
    
263
 
    def enable(self):
 
255
        self.check_command = checker
 
256
    def start(self):
264
257
        """Start this client's checker and timeout hooks"""
265
 
        self.last_enabled = datetime.datetime.utcnow()
266
258
        # Schedule a new checker to be started an 'interval' from now,
267
259
        # and every interval from then on.
268
 
        self.checker_initiator_tag = (gobject.timeout_add
269
 
                                      (self.interval_milliseconds(),
270
 
                                       self.start_checker))
 
260
        self.checker_initiator_tag = gobject.timeout_add\
 
261
                                     (self._interval_milliseconds,
 
262
                                      self.start_checker)
271
263
        # Also start a new checker *right now*.
272
264
        self.start_checker()
273
 
        # Schedule a disable() when 'timeout' has passed
274
 
        self.disable_initiator_tag = (gobject.timeout_add
275
 
                                   (self.timeout_milliseconds(),
276
 
                                    self.disable))
277
 
        self.enabled = True
278
 
    
279
 
    def disable(self):
280
 
        """Disable this client."""
281
 
        if not getattr(self, "enabled", False):
 
265
        # Schedule a stop() when 'timeout' has passed
 
266
        self.stop_initiator_tag = gobject.timeout_add\
 
267
                                  (self._timeout_milliseconds,
 
268
                                   self.stop)
 
269
    def stop(self):
 
270
        """Stop this client.
 
271
        The possibility that a client might be restarted is left open,
 
272
        but not currently used."""
 
273
        # If this client doesn't have a secret, it is already stopped.
 
274
        if self.secret:
 
275
            logger.debug(u"Stopping client %s", self.name)
 
276
            self.secret = None
 
277
        else:
282
278
            return False
283
 
        logger.info(u"Disabling client %s", self.name)
284
 
        if getattr(self, "disable_initiator_tag", False):
285
 
            gobject.source_remove(self.disable_initiator_tag)
286
 
            self.disable_initiator_tag = None
 
279
        if getattr(self, "stop_initiator_tag", False):
 
280
            gobject.source_remove(self.stop_initiator_tag)
 
281
            self.stop_initiator_tag = None
287
282
        if getattr(self, "checker_initiator_tag", False):
288
283
            gobject.source_remove(self.checker_initiator_tag)
289
284
            self.checker_initiator_tag = None
290
285
        self.stop_checker()
291
 
        if self.disable_hook:
292
 
            self.disable_hook(self)
293
 
        self.enabled = False
 
286
        if self.stop_hook:
 
287
            self.stop_hook(self)
294
288
        # Do not run this again if called by a gobject.timeout_add
295
289
        return False
296
 
    
297
290
    def __del__(self):
298
 
        self.disable_hook = None
299
 
        self.disable()
300
 
    
301
 
    def checker_callback(self, pid, condition, command):
 
291
        self.stop_hook = None
 
292
        self.stop()
 
293
    def checker_callback(self, pid, condition):
302
294
        """The checker has completed, so take appropriate actions."""
 
295
        now = datetime.datetime.now()
303
296
        self.checker_callback_tag = None
304
297
        self.checker = None
305
 
        if os.WIFEXITED(condition):
306
 
            exitstatus = os.WEXITSTATUS(condition)
307
 
            if exitstatus == 0:
308
 
                logger.info(u"Checker for %(name)s succeeded",
309
 
                            vars(self))
310
 
                self.checked_ok()
311
 
            else:
312
 
                logger.info(u"Checker for %(name)s failed",
313
 
                            vars(self))
314
 
        else:
 
298
        if os.WIFEXITED(condition) \
 
299
               and (os.WEXITSTATUS(condition) == 0):
 
300
            logger.debug(u"Checker for %(name)s succeeded",
 
301
                         vars(self))
 
302
            self.last_checked_ok = now
 
303
            gobject.source_remove(self.stop_initiator_tag)
 
304
            self.stop_initiator_tag = gobject.timeout_add\
 
305
                                      (self._timeout_milliseconds,
 
306
                                       self.stop)
 
307
        elif not os.WIFEXITED(condition):
315
308
            logger.warning(u"Checker for %(name)s crashed?",
316
309
                           vars(self))
317
 
    
318
 
    def checked_ok(self):
319
 
        """Bump up the timeout for this client.
320
 
        This should only be called when the client has been seen,
321
 
        alive and well.
322
 
        """
323
 
        self.last_checked_ok = datetime.datetime.utcnow()
324
 
        gobject.source_remove(self.disable_initiator_tag)
325
 
        self.disable_initiator_tag = (gobject.timeout_add
326
 
                                      (self.timeout_milliseconds(),
327
 
                                       self.disable))
328
 
    
 
310
        else:
 
311
            logger.debug(u"Checker for %(name)s failed",
 
312
                         vars(self))
329
313
    def start_checker(self):
330
314
        """Start a new checker subprocess if one is not running.
331
315
        If a checker already exists, leave it running and do
338
322
        # checkers alone, the checker would have to take more time
339
323
        # than 'timeout' for the client to be declared invalid, which
340
324
        # is as it should be.
341
 
        
342
 
        # If a checker exists, make sure it is not a zombie
343
 
        if self.checker is not None:
344
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
345
 
            if pid:
346
 
                logger.warning("Checker was a zombie")
347
 
                gobject.source_remove(self.checker_callback_tag)
348
 
                self.checker_callback(pid, status,
349
 
                                      self.current_checker_command)
350
 
        # Start a new checker if needed
351
325
        if self.checker is None:
352
326
            try:
353
 
                # In case checker_command has exactly one % operator
354
 
                command = self.checker_command % self.host
 
327
                # In case check_command has exactly one % operator
 
328
                command = self.check_command % self.fqdn
355
329
            except TypeError:
356
330
                # Escape attributes for the shell
357
331
                escaped_attrs = dict((key, re.escape(str(val)))
358
332
                                     for key, val in
359
333
                                     vars(self).iteritems())
360
334
                try:
361
 
                    command = self.checker_command % escaped_attrs
 
335
                    command = self.check_command % escaped_attrs
362
336
                except TypeError, error:
363
337
                    logger.error(u'Could not format string "%s":'
364
 
                                 u' %s', self.checker_command, error)
 
338
                                 u' %s', self.check_command, error)
365
339
                    return True # Try again later
366
 
            self.current_checker_command = command
367
340
            try:
368
 
                logger.info(u"Starting checker %r for %s",
369
 
                            command, self.name)
370
 
                # We don't need to redirect stdout and stderr, since
371
 
                # in normal mode, that is already done by daemon(),
372
 
                # and in debug mode we don't want to.  (Stdin is
373
 
                # always replaced by /dev/null.)
 
341
                logger.debug(u"Starting checker %r for %s",
 
342
                             command, self.name)
374
343
                self.checker = subprocess.Popen(command,
375
344
                                                close_fds=True,
376
345
                                                shell=True, cwd="/")
377
 
                self.checker_callback_tag = (gobject.child_watch_add
378
 
                                             (self.checker.pid,
379
 
                                              self.checker_callback,
380
 
                                              data=command))
381
 
                # The checker may have completed before the gobject
382
 
                # watch was added.  Check for this.
383
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
384
 
                if pid:
385
 
                    gobject.source_remove(self.checker_callback_tag)
386
 
                    self.checker_callback(pid, status, command)
387
 
            except OSError, error:
 
346
                self.checker_callback_tag = gobject.child_watch_add\
 
347
                                            (self.checker.pid,
 
348
                                             self.checker_callback)
 
349
            except subprocess.OSError, error:
388
350
                logger.error(u"Failed to start subprocess: %s",
389
351
                             error)
390
352
        # Re-run this periodically if run by gobject.timeout_add
391
353
        return True
392
 
    
393
354
    def stop_checker(self):
394
355
        """Force the checker process, if any, to stop."""
395
356
        if self.checker_callback_tag:
397
358
            self.checker_callback_tag = None
398
359
        if getattr(self, "checker", None) is None:
399
360
            return
400
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
361
        logger.debug("Stopping checker for %(name)s", vars(self))
401
362
        try:
402
363
            os.kill(self.checker.pid, signal.SIGTERM)
403
364
            #os.sleep(0.5)
407
368
            if error.errno != errno.ESRCH: # No such process
408
369
                raise
409
370
        self.checker = None
410
 
    
411
371
    def still_valid(self):
412
372
        """Has the timeout not yet passed for this client?"""
413
 
        if not getattr(self, "enabled", False):
414
 
            return False
415
 
        now = datetime.datetime.utcnow()
 
373
        now = datetime.datetime.now()
416
374
        if self.last_checked_ok is None:
417
375
            return now < (self.created + self.timeout)
418
376
        else:
419
377
            return now < (self.last_checked_ok + self.timeout)
420
378
 
421
379
 
422
 
class ClientDBus(Client, dbus.service.Object):
423
 
    """A Client class using D-Bus
424
 
    Attributes:
425
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
426
 
    """
427
 
    # dbus.service.Object doesn't use super(), so we can't either.
428
 
    
429
 
    def __init__(self, *args, **kwargs):
430
 
        Client.__init__(self, *args, **kwargs)
431
 
        # Only now, when this client is initialized, can it show up on
432
 
        # the D-Bus
433
 
        self.dbus_object_path = (dbus.ObjectPath
434
 
                                 ("/clients/"
435
 
                                  + self.name.replace(".", "_")))
436
 
        dbus.service.Object.__init__(self, bus,
437
 
                                     self.dbus_object_path)
438
 
    def enable(self):
439
 
        oldstate = getattr(self, "enabled", False)
440
 
        r = Client.enable(self)
441
 
        if oldstate != self.enabled:
442
 
            # Emit D-Bus signals
443
 
            self.PropertyChanged(dbus.String(u"enabled"),
444
 
                                 dbus.Boolean(True, variant_level=1))
445
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
446
 
                                 (_datetime_to_dbus(self.last_enabled,
447
 
                                                    variant_level=1)))
448
 
        return r
449
 
    
450
 
    def disable(self, signal = True):
451
 
        oldstate = getattr(self, "enabled", False)
452
 
        r = Client.disable(self)
453
 
        if signal and oldstate != self.enabled:
454
 
            # Emit D-Bus signal
455
 
            self.PropertyChanged(dbus.String(u"enabled"),
456
 
                                 dbus.Boolean(False, variant_level=1))
457
 
        return r
458
 
    
459
 
    def __del__(self, *args, **kwargs):
460
 
        try:
461
 
            self.remove_from_connection()
462
 
        except org.freedesktop.DBus.Python.LookupError:
463
 
            pass
464
 
        dbus.service.Object.__del__(self, *args, **kwargs)
465
 
        Client.__del__(self, *args, **kwargs)
466
 
    
467
 
    def checker_callback(self, pid, condition, command,
468
 
                         *args, **kwargs):
469
 
        self.checker_callback_tag = None
470
 
        self.checker = None
471
 
        # Emit D-Bus signal
472
 
        self.PropertyChanged(dbus.String(u"checker_running"),
473
 
                             dbus.Boolean(False, variant_level=1))
474
 
        if os.WIFEXITED(condition):
475
 
            exitstatus = os.WEXITSTATUS(condition)
476
 
            # Emit D-Bus signal
477
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
478
 
                                  dbus.Int64(condition),
479
 
                                  dbus.String(command))
480
 
        else:
481
 
            # Emit D-Bus signal
482
 
            self.CheckerCompleted(dbus.Int16(-1),
483
 
                                  dbus.Int64(condition),
484
 
                                  dbus.String(command))
485
 
        
486
 
        return Client.checker_callback(self, pid, condition, command,
487
 
                                       *args, **kwargs)
488
 
    
489
 
    def checked_ok(self, *args, **kwargs):
490
 
        r = Client.checked_ok(self, *args, **kwargs)
491
 
        # Emit D-Bus signal
492
 
        self.PropertyChanged(
493
 
            dbus.String(u"last_checked_ok"),
494
 
            (_datetime_to_dbus(self.last_checked_ok,
495
 
                               variant_level=1)))
496
 
        return r
497
 
    
498
 
    def start_checker(self, *args, **kwargs):
499
 
        old_checker = self.checker
500
 
        if self.checker is not None:
501
 
            old_checker_pid = self.checker.pid
502
 
        else:
503
 
            old_checker_pid = None
504
 
        r = Client.start_checker(self, *args, **kwargs)
505
 
        # Only emit D-Bus signal if new checker process was started
506
 
        if ((self.checker is not None)
507
 
            and not (old_checker is not None
508
 
                     and old_checker_pid == self.checker.pid)):
509
 
            self.CheckerStarted(self.current_checker_command)
510
 
            self.PropertyChanged(
511
 
                dbus.String("checker_running"),
512
 
                dbus.Boolean(True, variant_level=1))
513
 
        return r
514
 
    
515
 
    def stop_checker(self, *args, **kwargs):
516
 
        old_checker = getattr(self, "checker", None)
517
 
        r = Client.stop_checker(self, *args, **kwargs)
518
 
        if (old_checker is not None
519
 
            and getattr(self, "checker", None) is None):
520
 
            self.PropertyChanged(dbus.String(u"checker_running"),
521
 
                                 dbus.Boolean(False, variant_level=1))
522
 
        return r
523
 
    
524
 
    ## D-Bus methods & signals
525
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
526
 
    
527
 
    # CheckedOK - method
528
 
    CheckedOK = dbus.service.method(_interface)(checked_ok)
529
 
    CheckedOK.__name__ = "CheckedOK"
530
 
    
531
 
    # CheckerCompleted - signal
532
 
    @dbus.service.signal(_interface, signature="nxs")
533
 
    def CheckerCompleted(self, exitcode, waitstatus, command):
534
 
        "D-Bus signal"
535
 
        pass
536
 
    
537
 
    # CheckerStarted - signal
538
 
    @dbus.service.signal(_interface, signature="s")
539
 
    def CheckerStarted(self, command):
540
 
        "D-Bus signal"
541
 
        pass
542
 
    
543
 
    # GetAllProperties - method
544
 
    @dbus.service.method(_interface, out_signature="a{sv}")
545
 
    def GetAllProperties(self):
546
 
        "D-Bus method"
547
 
        return dbus.Dictionary({
548
 
                dbus.String("name"):
549
 
                    dbus.String(self.name, variant_level=1),
550
 
                dbus.String("fingerprint"):
551
 
                    dbus.String(self.fingerprint, variant_level=1),
552
 
                dbus.String("host"):
553
 
                    dbus.String(self.host, variant_level=1),
554
 
                dbus.String("created"):
555
 
                    _datetime_to_dbus(self.created, variant_level=1),
556
 
                dbus.String("last_enabled"):
557
 
                    (_datetime_to_dbus(self.last_enabled,
558
 
                                       variant_level=1)
559
 
                     if self.last_enabled is not None
560
 
                     else dbus.Boolean(False, variant_level=1)),
561
 
                dbus.String("enabled"):
562
 
                    dbus.Boolean(self.enabled, variant_level=1),
563
 
                dbus.String("last_checked_ok"):
564
 
                    (_datetime_to_dbus(self.last_checked_ok,
565
 
                                       variant_level=1)
566
 
                     if self.last_checked_ok is not None
567
 
                     else dbus.Boolean (False, variant_level=1)),
568
 
                dbus.String("timeout"):
569
 
                    dbus.UInt64(self.timeout_milliseconds(),
570
 
                                variant_level=1),
571
 
                dbus.String("interval"):
572
 
                    dbus.UInt64(self.interval_milliseconds(),
573
 
                                variant_level=1),
574
 
                dbus.String("checker"):
575
 
                    dbus.String(self.checker_command,
576
 
                                variant_level=1),
577
 
                dbus.String("checker_running"):
578
 
                    dbus.Boolean(self.checker is not None,
579
 
                                 variant_level=1),
580
 
                dbus.String("object_path"):
581
 
                    dbus.ObjectPath(self.dbus_object_path,
582
 
                                    variant_level=1)
583
 
                }, signature="sv")
584
 
    
585
 
    # IsStillValid - method
586
 
    @dbus.service.method(_interface, out_signature="b")
587
 
    def IsStillValid(self):
588
 
        return self.still_valid()
589
 
    
590
 
    # PropertyChanged - signal
591
 
    @dbus.service.signal(_interface, signature="sv")
592
 
    def PropertyChanged(self, property, value):
593
 
        "D-Bus signal"
594
 
        pass
595
 
    
596
 
    # ReceivedSecret - signal
597
 
    @dbus.service.signal(_interface)
598
 
    def ReceivedSecret(self):
599
 
        "D-Bus signal"
600
 
        pass
601
 
    
602
 
    # Rejected - signal
603
 
    @dbus.service.signal(_interface)
604
 
    def Rejected(self):
605
 
        "D-Bus signal"
606
 
        pass
607
 
    
608
 
    # SetChecker - method
609
 
    @dbus.service.method(_interface, in_signature="s")
610
 
    def SetChecker(self, checker):
611
 
        "D-Bus setter method"
612
 
        self.checker_command = checker
613
 
        # Emit D-Bus signal
614
 
        self.PropertyChanged(dbus.String(u"checker"),
615
 
                             dbus.String(self.checker_command,
616
 
                                         variant_level=1))
617
 
    
618
 
    # SetHost - method
619
 
    @dbus.service.method(_interface, in_signature="s")
620
 
    def SetHost(self, host):
621
 
        "D-Bus setter method"
622
 
        self.host = host
623
 
        # Emit D-Bus signal
624
 
        self.PropertyChanged(dbus.String(u"host"),
625
 
                             dbus.String(self.host, variant_level=1))
626
 
    
627
 
    # SetInterval - method
628
 
    @dbus.service.method(_interface, in_signature="t")
629
 
    def SetInterval(self, milliseconds):
630
 
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
631
 
        # Emit D-Bus signal
632
 
        self.PropertyChanged(dbus.String(u"interval"),
633
 
                             (dbus.UInt64(self.interval_milliseconds(),
634
 
                                          variant_level=1)))
635
 
    
636
 
    # SetSecret - method
637
 
    @dbus.service.method(_interface, in_signature="ay",
638
 
                         byte_arrays=True)
639
 
    def SetSecret(self, secret):
640
 
        "D-Bus setter method"
641
 
        self.secret = str(secret)
642
 
    
643
 
    # SetTimeout - method
644
 
    @dbus.service.method(_interface, in_signature="t")
645
 
    def SetTimeout(self, milliseconds):
646
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
647
 
        # Emit D-Bus signal
648
 
        self.PropertyChanged(dbus.String(u"timeout"),
649
 
                             (dbus.UInt64(self.timeout_milliseconds(),
650
 
                                          variant_level=1)))
651
 
    
652
 
    # Enable - method
653
 
    Enable = dbus.service.method(_interface)(enable)
654
 
    Enable.__name__ = "Enable"
655
 
    
656
 
    # StartChecker - method
657
 
    @dbus.service.method(_interface)
658
 
    def StartChecker(self):
659
 
        "D-Bus method"
660
 
        self.start_checker()
661
 
    
662
 
    # Disable - method
663
 
    @dbus.service.method(_interface)
664
 
    def Disable(self):
665
 
        "D-Bus method"
666
 
        self.disable()
667
 
    
668
 
    # StopChecker - method
669
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
670
 
    StopChecker.__name__ = "StopChecker"
671
 
    
672
 
    del _interface
673
 
 
674
 
 
675
380
def peer_certificate(session):
676
381
    "Return the peer's OpenPGP certificate as a bytestring"
677
382
    # If not an OpenPGP certificate...
678
 
    if (gnutls.library.functions
679
 
        .gnutls_certificate_type_get(session._c_object)
680
 
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
383
    if gnutls.library.functions.gnutls_certificate_type_get\
 
384
            (session._c_object) \
 
385
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
681
386
        # ...do the normal thing
682
387
        return session.peer_certificate
683
 
    list_size = ctypes.c_uint(1)
684
 
    cert_list = (gnutls.library.functions
685
 
                 .gnutls_certificate_get_peers
686
 
                 (session._c_object, ctypes.byref(list_size)))
687
 
    if not bool(cert_list) and list_size.value != 0:
688
 
        raise gnutls.errors.GNUTLSError("error getting peer"
689
 
                                        " certificate")
 
388
    list_size = ctypes.c_uint()
 
389
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
390
        (session._c_object, ctypes.byref(list_size))
690
391
    if list_size.value == 0:
691
392
        return None
692
393
    cert = cert_list[0]
695
396
 
696
397
def fingerprint(openpgp):
697
398
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
698
 
    # New GnuTLS "datum" with the OpenPGP public key
699
 
    datum = (gnutls.library.types
700
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
701
 
                                         ctypes.POINTER
702
 
                                         (ctypes.c_ubyte)),
703
 
                             ctypes.c_uint(len(openpgp))))
704
399
    # New empty GnuTLS certificate
705
400
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
706
 
    (gnutls.library.functions
707
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
401
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
402
        (ctypes.byref(crt))
 
403
    # New GnuTLS "datum" with the OpenPGP public key
 
404
    datum = gnutls.library.types.gnutls_datum_t\
 
405
        (ctypes.cast(ctypes.c_char_p(openpgp),
 
406
                     ctypes.POINTER(ctypes.c_ubyte)),
 
407
         ctypes.c_uint(len(openpgp)))
708
408
    # Import the OpenPGP public key into the certificate
709
 
    (gnutls.library.functions
710
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
711
 
                                gnutls.library.constants
712
 
                                .GNUTLS_OPENPGP_FMT_RAW))
713
 
    # Verify the self signature in the key
714
 
    crtverify = ctypes.c_uint()
715
 
    (gnutls.library.functions
716
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
717
 
    if crtverify.value != 0:
718
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
719
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
409
    ret = gnutls.library.functions.gnutls_openpgp_crt_import\
 
410
        (crt,
 
411
         ctypes.byref(datum),
 
412
         gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
720
413
    # New buffer for the fingerprint
721
 
    buf = ctypes.create_string_buffer(20)
722
 
    buf_len = ctypes.c_size_t()
 
414
    buffer = ctypes.create_string_buffer(20)
 
415
    buffer_length = ctypes.c_size_t()
723
416
    # Get the fingerprint from the certificate into the buffer
724
 
    (gnutls.library.functions
725
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
726
 
                                         ctypes.byref(buf_len)))
 
417
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
418
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
727
419
    # Deinit the certificate
728
420
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
729
421
    # Convert the buffer to a Python bytestring
730
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
422
    fpr = ctypes.string_at(buffer, buffer_length.value)
731
423
    # Convert the bytestring to hexadecimal notation
732
424
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
733
425
    return hex_fpr
734
426
 
735
427
 
736
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
428
class tcp_handler(SocketServer.BaseRequestHandler, object):
737
429
    """A TCP request handler class.
738
430
    Instantiated by IPv6_TCPServer for each request to handle it.
739
431
    Note: This will run in its own forked process."""
740
432
    
741
433
    def handle(self):
742
 
        logger.info(u"TCP connection from: %s",
743
 
                    unicode(self.client_address))
744
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
745
 
        # Open IPC pipe to parent process
746
 
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
747
 
            session = (gnutls.connection
748
 
                       .ClientSession(self.request,
749
 
                                      gnutls.connection
750
 
                                      .X509Credentials()))
751
 
            
752
 
            line = self.request.makefile().readline()
753
 
            logger.debug(u"Protocol version: %r", line)
754
 
            try:
755
 
                if int(line.strip().split()[0]) > 1:
756
 
                    raise RuntimeError
757
 
            except (ValueError, IndexError, RuntimeError), error:
758
 
                logger.error(u"Unknown protocol version: %s", error)
759
 
                return
760
 
            
761
 
            # Note: gnutls.connection.X509Credentials is really a
762
 
            # generic GnuTLS certificate credentials object so long as
763
 
            # no X.509 keys are added to it.  Therefore, we can use it
764
 
            # here despite using OpenPGP certificates.
765
 
            
766
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
767
 
            #                     "+AES-256-CBC", "+SHA1",
768
 
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
769
 
            #                     "+DHE-DSS"))
770
 
            # Use a fallback default, since this MUST be set.
771
 
            priority = self.server.settings.get("priority", "NORMAL")
772
 
            (gnutls.library.functions
773
 
             .gnutls_priority_set_direct(session._c_object,
774
 
                                         priority, None))
775
 
            
776
 
            try:
777
 
                session.handshake()
778
 
            except gnutls.errors.GNUTLSError, error:
779
 
                logger.warning(u"Handshake failed: %s", error)
780
 
                # Do not run session.bye() here: the session is not
781
 
                # established.  Just abandon the request.
782
 
                return
783
 
            logger.debug(u"Handshake succeeded")
784
 
            try:
785
 
                fpr = fingerprint(peer_certificate(session))
786
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
787
 
                logger.warning(u"Bad certificate: %s", error)
788
 
                session.bye()
789
 
                return
790
 
            logger.debug(u"Fingerprint: %s", fpr)
791
 
            
792
 
            for c in self.server.clients:
793
 
                if c.fingerprint == fpr:
794
 
                    client = c
795
 
                    break
796
 
            else:
797
 
                logger.warning(u"Client not found for fingerprint: %s",
798
 
                               fpr)
799
 
                ipc.write("NOTFOUND %s\n" % fpr)
800
 
                session.bye()
801
 
                return
802
 
            # Have to check if client.still_valid(), since it is
803
 
            # possible that the client timed out while establishing
804
 
            # the GnuTLS session.
805
 
            if not client.still_valid():
806
 
                logger.warning(u"Client %(name)s is invalid",
807
 
                               vars(client))
808
 
                ipc.write("INVALID %s\n" % client.name)
809
 
                session.bye()
810
 
                return
811
 
            ipc.write("SENDING %s\n" % client.name)
812
 
            sent_size = 0
813
 
            while sent_size < len(client.secret):
814
 
                sent = session.send(client.secret[sent_size:])
815
 
                logger.debug(u"Sent: %d, remaining: %d",
816
 
                             sent, len(client.secret)
817
 
                             - (sent_size + sent))
818
 
                sent_size += sent
819
 
            session.bye()
820
 
 
821
 
 
822
 
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
823
 
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
824
 
    Assumes a gobject.MainLoop event loop.
825
 
    """
826
 
    def process_request(self, request, client_address):
827
 
        """This overrides and wraps the original process_request().
828
 
        This function creates a new pipe in self.pipe 
829
 
        """
830
 
        self.pipe = os.pipe()
831
 
        super(ForkingMixInWithPipe,
832
 
              self).process_request(request, client_address)
833
 
        os.close(self.pipe[1])  # close write end
834
 
        # Call "handle_ipc" for both data and EOF events
835
 
        gobject.io_add_watch(self.pipe[0],
836
 
                             gobject.IO_IN | gobject.IO_HUP,
837
 
                             self.handle_ipc)
838
 
    def handle_ipc(source, condition):
839
 
        """Dummy function; override as necessary"""
840
 
        os.close(source)
841
 
        return False
842
 
 
843
 
 
844
 
class IPv6_TCPServer(ForkingMixInWithPipe,
845
 
                     SocketServer.TCPServer, object):
846
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
 
434
        logger.debug(u"TCP connection from: %s",
 
435
                     unicode(self.client_address))
 
436
        session = gnutls.connection.ClientSession\
 
437
                  (self.request, gnutls.connection.X509Credentials())
 
438
        # Note: gnutls.connection.X509Credentials is really a generic
 
439
        # GnuTLS certificate credentials object so long as no X.509
 
440
        # keys are added to it.  Therefore, we can use it here despite
 
441
        # using OpenPGP certificates.
 
442
        
 
443
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
 
444
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
445
        #                "+DHE-DSS"))
 
446
        priority = "NORMAL"             # Fallback default, since this
 
447
                                        # MUST be set.
 
448
        if self.server.settings["priority"]:
 
449
            priority = self.server.settings["priority"]
 
450
        gnutls.library.functions.gnutls_priority_set_direct\
 
451
            (session._c_object, priority, None);
 
452
        
 
453
        try:
 
454
            session.handshake()
 
455
        except gnutls.errors.GNUTLSError, error:
 
456
            logger.debug(u"Handshake failed: %s", error)
 
457
            # Do not run session.bye() here: the session is not
 
458
            # established.  Just abandon the request.
 
459
            return
 
460
        try:
 
461
            fpr = fingerprint(peer_certificate(session))
 
462
        except (TypeError, gnutls.errors.GNUTLSError), error:
 
463
            logger.debug(u"Bad certificate: %s", error)
 
464
            session.bye()
 
465
            return
 
466
        logger.debug(u"Fingerprint: %s", fpr)
 
467
        client = None
 
468
        for c in self.server.clients:
 
469
            if c.fingerprint == fpr:
 
470
                client = c
 
471
                break
 
472
        if not client:
 
473
            logger.debug(u"Client not found for fingerprint: %s", fpr)
 
474
            session.bye()
 
475
            return
 
476
        # Have to check if client.still_valid(), since it is possible
 
477
        # that the client timed out while establishing the GnuTLS
 
478
        # session.
 
479
        if not client.still_valid():
 
480
            logger.debug(u"Client %(name)s is invalid", vars(client))
 
481
            session.bye()
 
482
            return
 
483
        sent_size = 0
 
484
        while sent_size < len(client.secret):
 
485
            sent = session.send(client.secret[sent_size:])
 
486
            logger.debug(u"Sent: %d, remaining: %d",
 
487
                         sent, len(client.secret)
 
488
                         - (sent_size + sent))
 
489
            sent_size += sent
 
490
        session.bye()
 
491
 
 
492
 
 
493
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
494
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
847
495
    Attributes:
848
496
        settings:       Server settings
849
497
        clients:        Set() of Client objects
850
 
        enabled:        Boolean; whether this server is activated yet
851
498
    """
852
499
    address_family = socket.AF_INET6
853
500
    def __init__(self, *args, **kwargs):
857
504
        if "clients" in kwargs:
858
505
            self.clients = kwargs["clients"]
859
506
            del kwargs["clients"]
860
 
        if "use_ipv6" in kwargs:
861
 
            if not kwargs["use_ipv6"]:
862
 
                self.address_family = socket.AF_INET
863
 
            del kwargs["use_ipv6"]
864
 
        self.enabled = False
865
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
507
        return super(type(self), self).__init__(*args, **kwargs)
866
508
    def server_bind(self):
867
509
        """This overrides the normal server_bind() function
868
510
        to bind to an interface if one was specified, and also NOT to
876
518
                                       self.settings["interface"])
877
519
            except socket.error, error:
878
520
                if error[0] == errno.EPERM:
879
 
                    logger.error(u"No permission to"
880
 
                                 u" bind to interface %s",
881
 
                                 self.settings["interface"])
 
521
                    logger.warning(u"No permission to"
 
522
                                   u" bind to interface %s",
 
523
                                   self.settings["interface"])
882
524
                else:
883
 
                    raise
 
525
                    raise error
884
526
        # Only bind(2) the socket if we really need to.
885
527
        if self.server_address[0] or self.server_address[1]:
886
528
            if not self.server_address[0]:
887
 
                if self.address_family == socket.AF_INET6:
888
 
                    any_address = "::" # in6addr_any
889
 
                else:
890
 
                    any_address = socket.INADDR_ANY
891
 
                self.server_address = (any_address,
 
529
                in6addr_any = "::"
 
530
                self.server_address = (in6addr_any,
892
531
                                       self.server_address[1])
893
 
            elif not self.server_address[1]:
 
532
            elif self.server_address[1] is None:
894
533
                self.server_address = (self.server_address[0],
895
534
                                       0)
896
 
#                 if self.settings["interface"]:
897
 
#                     self.server_address = (self.server_address[0],
898
 
#                                            0, # port
899
 
#                                            0, # flowinfo
900
 
#                                            if_nametoindex
901
 
#                                            (self.settings
902
 
#                                             ["interface"]))
903
 
            return super(IPv6_TCPServer, self).server_bind()
904
 
    def server_activate(self):
905
 
        if self.enabled:
906
 
            return super(IPv6_TCPServer, self).server_activate()
907
 
    def enable(self):
908
 
        self.enabled = True
909
 
    def handle_ipc(self, source, condition, file_objects={}):
910
 
        condition_names = {
911
 
            gobject.IO_IN: "IN", # There is data to read.
912
 
            gobject.IO_OUT: "OUT", # Data can be written (without
913
 
                                   # blocking).
914
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
915
 
            gobject.IO_ERR: "ERR", # Error condition.
916
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
917
 
                                   # broken, usually for pipes and
918
 
                                   # sockets).
919
 
            }
920
 
        conditions_string = ' | '.join(name
921
 
                                       for cond, name in
922
 
                                       condition_names.iteritems()
923
 
                                       if cond & condition)
924
 
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
925
 
                     conditions_string)
926
 
        
927
 
        # Turn the pipe file descriptor into a Python file object
928
 
        if source not in file_objects:
929
 
            file_objects[source] = os.fdopen(source, "r", 1)
930
 
        
931
 
        # Read a line from the file object
932
 
        cmdline = file_objects[source].readline()
933
 
        if not cmdline:             # Empty line means end of file
934
 
            # close the IPC pipe
935
 
            file_objects[source].close()
936
 
            del file_objects[source]
937
 
            
938
 
            # Stop calling this function
939
 
            return False
940
 
        
941
 
        logger.debug("IPC command: %r\n" % cmdline)
942
 
        
943
 
        # Parse and act on command
944
 
        cmd, args = cmdline.split(None, 1)
945
 
        if cmd == "NOTFOUND":
946
 
            if self.settings["use_dbus"]:
947
 
                # Emit D-Bus signal
948
 
                mandos_dbus_service.ClientNotFound(args)
949
 
        elif cmd == "INVALID":
950
 
            if self.settings["use_dbus"]:
951
 
                for client in self.clients:
952
 
                    if client.name == args:
953
 
                        # Emit D-Bus signal
954
 
                        client.Rejected()
955
 
                        break
956
 
        elif cmd == "SENDING":
957
 
            for client in self.clients:
958
 
                if client.name == args:
959
 
                    client.checked_ok()
960
 
                    if self.settings["use_dbus"]:
961
 
                        # Emit D-Bus signal
962
 
                        client.ReceivedSecret()
963
 
                    break
964
 
        else:
965
 
            logger.error("Unknown IPC command: %r", cmdline)
966
 
        
967
 
        # Keep calling this function
968
 
        return True
 
535
            return super(type(self), self).server_bind()
969
536
 
970
537
 
971
538
def string_to_delta(interval):
972
539
    """Parse a string and return a datetime.timedelta
973
 
    
 
540
 
974
541
    >>> string_to_delta('7d')
975
542
    datetime.timedelta(7)
976
543
    >>> string_to_delta('60s')
981
548
    datetime.timedelta(1)
982
549
    >>> string_to_delta(u'1w')
983
550
    datetime.timedelta(7)
984
 
    >>> string_to_delta('5m 30s')
985
 
    datetime.timedelta(0, 330)
986
551
    """
987
 
    timevalue = datetime.timedelta(0)
988
 
    for s in interval.split():
989
 
        try:
990
 
            suffix = unicode(s[-1])
991
 
            value = int(s[:-1])
992
 
            if suffix == u"d":
993
 
                delta = datetime.timedelta(value)
994
 
            elif suffix == u"s":
995
 
                delta = datetime.timedelta(0, value)
996
 
            elif suffix == u"m":
997
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
998
 
            elif suffix == u"h":
999
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1000
 
            elif suffix == u"w":
1001
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1002
 
            else:
1003
 
                raise ValueError
1004
 
        except (ValueError, IndexError):
 
552
    try:
 
553
        suffix=unicode(interval[-1])
 
554
        value=int(interval[:-1])
 
555
        if suffix == u"d":
 
556
            delta = datetime.timedelta(value)
 
557
        elif suffix == u"s":
 
558
            delta = datetime.timedelta(0, value)
 
559
        elif suffix == u"m":
 
560
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
561
        elif suffix == u"h":
 
562
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
563
        elif suffix == u"w":
 
564
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
565
        else:
1005
566
            raise ValueError
1006
 
        timevalue += delta
1007
 
    return timevalue
 
567
    except (ValueError, IndexError):
 
568
        raise ValueError
 
569
    return delta
1008
570
 
1009
571
 
1010
572
def server_state_changed(state):
1011
573
    """Derived from the Avahi example code"""
1012
574
    if state == avahi.SERVER_COLLISION:
1013
 
        logger.error(u"Zeroconf server name collision")
 
575
        logger.warning(u"Server name collision")
1014
576
        service.remove()
1015
577
    elif state == avahi.SERVER_RUNNING:
1016
578
        service.add()
1018
580
 
1019
581
def entry_group_state_changed(state, error):
1020
582
    """Derived from the Avahi example code"""
1021
 
    logger.debug(u"Avahi state change: %i", state)
 
583
    logger.debug(u"state change: %i", state)
1022
584
    
1023
585
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
1024
 
        logger.debug(u"Zeroconf service established.")
 
586
        logger.debug(u"Service established.")
1025
587
    elif state == avahi.ENTRY_GROUP_COLLISION:
1026
 
        logger.warning(u"Zeroconf service name collision.")
 
588
        logger.warning(u"Service name collision.")
1027
589
        service.rename()
1028
590
    elif state == avahi.ENTRY_GROUP_FAILURE:
1029
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
591
        logger.critical(u"Error in group state changed %s",
1030
592
                        unicode(error))
1031
 
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
593
        raise AvahiGroupError("State changed: %s", str(error))
1032
594
 
1033
 
def if_nametoindex(interface):
 
595
def if_nametoindex(interface, _func=[None]):
1034
596
    """Call the C function if_nametoindex(), or equivalent"""
1035
 
    global if_nametoindex
 
597
    if _func[0] is not None:
 
598
        return _func[0](interface)
1036
599
    try:
1037
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1038
 
                          (ctypes.util.find_library("c"))
1039
 
                          .if_nametoindex)
 
600
        if "ctypes.util" not in sys.modules:
 
601
            import ctypes.util
 
602
        while True:
 
603
            try:
 
604
                libc = ctypes.cdll.LoadLibrary\
 
605
                       (ctypes.util.find_library("c"))
 
606
                _func[0] = libc.if_nametoindex
 
607
                return _func[0](interface)
 
608
            except IOError, e:
 
609
                if e != errno.EINTR:
 
610
                    raise
1040
611
    except (OSError, AttributeError):
1041
612
        if "struct" not in sys.modules:
1042
613
            import struct
1043
614
        if "fcntl" not in sys.modules:
1044
615
            import fcntl
1045
 
        def if_nametoindex(interface):
 
616
        def the_hard_way(interface):
1046
617
            "Get an interface index the hard way, i.e. using fcntl()"
1047
618
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1048
 
            with closing(socket.socket()) as s:
1049
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1050
 
                                    struct.pack("16s16x", interface))
 
619
            s = socket.socket()
 
620
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
621
                                struct.pack("16s16x", interface))
 
622
            s.close()
1051
623
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1052
624
            return interface_index
1053
 
    return if_nametoindex(interface)
1054
 
 
1055
 
 
1056
 
def daemon(nochdir = False, noclose = False):
 
625
        _func[0] = the_hard_way
 
626
        return _func[0](interface)
 
627
 
 
628
 
 
629
def daemon(nochdir, noclose):
1057
630
    """See daemon(3).  Standard BSD Unix function.
1058
631
    This should really exist as os.daemon, but it doesn't (yet)."""
1059
632
    if os.fork():
1061
634
    os.setsid()
1062
635
    if not nochdir:
1063
636
        os.chdir("/")
1064
 
    if os.fork():
1065
 
        sys.exit()
1066
637
    if not noclose:
1067
638
        # Close all standard open file descriptors
1068
639
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1077
648
 
1078
649
 
1079
650
def main():
1080
 
    
1081
 
    ######################################################################
1082
 
    # Parsing of options, both command line and config file
1083
 
    
1084
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
651
    global main_loop_started
 
652
    main_loop_started = False
 
653
    
 
654
    parser = OptionParser()
1085
655
    parser.add_option("-i", "--interface", type="string",
1086
656
                      metavar="IF", help="Bind to interface IF")
1087
657
    parser.add_option("-a", "--address", type="string",
1088
658
                      help="Address to listen for requests on")
1089
659
    parser.add_option("-p", "--port", type="int",
1090
660
                      help="Port number to receive requests on")
1091
 
    parser.add_option("--check", action="store_true",
 
661
    parser.add_option("--check", action="store_true", default=False,
1092
662
                      help="Run self-test")
1093
 
    parser.add_option("--debug", action="store_true",
 
663
    parser.add_option("--debug", action="store_true", default=False,
1094
664
                      help="Debug mode; run in foreground and log to"
1095
665
                      " terminal")
1096
666
    parser.add_option("--priority", type="string", help="GnuTLS"
1101
671
                      default="/etc/mandos", metavar="DIR",
1102
672
                      help="Directory to search for configuration"
1103
673
                      " files")
1104
 
    parser.add_option("--no-dbus", action="store_false",
1105
 
                      dest="use_dbus",
1106
 
                      help="Do not provide D-Bus system bus"
1107
 
                      " interface")
1108
 
    parser.add_option("--no-ipv6", action="store_false",
1109
 
                      dest="use_ipv6", help="Do not use IPv6")
1110
 
    options = parser.parse_args()[0]
 
674
    (options, args) = parser.parse_args()
1111
675
    
1112
676
    if options.check:
1113
677
        import doctest
1122
686
                        "priority":
1123
687
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1124
688
                        "servicename": "Mandos",
1125
 
                        "use_dbus": "True",
1126
 
                        "use_ipv6": "True",
1127
689
                        }
1128
690
    
1129
691
    # Parse config file for server-global settings
1130
692
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1131
693
    del server_defaults
1132
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
694
    server_config.read(os.path.join(options.configdir, "server.conf"))
 
695
    server_section = "server"
1133
696
    # Convert the SafeConfigParser object to a dict
1134
 
    server_settings = server_config.defaults()
1135
 
    # Use the appropriate methods on the non-string config options
1136
 
    server_settings["debug"] = server_config.getboolean("DEFAULT",
1137
 
                                                        "debug")
1138
 
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
1139
 
                                                           "use_dbus")
1140
 
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
1141
 
                                                           "use_ipv6")
1142
 
    if server_settings["port"]:
1143
 
        server_settings["port"] = server_config.getint("DEFAULT",
1144
 
                                                       "port")
 
697
    server_settings = dict(server_config.items(server_section))
 
698
    # Use getboolean on the boolean config option
 
699
    server_settings["debug"] = server_config.getboolean\
 
700
                               (server_section, "debug")
1145
701
    del server_config
1146
702
    
1147
703
    # Override the settings from the config file with command line
1148
704
    # options, if set.
1149
705
    for option in ("interface", "address", "port", "debug",
1150
 
                   "priority", "servicename", "configdir",
1151
 
                   "use_dbus", "use_ipv6"):
 
706
                   "priority", "servicename", "configdir"):
1152
707
        value = getattr(options, option)
1153
708
        if value is not None:
1154
709
            server_settings[option] = value
1155
710
    del options
1156
711
    # Now we have our good server settings in "server_settings"
1157
712
    
1158
 
    ##################################################################
1159
 
    
1160
 
    # For convenience
1161
 
    debug = server_settings["debug"]
1162
 
    use_dbus = server_settings["use_dbus"]
1163
 
    use_ipv6 = server_settings["use_ipv6"]
1164
 
    
1165
 
    if not debug:
1166
 
        syslogger.setLevel(logging.WARNING)
1167
 
        console.setLevel(logging.WARNING)
1168
 
    
1169
 
    if server_settings["servicename"] != "Mandos":
1170
 
        syslogger.setFormatter(logging.Formatter
1171
 
                               ('Mandos (%s) [%%(process)d]:'
1172
 
                                ' %%(levelname)s: %%(message)s'
1173
 
                                % server_settings["servicename"]))
1174
 
    
1175
713
    # Parse config file with clients
1176
714
    client_defaults = { "timeout": "1h",
1177
715
                        "interval": "5m",
1178
 
                        "checker": "fping -q -- %%(host)s",
1179
 
                        "host": "",
 
716
                        "checker": "fping -q -- %%(fqdn)s",
1180
717
                        }
1181
718
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1182
719
    client_config.read(os.path.join(server_settings["configdir"],
1183
720
                                    "clients.conf"))
1184
 
 
1185
 
    global mandos_dbus_service
1186
 
    mandos_dbus_service = None
1187
 
    
1188
 
    clients = Set()
1189
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
1190
 
                                 server_settings["port"]),
1191
 
                                TCP_handler,
1192
 
                                settings=server_settings,
1193
 
                                clients=clients, use_ipv6=use_ipv6)
1194
 
    pidfilename = "/var/run/mandos.pid"
1195
 
    try:
1196
 
        pidfile = open(pidfilename, "w")
1197
 
    except IOError:
1198
 
        logger.error("Could not open file %r", pidfilename)
1199
 
    
1200
 
    try:
1201
 
        uid = pwd.getpwnam("_mandos").pw_uid
1202
 
        gid = pwd.getpwnam("_mandos").pw_gid
1203
 
    except KeyError:
1204
 
        try:
1205
 
            uid = pwd.getpwnam("mandos").pw_uid
1206
 
            gid = pwd.getpwnam("mandos").pw_gid
1207
 
        except KeyError:
1208
 
            try:
1209
 
                uid = pwd.getpwnam("nobody").pw_uid
1210
 
                gid = pwd.getpwnam("nogroup").pw_gid
1211
 
            except KeyError:
1212
 
                uid = 65534
1213
 
                gid = 65534
1214
 
    try:
1215
 
        os.setgid(gid)
1216
 
        os.setuid(uid)
1217
 
    except OSError, error:
1218
 
        if error[0] != errno.EPERM:
1219
 
            raise error
1220
 
    
1221
 
    # Enable all possible GnuTLS debugging
1222
 
    if debug:
1223
 
        # "Use a log level over 10 to enable all debugging options."
1224
 
        # - GnuTLS manual
1225
 
        gnutls.library.functions.gnutls_global_set_log_level(11)
1226
 
        
1227
 
        @gnutls.library.types.gnutls_log_func
1228
 
        def debug_gnutls(level, string):
1229
 
            logger.debug("GnuTLS: %s", string[:-1])
1230
 
        
1231
 
        (gnutls.library.functions
1232
 
         .gnutls_global_set_log_function(debug_gnutls))
1233
721
    
1234
722
    global service
1235
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1236
723
    service = AvahiService(name = server_settings["servicename"],
1237
 
                           servicetype = "_mandos._tcp",
1238
 
                           protocol = protocol)
 
724
                           type = "_mandos._tcp", );
1239
725
    if server_settings["interface"]:
1240
 
        service.interface = (if_nametoindex
1241
 
                             (server_settings["interface"]))
 
726
        service.interface = if_nametoindex(server_settings["interface"])
1242
727
    
1243
728
    global main_loop
1244
729
    global bus
1247
732
    DBusGMainLoop(set_as_default=True )
1248
733
    main_loop = gobject.MainLoop()
1249
734
    bus = dbus.SystemBus()
1250
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1251
 
                                           avahi.DBUS_PATH_SERVER),
1252
 
                            avahi.DBUS_INTERFACE_SERVER)
 
735
    server = dbus.Interface(
 
736
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
737
            avahi.DBUS_INTERFACE_SERVER )
1253
738
    # End of Avahi example code
1254
 
    if use_dbus:
1255
 
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1256
739
    
1257
 
    client_class = Client
1258
 
    if use_dbus:
1259
 
        client_class = ClientDBus
1260
 
    clients.update(Set(
1261
 
            client_class(name = section,
1262
 
                         config= dict(client_config.items(section)))
1263
 
            for section in client_config.sections()))
1264
 
    if not clients:
1265
 
        logger.warning(u"No clients defined")
 
740
    debug = server_settings["debug"]
1266
741
    
1267
742
    if debug:
1268
 
        # Redirect stdin so all checkers get /dev/null
1269
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1270
 
        os.dup2(null, sys.stdin.fileno())
1271
 
        if null > 2:
1272
 
            os.close(null)
1273
 
    else:
1274
 
        # No console logging
1275
 
        logger.removeHandler(console)
1276
 
        # Close all input and output, do double fork, etc.
1277
 
        daemon()
1278
 
    
1279
 
    try:
1280
 
        with closing(pidfile):
1281
 
            pid = os.getpid()
1282
 
            pidfile.write(str(pid) + "\n")
1283
 
        del pidfile
1284
 
    except IOError:
1285
 
        logger.error(u"Could not write to file %r with PID %d",
1286
 
                     pidfilename, pid)
1287
 
    except NameError:
1288
 
        # "pidfile" was never created
1289
 
        pass
1290
 
    del pidfilename
 
743
        console = logging.StreamHandler()
 
744
        # console.setLevel(logging.DEBUG)
 
745
        console.setFormatter(logging.Formatter\
 
746
                             ('%(levelname)s: %(message)s'))
 
747
        logger.addHandler(console)
 
748
        del console
 
749
    
 
750
    clients = Set()
 
751
    def remove_from_clients(client):
 
752
        clients.remove(client)
 
753
        if not clients:
 
754
            logger.debug(u"No clients left, exiting")
 
755
            sys.exit()
 
756
    
 
757
    clients.update(Set(Client(name=section,
 
758
                              stop_hook = remove_from_clients,
 
759
                              **(dict(client_config\
 
760
                                      .items(section))))
 
761
                       for section in client_config.sections()))
 
762
    
 
763
    if not debug:
 
764
        daemon(False, False)
1291
765
    
1292
766
    def cleanup():
1293
767
        "Cleanup function; run on exit"
1300
774
        
1301
775
        while clients:
1302
776
            client = clients.pop()
1303
 
            client.disable_hook = None
1304
 
            client.disable()
 
777
            client.stop_hook = None
 
778
            client.stop()
1305
779
    
1306
780
    atexit.register(cleanup)
1307
781
    
1310
784
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1311
785
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1312
786
    
1313
 
    if use_dbus:
1314
 
        class MandosDBusService(dbus.service.Object):
1315
 
            """A D-Bus proxy object"""
1316
 
            def __init__(self):
1317
 
                dbus.service.Object.__init__(self, bus, "/")
1318
 
            _interface = u"se.bsnet.fukt.Mandos"
1319
 
            
1320
 
            @dbus.service.signal(_interface, signature="oa{sv}")
1321
 
            def ClientAdded(self, objpath, properties):
1322
 
                "D-Bus signal"
1323
 
                pass
1324
 
            
1325
 
            @dbus.service.signal(_interface, signature="s")
1326
 
            def ClientNotFound(self, fingerprint):
1327
 
                "D-Bus signal"
1328
 
                pass
1329
 
            
1330
 
            @dbus.service.signal(_interface, signature="os")
1331
 
            def ClientRemoved(self, objpath, name):
1332
 
                "D-Bus signal"
1333
 
                pass
1334
 
            
1335
 
            @dbus.service.method(_interface, out_signature="ao")
1336
 
            def GetAllClients(self):
1337
 
                "D-Bus method"
1338
 
                return dbus.Array(c.dbus_object_path for c in clients)
1339
 
            
1340
 
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1341
 
            def GetAllClientsWithProperties(self):
1342
 
                "D-Bus method"
1343
 
                return dbus.Dictionary(
1344
 
                    ((c.dbus_object_path, c.GetAllProperties())
1345
 
                     for c in clients),
1346
 
                    signature="oa{sv}")
1347
 
            
1348
 
            @dbus.service.method(_interface, in_signature="o")
1349
 
            def RemoveClient(self, object_path):
1350
 
                "D-Bus method"
1351
 
                for c in clients:
1352
 
                    if c.dbus_object_path == object_path:
1353
 
                        clients.remove(c)
1354
 
                        c.remove_from_connection()
1355
 
                        # Don't signal anything except ClientRemoved
1356
 
                        c.disable(signal=False)
1357
 
                        # Emit D-Bus signal
1358
 
                        self.ClientRemoved(object_path, c.name)
1359
 
                        return
1360
 
                raise KeyError
1361
 
            
1362
 
            del _interface
1363
 
        
1364
 
        mandos_dbus_service = MandosDBusService()
1365
 
    
1366
787
    for client in clients:
1367
 
        if use_dbus:
1368
 
            # Emit D-Bus signal
1369
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1370
 
                                            client.GetAllProperties())
1371
 
        client.enable()
1372
 
    
1373
 
    tcp_server.enable()
1374
 
    tcp_server.server_activate()
1375
 
    
 
788
        client.start()
 
789
    
 
790
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
791
                                 server_settings["port"]),
 
792
                                tcp_handler,
 
793
                                settings=server_settings,
 
794
                                clients=clients)
1376
795
    # Find out what port we got
1377
796
    service.port = tcp_server.socket.getsockname()[1]
1378
 
    if use_ipv6:
1379
 
        logger.info(u"Now listening on address %r, port %d,"
1380
 
                    " flowinfo %d, scope_id %d"
1381
 
                    % tcp_server.socket.getsockname())
1382
 
    else:                       # IPv4
1383
 
        logger.info(u"Now listening on address %r, port %d"
1384
 
                    % tcp_server.socket.getsockname())
 
797
    logger.debug(u"Now listening on address %r, port %d, flowinfo %d,"
 
798
                 u" scope_id %d" % tcp_server.socket.getsockname())
1385
799
    
1386
800
    #service.interface = tcp_server.socket.getsockname()[3]
1387
801
    
1397
811
        
1398
812
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1399
813
                             lambda *args, **kwargs:
1400
 
                             (tcp_server.handle_request
1401
 
                              (*args[2:], **kwargs) or True))
 
814
                             tcp_server.handle_request\
 
815
                             (*args[2:], **kwargs) or True)
1402
816
        
1403
 
        logger.debug(u"Starting main loop")
 
817
        logger.debug("Starting main loop")
 
818
        main_loop_started = True
1404
819
        main_loop.run()
1405
820
    except AvahiError, error:
1406
 
        logger.critical(u"AvahiError: %s", error)
 
821
        logger.critical(u"AvahiError: %s" + unicode(error))
1407
822
        sys.exit(1)
1408
823
    except KeyboardInterrupt:
1409
824
        if debug:
1410
 
            print >> sys.stderr
1411
 
        logger.debug("Server received KeyboardInterrupt")
1412
 
    logger.debug("Server exiting")
 
825
            print
1413
826
 
1414
827
if __name__ == '__main__':
1415
828
    main()