/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-02-25 01:47:45 UTC
  • mfrom: (237.2.18 mandos-release)
  • Revision ID: teddy@fukt.bsnet.se-20090225014745-8yyzt3b2q56nzk9l
Merge from release branch.

Show diffs side-by-side

added added

removed removed

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