/mandos/release

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

« back to all changes in this revision

Viewing changes to server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-03 01:09:36 UTC
  • mfrom: (24.1.9 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080803010936-ujme8tgxceszfbi1
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
                            Take an additional non-option argument and
                            parse it as a plus-separated and -prefixed
                            list of additional options.

* plugins.d/mandosclient.c (DH_BITS): Replaced with
                                      "mandos_context.dh_bits".  All
                                      users changed.
  (certdir): Renamed to "keydir".  All users changed.
  (certfile): Renamed to "pubkeyfile".  All users changed.
  (certkey): Renamed to "seckeyfile".  All users changed.
  (encrypted_session): Replaced with "mandos_context".  All users
                       changed.
  (initgnutls): Take additional "session" and "dh_params" arguments.
                All callers changed.
  (start_mandos_communication): Take additional "mc" argument.  All
                                callers changed.  Print target IPv6
                                address if different than supplied
                                string.
  (simple_poll) Replaced with "mandos_context.simple_poll".  All users
                changed.
  (server): Replaced with "mandos_context.server".  All users changed.
  (main): Default interface to "eth0".  Rename "--certdir" to
          "--keydir", "--certkey" to "--seckey", and "--certfile" to
          "--pubkey".  New options "--dh-bits" and "--priority".  If
          the interface is not up, bring it up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
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 Teddy Hogeborn
15
 
# Copyright © 2008 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
 
36
import select
38
37
from optparse import OptionParser
39
38
import datetime
40
39
import errno
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.2"
 
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: %(levelname)s: %(message)s'))
 
77
syslogger = logging.handlers.SysLogHandler\
 
78
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
 
79
syslogger.setFormatter(logging.Formatter\
 
80
                        ('%(levelname)s: %(message)s'))
77
81
logger.addHandler(syslogger)
 
82
del syslogger
78
83
 
79
 
console = logging.StreamHandler()
80
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
81
 
                                       ' %(message)s'))
82
 
logger.addHandler(console)
83
84
 
84
85
class AvahiError(Exception):
85
86
    def __init__(self, value):
86
87
        self.value = value
87
 
        super(AvahiError, self).__init__()
88
88
    def __str__(self):
89
89
        return repr(self.value)
90
90
 
96
96
 
97
97
 
98
98
class AvahiService(object):
99
 
    """An Avahi (Zeroconf) service.
100
 
    Attributes:
 
99
    """
101
100
    interface: integer; avahi.IF_UNSPEC or an interface index.
102
101
               Used to optionally bind to the specified interface.
103
 
    name: string; Example: 'Mandos'
104
 
    type: string; Example: '_mandos._tcp'.
105
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
106
 
    port: integer; what port to announce
107
 
    TXT: list of strings; TXT record for the service
108
 
    domain: string; Domain to publish on, default to .local if empty.
109
 
    host: string; Host to publish records for, default is localhost
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
 
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
113
113
    """
114
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
 
                 servicetype = None, port = None, TXT = None,
116
 
                 domain = "", host = "", max_renames = 32768):
 
115
                 type = None, port = None, TXT = None, domain = "",
 
116
                 host = "", max_renames = 12):
 
117
        """An Avahi (Zeroconf) service. """
117
118
        self.interface = interface
118
119
        self.name = name
119
 
        self.type = servicetype
 
120
        self.type = type
120
121
        self.port = port
121
 
        self.TXT = TXT if TXT is not None else []
 
122
        if TXT is None:
 
123
            self.TXT = []
 
124
        else:
 
125
            self.TXT = TXT
122
126
        self.domain = domain
123
127
        self.host = host
124
128
        self.rename_count = 0
125
 
        self.max_renames = max_renames
126
129
    def rename(self):
127
130
        """Derived from the Avahi example code"""
128
131
        if self.rename_count >= self.max_renames:
129
 
            logger.critical(u"No suitable Zeroconf service name found"
130
 
                            u" after %i retries, exiting.",
131
 
                            self.rename_count)
 
132
            logger.critical(u"No suitable service name found after %i"
 
133
                            u" retries, exiting.", rename_count)
132
134
            raise AvahiServiceError("Too many renames")
133
 
        self.name = server.GetAlternativeServiceName(self.name)
134
 
        logger.info(u"Changing Zeroconf service name to %r ...",
135
 
                    str(self.name))
136
 
        syslogger.setFormatter(logging.Formatter
137
 
                               ('Mandos (%s): %%(levelname)s:'
138
 
                                ' %%(message)s' % self.name))
 
135
        name = server.GetAlternativeServiceName(name)
 
136
        logger.notice(u"Changing name to %r ...", name)
139
137
        self.remove()
140
138
        self.add()
141
139
        self.rename_count += 1
147
145
        """Derived from the Avahi example code"""
148
146
        global group
149
147
        if group is None:
150
 
            group = dbus.Interface(bus.get_object
151
 
                                   (avahi.DBUS_NAME,
 
148
            group = dbus.Interface\
 
149
                    (bus.get_object(avahi.DBUS_NAME,
152
150
                                    server.EntryGroupNew()),
153
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
152
            group.connect_to_signal('StateChanged',
155
153
                                    entry_group_state_changed)
156
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
154
        logger.debug(u"Adding service '%s' of type '%s' ...",
157
155
                     service.name, service.type)
158
156
        group.AddService(
159
157
                self.interface,         # interface
170
168
# End of Avahi example code
171
169
 
172
170
 
173
 
class Client(dbus.service.Object):
 
171
class Client(object):
174
172
    """A representation of a client host served by this server.
175
173
    Attributes:
176
174
    name:      string; from the config file, used in log messages
177
175
    fingerprint: string (40 or 32 hexadecimal digits); used to
178
176
                 uniquely identify the client
179
177
    secret:    bytestring; sent verbatim (over TLS) to client
180
 
    host:      string; available for use by the checker command
181
 
    created:   datetime.datetime(); (UTC) object creation
182
 
    started:   datetime.datetime(); (UTC) last started
183
 
    last_checked_ok: datetime.datetime(); (UTC) or None
 
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
184
181
    timeout:   datetime.timedelta(); How long from last_checked_ok
185
182
                                     until this client is invalid
186
183
    interval:  datetime.timedelta(); How often to start a new checker
202
199
    _interval_milliseconds: - '' -
203
200
    """
204
201
    def _set_timeout(self, timeout):
205
 
        "Setter function for the 'timeout' attribute"
 
202
        "Setter function for 'timeout' attribute"
206
203
        self._timeout = timeout
207
204
        self._timeout_milliseconds = ((self.timeout.days
208
205
                                       * 24 * 60 * 60 * 1000)
209
206
                                      + (self.timeout.seconds * 1000)
210
207
                                      + (self.timeout.microseconds
211
208
                                         // 1000))
212
 
        # Emit D-Bus signal
213
 
        self.TimeoutChanged(self._timeout_milliseconds)
214
 
    timeout = property(lambda self: self._timeout, _set_timeout)
 
209
    timeout = property(lambda self: self._timeout,
 
210
                       _set_timeout)
215
211
    del _set_timeout
216
 
    
217
212
    def _set_interval(self, interval):
218
 
        "Setter function for the 'interval' attribute"
 
213
        "Setter function for 'interval' attribute"
219
214
        self._interval = interval
220
215
        self._interval_milliseconds = ((self.interval.days
221
216
                                        * 24 * 60 * 60 * 1000)
223
218
                                          * 1000)
224
219
                                       + (self.interval.microseconds
225
220
                                          // 1000))
226
 
        # Emit D-Bus signal
227
 
        self.IntervalChanged(self._interval_milliseconds)
228
 
    interval = property(lambda self: self._interval, _set_interval)
 
221
    interval = property(lambda self: self._interval,
 
222
                        _set_interval)
229
223
    del _set_interval
230
 
    
231
 
    def __init__(self, name = None, stop_hook=None, config=None):
232
 
        """Note: the 'checker' key in 'config' sets the
233
 
        'checker_command' attribute and *not* the 'checker'
234
 
        attribute."""
235
 
        dbus.service.Object.__init__(self, bus,
236
 
                                     "/Mandos/clients/%s"
237
 
                                     % name.replace(".", "_"))
238
 
        if config is None:
239
 
            config = {}
 
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.."""
240
229
        self.name = name
241
230
        logger.debug(u"Creating client %r", self.name)
242
 
        # Uppercase and remove spaces from fingerprint for later
243
 
        # comparison purposes with return value from the fingerprint()
244
 
        # function
245
 
        self.fingerprint = (config["fingerprint"].upper()
246
 
                            .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"")
247
235
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
248
 
        if "secret" in config:
249
 
            self.secret = config["secret"].decode(u"base64")
250
 
        elif "secfile" in config:
251
 
            with closing(open(os.path.expanduser
252
 
                              (os.path.expandvars
253
 
                               (config["secfile"])))) as secfile:
254
 
                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()
255
242
        else:
256
243
            raise TypeError(u"No secret or secfile for client %s"
257
244
                            % self.name)
258
 
        self.host = config.get("host", "")
259
 
        self.created = datetime.datetime.utcnow()
260
 
        self.started = None
 
245
        self.fqdn = fqdn
 
246
        self.created = datetime.datetime.now()
261
247
        self.last_checked_ok = None
262
 
        self.timeout = string_to_delta(config["timeout"])
263
 
        self.interval = string_to_delta(config["interval"])
 
248
        self.timeout = string_to_delta(timeout)
 
249
        self.interval = string_to_delta(interval)
264
250
        self.stop_hook = stop_hook
265
251
        self.checker = None
266
252
        self.checker_initiator_tag = None
267
253
        self.stop_initiator_tag = None
268
254
        self.checker_callback_tag = None
269
 
        self.check_command = config["checker"]
270
 
    
 
255
        self.check_command = checker
271
256
    def start(self):
272
257
        """Start this client's checker and timeout hooks"""
273
 
        self.started = datetime.datetime.utcnow()
274
258
        # Schedule a new checker to be started an 'interval' from now,
275
259
        # and every interval from then on.
276
 
        self.checker_initiator_tag = (gobject.timeout_add
277
 
                                      (self._interval_milliseconds,
278
 
                                       self.start_checker))
 
260
        self.checker_initiator_tag = gobject.timeout_add\
 
261
                                     (self._interval_milliseconds,
 
262
                                      self.start_checker)
279
263
        # Also start a new checker *right now*.
280
264
        self.start_checker()
281
265
        # Schedule a stop() when 'timeout' has passed
282
 
        self.stop_initiator_tag = (gobject.timeout_add
283
 
                                   (self._timeout_milliseconds,
284
 
                                    self.stop))
285
 
        # Emit D-Bus signal
286
 
        self.StateChanged(True)
287
 
    
 
266
        self.stop_initiator_tag = gobject.timeout_add\
 
267
                                  (self._timeout_milliseconds,
 
268
                                   self.stop)
288
269
    def stop(self):
289
 
        """Stop this client."""
290
 
        if getattr(self, "started", None) is not None:
291
 
            logger.info(u"Stopping client %s", self.name)
 
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
292
277
        else:
293
278
            return False
294
279
        if getattr(self, "stop_initiator_tag", False):
300
285
        self.stop_checker()
301
286
        if self.stop_hook:
302
287
            self.stop_hook(self)
303
 
        self.started = None
304
 
        # Emit D-Bus signal
305
 
        self.StateChanged(False)
306
288
        # Do not run this again if called by a gobject.timeout_add
307
289
        return False
308
 
    
309
290
    def __del__(self):
310
291
        self.stop_hook = None
311
292
        self.stop()
312
 
    
313
293
    def checker_callback(self, pid, condition):
314
294
        """The checker has completed, so take appropriate actions."""
 
295
        now = datetime.datetime.now()
315
296
        self.checker_callback_tag = None
316
297
        self.checker = None
317
 
        if (os.WIFEXITED(condition) 
318
 
            and (os.WEXITSTATUS(condition) == 0)):
319
 
            logger.info(u"Checker for %(name)s succeeded",
320
 
                        vars(self))
321
 
            # Emit D-Bus signal
322
 
            self.CheckerCompleted(True)
323
 
            self.bump_timeout()
 
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)
324
307
        elif not os.WIFEXITED(condition):
325
308
            logger.warning(u"Checker for %(name)s crashed?",
326
309
                           vars(self))
327
 
            # Emit D-Bus signal
328
 
            self.CheckerCompleted(False)
329
310
        else:
330
 
            logger.info(u"Checker for %(name)s failed",
331
 
                        vars(self))
332
 
            # Emit D-Bus signal
333
 
            self.CheckerCompleted(False)
334
 
    
335
 
    def bump_timeout(self):
336
 
        """Bump up the timeout for this client.
337
 
        This should only be called when the client has been seen,
338
 
        alive and well.
339
 
        """
340
 
        self.last_checked_ok = datetime.datetime.utcnow()
341
 
        gobject.source_remove(self.stop_initiator_tag)
342
 
        self.stop_initiator_tag = (gobject.timeout_add
343
 
                                   (self._timeout_milliseconds,
344
 
                                    self.stop))
345
 
    
 
311
            logger.debug(u"Checker for %(name)s failed",
 
312
                         vars(self))
346
313
    def start_checker(self):
347
314
        """Start a new checker subprocess if one is not running.
348
315
        If a checker already exists, leave it running and do
358
325
        if self.checker is None:
359
326
            try:
360
327
                # In case check_command has exactly one % operator
361
 
                command = self.check_command % self.host
 
328
                command = self.check_command % self.fqdn
362
329
            except TypeError:
363
330
                # Escape attributes for the shell
364
331
                escaped_attrs = dict((key, re.escape(str(val)))
371
338
                                 u' %s', self.check_command, error)
372
339
                    return True # Try again later
373
340
            try:
374
 
                logger.info(u"Starting checker %r for %s",
375
 
                            command, self.name)
376
 
                # We don't need to redirect stdout and stderr, since
377
 
                # in normal mode, that is already done by daemon(),
378
 
                # and in debug mode we don't want to.  (Stdin is
379
 
                # always replaced by /dev/null.)
 
341
                logger.debug(u"Starting checker %r for %s",
 
342
                             command, self.name)
380
343
                self.checker = subprocess.Popen(command,
381
344
                                                close_fds=True,
382
345
                                                shell=True, cwd="/")
383
 
                self.checker_callback_tag = (gobject.child_watch_add
384
 
                                             (self.checker.pid,
385
 
                                              self.checker_callback))
386
 
                # Emit D-Bus signal
387
 
                self.CheckerStarted(command)
388
 
            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:
389
350
                logger.error(u"Failed to start subprocess: %s",
390
351
                             error)
391
352
        # Re-run this periodically if run by gobject.timeout_add
392
353
        return True
393
 
    
394
354
    def stop_checker(self):
395
355
        """Force the checker process, if any, to stop."""
396
356
        if self.checker_callback_tag:
398
358
            self.checker_callback_tag = None
399
359
        if getattr(self, "checker", None) is None:
400
360
            return
401
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
361
        logger.debug("Stopping checker for %(name)s", vars(self))
402
362
        try:
403
363
            os.kill(self.checker.pid, signal.SIGTERM)
404
364
            #os.sleep(0.5)
408
368
            if error.errno != errno.ESRCH: # No such process
409
369
                raise
410
370
        self.checker = None
411
 
    
412
371
    def still_valid(self):
413
372
        """Has the timeout not yet passed for this client?"""
414
 
        if not self.started:
415
 
            return False
416
 
        now = datetime.datetime.utcnow()
 
373
        now = datetime.datetime.now()
417
374
        if self.last_checked_ok is None:
418
375
            return now < (self.created + self.timeout)
419
376
        else:
420
377
            return now < (self.last_checked_ok + self.timeout)
421
 
    
422
 
    ## D-Bus methods & signals
423
 
    _interface = u"org.mandos_system.Mandos.Client"
424
 
    
425
 
    def _datetime_to_dbus_struct(dt):
426
 
        return dbus.Struct(dt.year, dt.month, dt.day, dt.hour,
427
 
                           dt.minute, dt.second, dt.microsecond,
428
 
                           signature="nyyyyyu")
429
 
    
430
 
    # BumpTimeout - method
431
 
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
432
 
    BumpTimeout.__name__ = "BumpTimeout"
433
 
    
434
 
    # IntervalChanged - signal
435
 
    @dbus.service.signal(_interface, signature="t")
436
 
    def IntervalChanged(self, t):
437
 
        "D-Bus signal"
438
 
        pass
439
 
    
440
 
    # CheckerCompleted - signal
441
 
    @dbus.service.signal(_interface, signature="b")
442
 
    def CheckerCompleted(self, success):
443
 
        "D-Bus signal"
444
 
        pass
445
 
    
446
 
    # CheckerIsRunning - method
447
 
    @dbus.service.method(_interface, out_signature="b")
448
 
    def CheckerIsRunning(self):
449
 
        "D-Bus getter method"
450
 
        return self.checker is not None
451
 
    
452
 
    # CheckerStarted - signal
453
 
    @dbus.service.signal(_interface, signature="s")
454
 
    def CheckerStarted(self, command):
455
 
        "D-Bus signal"
456
 
        pass
457
 
    
458
 
    # GetChecker - method
459
 
    @dbus.service.method(_interface, out_signature="s")
460
 
    def GetChecker(self):
461
 
        "D-Bus getter method"
462
 
        return self.checker_command
463
 
    
464
 
    # GetCreated - method
465
 
    @dbus.service.method(_interface, out_signature="(nyyyyyu)")
466
 
    def GetCreated(self):
467
 
        "D-Bus getter method"
468
 
        return datetime_to_dbus_struct(self.created)
469
 
    
470
 
    # GetFingerprint - method
471
 
    @dbus.service.method(_interface, out_signature="s")
472
 
    def GetFingerprint(self):
473
 
        "D-Bus getter method"
474
 
        return self.fingerprint
475
 
    
476
 
    # GetHost - method
477
 
    @dbus.service.method(_interface, out_signature="s")
478
 
    def GetHost(self):
479
 
        "D-Bus getter method"
480
 
        return self.host
481
 
    
482
 
    # GetInterval - method
483
 
    @dbus.service.method(_interface, out_signature="t")
484
 
    def GetInterval(self):
485
 
        "D-Bus getter method"
486
 
        return self._interval_milliseconds
487
 
    
488
 
    # GetName - method
489
 
    @dbus.service.method(_interface, out_signature="s")
490
 
    def GetName(self):
491
 
        "D-Bus getter method"
492
 
        return self.name
493
 
    
494
 
    # GetStarted - method
495
 
    @dbus.service.method(_interface, out_signature="(nyyyyyu)")
496
 
    def GetStarted(self):
497
 
        "D-Bus getter method"
498
 
        if self.started is not None:
499
 
            return datetime_to_dbus_struct(self.started)
500
 
        else:
501
 
            return dbus.Struct(0, 0, 0, 0, 0, 0, 0,
502
 
                               signature="nyyyyyu")
503
 
    
504
 
    # GetTimeout - method
505
 
    @dbus.service.method(_interface, out_signature="t")
506
 
    def GetTimeout(self):
507
 
        "D-Bus getter method"
508
 
        return self._timeout_milliseconds
509
 
    
510
 
    # SetChecker - method
511
 
    @dbus.service.method(_interface, in_signature="s")
512
 
    def SetChecker(self, checker):
513
 
        "D-Bus setter method"
514
 
        self.checker_command = checker
515
 
    
516
 
    # SetHost - method
517
 
    @dbus.service.method(_interface, in_signature="s")
518
 
    def SetHost(self, host):
519
 
        "D-Bus setter method"
520
 
        self.host = host
521
 
    
522
 
    # SetInterval - method
523
 
    @dbus.service.method(_interface, in_signature="t")
524
 
    def SetInterval(self, milliseconds):
525
 
        self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
526
 
    
527
 
    # SetTimeout - method
528
 
    @dbus.service.method(_interface, in_signature="t")
529
 
    def SetTimeout(self, milliseconds):
530
 
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
531
 
    
532
 
    # SetSecret - method
533
 
    @dbus.service.method(_interface, in_signature="ay",
534
 
                         byte_arrays=True)
535
 
    def SetSecret(self, secret):
536
 
        "D-Bus setter method"
537
 
        self.secret = str(secret)
538
 
    
539
 
    # Start - method
540
 
    Start = dbus.service.method(_interface)(start)
541
 
    Start.__name__ = "Start"
542
 
    
543
 
    # StartChecker - method
544
 
    StartChecker = dbus.service.method(_interface)(start_checker)
545
 
    StartChecker.__name__ = "StartChecker"
546
 
    
547
 
    # StateChanged - signal
548
 
    @dbus.service.signal(_interface, signature="b")
549
 
    def StateChanged(self, started):
550
 
        "D-Bus signal"
551
 
        pass
552
 
    
553
 
    # StillValid - method
554
 
    StillValid = (dbus.service.method(_interface, out_signature="b")
555
 
                  (still_valid))
556
 
    StillValid.__name__ = "StillValid"
557
 
    
558
 
    # Stop - method
559
 
    Stop = dbus.service.method(_interface)(stop)
560
 
    Stop.__name__ = "Stop"
561
 
    
562
 
    # StopChecker - method
563
 
    StopChecker = dbus.service.method(_interface)(stop_checker)
564
 
    StopChecker.__name__ = "StopChecker"
565
 
    
566
 
    # TimeoutChanged - signal
567
 
    @dbus.service.signal(_interface, signature="t")
568
 
    def TimeoutChanged(self, t):
569
 
        "D-Bus signal"
570
 
        pass
571
 
    
572
 
    del _datetime_to_dbus_struct
573
 
    del _interface
574
378
 
575
379
 
576
380
def peer_certificate(session):
577
381
    "Return the peer's OpenPGP certificate as a bytestring"
578
382
    # If not an OpenPGP certificate...
579
 
    if (gnutls.library.functions
580
 
        .gnutls_certificate_type_get(session._c_object)
581
 
        != 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:
582
386
        # ...do the normal thing
583
387
        return session.peer_certificate
584
388
    list_size = ctypes.c_uint()
585
 
    cert_list = (gnutls.library.functions
586
 
                 .gnutls_certificate_get_peers
587
 
                 (session._c_object, ctypes.byref(list_size)))
 
389
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
390
        (session._c_object, ctypes.byref(list_size))
588
391
    if list_size.value == 0:
589
392
        return None
590
393
    cert = cert_list[0]
593
396
 
594
397
def fingerprint(openpgp):
595
398
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
596
 
    # New GnuTLS "datum" with the OpenPGP public key
597
 
    datum = (gnutls.library.types
598
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
599
 
                                         ctypes.POINTER
600
 
                                         (ctypes.c_ubyte)),
601
 
                             ctypes.c_uint(len(openpgp))))
602
399
    # New empty GnuTLS certificate
603
400
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
604
 
    (gnutls.library.functions
605
 
     .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)))
606
408
    # Import the OpenPGP public key into the certificate
607
 
    (gnutls.library.functions
608
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
609
 
                                gnutls.library.constants
610
 
                                .GNUTLS_OPENPGP_FMT_RAW))
611
 
    # Verify the self signature in the key
612
 
    crtverify = ctypes.c_uint()
613
 
    (gnutls.library.functions
614
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
615
 
    if crtverify.value != 0:
616
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
617
 
        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)
618
413
    # New buffer for the fingerprint
619
 
    buf = ctypes.create_string_buffer(20)
620
 
    buf_len = ctypes.c_size_t()
 
414
    buffer = ctypes.create_string_buffer(20)
 
415
    buffer_length = ctypes.c_size_t()
621
416
    # Get the fingerprint from the certificate into the buffer
622
 
    (gnutls.library.functions
623
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
624
 
                                         ctypes.byref(buf_len)))
 
417
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
418
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
625
419
    # Deinit the certificate
626
420
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
627
421
    # Convert the buffer to a Python bytestring
628
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
422
    fpr = ctypes.string_at(buffer, buffer_length.value)
629
423
    # Convert the bytestring to hexadecimal notation
630
424
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
631
425
    return hex_fpr
632
426
 
633
427
 
634
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
428
class tcp_handler(SocketServer.BaseRequestHandler, object):
635
429
    """A TCP request handler class.
636
430
    Instantiated by IPv6_TCPServer for each request to handle it.
637
431
    Note: This will run in its own forked process."""
638
432
    
639
433
    def handle(self):
640
 
        logger.info(u"TCP connection from: %s",
641
 
                    unicode(self.client_address))
642
 
        session = (gnutls.connection
643
 
                   .ClientSession(self.request,
644
 
                                  gnutls.connection
645
 
                                  .X509Credentials()))
646
 
        
647
 
        line = self.request.makefile().readline()
648
 
        logger.debug(u"Protocol version: %r", line)
649
 
        try:
650
 
            if int(line.strip().split()[0]) > 1:
651
 
                raise RuntimeError
652
 
        except (ValueError, IndexError, RuntimeError), error:
653
 
            logger.error(u"Unknown protocol version: %s", error)
654
 
            return
655
 
        
 
434
        logger.debug(u"TCP connection from: %s",
 
435
                     unicode(self.client_address))
 
436
        session = gnutls.connection.ClientSession\
 
437
                  (self.request, gnutls.connection.X509Credentials())
656
438
        # Note: gnutls.connection.X509Credentials is really a generic
657
439
        # GnuTLS certificate credentials object so long as no X.509
658
440
        # keys are added to it.  Therefore, we can use it here despite
661
443
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
662
444
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
663
445
        #                "+DHE-DSS"))
664
 
        # Use a fallback default, since this MUST be set.
665
 
        priority = self.server.settings.get("priority", "NORMAL")
666
 
        (gnutls.library.functions
667
 
         .gnutls_priority_set_direct(session._c_object,
668
 
                                     priority, None))
 
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);
669
452
        
670
453
        try:
671
454
            session.handshake()
672
455
        except gnutls.errors.GNUTLSError, error:
673
 
            logger.warning(u"Handshake failed: %s", error)
 
456
            logger.debug(u"Handshake failed: %s", error)
674
457
            # Do not run session.bye() here: the session is not
675
458
            # established.  Just abandon the request.
676
459
            return
677
460
        try:
678
461
            fpr = fingerprint(peer_certificate(session))
679
462
        except (TypeError, gnutls.errors.GNUTLSError), error:
680
 
            logger.warning(u"Bad certificate: %s", error)
 
463
            logger.debug(u"Bad certificate: %s", error)
681
464
            session.bye()
682
465
            return
683
466
        logger.debug(u"Fingerprint: %s", fpr)
 
467
        client = None
684
468
        for c in self.server.clients:
685
469
            if c.fingerprint == fpr:
686
470
                client = c
687
471
                break
688
 
        else:
689
 
            logger.warning(u"Client not found for fingerprint: %s",
690
 
                           fpr)
 
472
        if not client:
 
473
            logger.debug(u"Client not found for fingerprint: %s", fpr)
691
474
            session.bye()
692
475
            return
693
476
        # Have to check if client.still_valid(), since it is possible
694
477
        # that the client timed out while establishing the GnuTLS
695
478
        # session.
696
479
        if not client.still_valid():
697
 
            logger.warning(u"Client %(name)s is invalid",
698
 
                           vars(client))
 
480
            logger.debug(u"Client %(name)s is invalid", vars(client))
699
481
            session.bye()
700
482
            return
701
 
        ## This won't work here, since we're in a fork.
702
 
        # client.bump_timeout()
703
483
        sent_size = 0
704
484
        while sent_size < len(client.secret):
705
485
            sent = session.send(client.secret[sent_size:])
710
490
        session.bye()
711
491
 
712
492
 
713
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
714
 
                     SocketServer.TCPServer, object):
 
493
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
715
494
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
716
495
    Attributes:
717
496
        settings:       Server settings
718
497
        clients:        Set() of Client objects
719
 
        enabled:        Boolean; whether this server is activated yet
720
498
    """
721
499
    address_family = socket.AF_INET6
722
500
    def __init__(self, *args, **kwargs):
726
504
        if "clients" in kwargs:
727
505
            self.clients = kwargs["clients"]
728
506
            del kwargs["clients"]
729
 
        self.enabled = False
730
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
507
        return super(type(self), self).__init__(*args, **kwargs)
731
508
    def server_bind(self):
732
509
        """This overrides the normal server_bind() function
733
510
        to bind to an interface if one was specified, and also NOT to
741
518
                                       self.settings["interface"])
742
519
            except socket.error, error:
743
520
                if error[0] == errno.EPERM:
744
 
                    logger.error(u"No permission to"
745
 
                                 u" bind to interface %s",
746
 
                                 self.settings["interface"])
 
521
                    logger.warning(u"No permission to"
 
522
                                   u" bind to interface %s",
 
523
                                   self.settings["interface"])
747
524
                else:
748
525
                    raise error
749
526
        # Only bind(2) the socket if we really need to.
752
529
                in6addr_any = "::"
753
530
                self.server_address = (in6addr_any,
754
531
                                       self.server_address[1])
755
 
            elif not self.server_address[1]:
 
532
            elif self.server_address[1] is None:
756
533
                self.server_address = (self.server_address[0],
757
534
                                       0)
758
 
#                 if self.settings["interface"]:
759
 
#                     self.server_address = (self.server_address[0],
760
 
#                                            0, # port
761
 
#                                            0, # flowinfo
762
 
#                                            if_nametoindex
763
 
#                                            (self.settings
764
 
#                                             ["interface"]))
765
 
            return super(IPv6_TCPServer, self).server_bind()
766
 
    def server_activate(self):
767
 
        if self.enabled:
768
 
            return super(IPv6_TCPServer, self).server_activate()
769
 
    def enable(self):
770
 
        self.enabled = True
 
535
            return super(type(self), self).server_bind()
771
536
 
772
537
 
773
538
def string_to_delta(interval):
783
548
    datetime.timedelta(1)
784
549
    >>> string_to_delta(u'1w')
785
550
    datetime.timedelta(7)
786
 
    >>> string_to_delta('5m 30s')
787
 
    datetime.timedelta(0, 330)
788
551
    """
789
 
    timevalue = datetime.timedelta(0)
790
 
    for s in interval.split():
791
 
        try:
792
 
            suffix = unicode(s[-1])
793
 
            value = int(s[:-1])
794
 
            if suffix == u"d":
795
 
                delta = datetime.timedelta(value)
796
 
            elif suffix == u"s":
797
 
                delta = datetime.timedelta(0, value)
798
 
            elif suffix == u"m":
799
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
800
 
            elif suffix == u"h":
801
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
802
 
            elif suffix == u"w":
803
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
804
 
            else:
805
 
                raise ValueError
806
 
        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:
807
566
            raise ValueError
808
 
        timevalue += delta
809
 
    return timevalue
 
567
    except (ValueError, IndexError):
 
568
        raise ValueError
 
569
    return delta
810
570
 
811
571
 
812
572
def server_state_changed(state):
813
573
    """Derived from the Avahi example code"""
814
574
    if state == avahi.SERVER_COLLISION:
815
 
        logger.error(u"Zeroconf server name collision")
 
575
        logger.warning(u"Server name collision")
816
576
        service.remove()
817
577
    elif state == avahi.SERVER_RUNNING:
818
578
        service.add()
820
580
 
821
581
def entry_group_state_changed(state, error):
822
582
    """Derived from the Avahi example code"""
823
 
    logger.debug(u"Avahi state change: %i", state)
 
583
    logger.debug(u"state change: %i", state)
824
584
    
825
585
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
826
 
        logger.debug(u"Zeroconf service established.")
 
586
        logger.debug(u"Service established.")
827
587
    elif state == avahi.ENTRY_GROUP_COLLISION:
828
 
        logger.warning(u"Zeroconf service name collision.")
 
588
        logger.warning(u"Service name collision.")
829
589
        service.rename()
830
590
    elif state == avahi.ENTRY_GROUP_FAILURE:
831
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
591
        logger.critical(u"Error in group state changed %s",
832
592
                        unicode(error))
833
593
        raise AvahiGroupError("State changed: %s", str(error))
834
594
 
835
 
def if_nametoindex(interface):
 
595
def if_nametoindex(interface, _func=[None]):
836
596
    """Call the C function if_nametoindex(), or equivalent"""
837
 
    global if_nametoindex
 
597
    if _func[0] is not None:
 
598
        return _func[0](interface)
838
599
    try:
839
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
840
 
                          (ctypes.util.find_library("c"))
841
 
                          .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
842
611
    except (OSError, AttributeError):
843
612
        if "struct" not in sys.modules:
844
613
            import struct
845
614
        if "fcntl" not in sys.modules:
846
615
            import fcntl
847
 
        def if_nametoindex(interface):
 
616
        def the_hard_way(interface):
848
617
            "Get an interface index the hard way, i.e. using fcntl()"
849
618
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
850
 
            with closing(socket.socket()) as s:
851
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
852
 
                                    struct.pack("16s16x", interface))
 
619
            s = socket.socket()
 
620
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
621
                                struct.pack("16s16x", interface))
 
622
            s.close()
853
623
            interface_index = struct.unpack("I", ifreq[16:20])[0]
854
624
            return interface_index
855
 
    return if_nametoindex(interface)
856
 
 
857
 
 
858
 
def daemon(nochdir = False, noclose = False):
 
625
        _func[0] = the_hard_way
 
626
        return _func[0](interface)
 
627
 
 
628
 
 
629
def daemon(nochdir, noclose):
859
630
    """See daemon(3).  Standard BSD Unix function.
860
631
    This should really exist as os.daemon, but it doesn't (yet)."""
861
632
    if os.fork():
863
634
    os.setsid()
864
635
    if not nochdir:
865
636
        os.chdir("/")
866
 
    if os.fork():
867
 
        sys.exit()
868
637
    if not noclose:
869
638
        # Close all standard open file descriptors
870
639
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
879
648
 
880
649
 
881
650
def main():
882
 
    parser = OptionParser(version = "%%prog %s" % version)
 
651
    global main_loop_started
 
652
    main_loop_started = False
 
653
    
 
654
    parser = OptionParser()
883
655
    parser.add_option("-i", "--interface", type="string",
884
656
                      metavar="IF", help="Bind to interface IF")
885
657
    parser.add_option("-a", "--address", type="string",
888
660
                      help="Port number to receive requests on")
889
661
    parser.add_option("--check", action="store_true", default=False,
890
662
                      help="Run self-test")
891
 
    parser.add_option("--debug", action="store_true",
 
663
    parser.add_option("--debug", action="store_true", default=False,
892
664
                      help="Debug mode; run in foreground and log to"
893
665
                      " terminal")
894
666
    parser.add_option("--priority", type="string", help="GnuTLS"
899
671
                      default="/etc/mandos", metavar="DIR",
900
672
                      help="Directory to search for configuration"
901
673
                      " files")
902
 
    options = parser.parse_args()[0]
 
674
    (options, args) = parser.parse_args()
903
675
    
904
676
    if options.check:
905
677
        import doctest
919
691
    # Parse config file for server-global settings
920
692
    server_config = ConfigParser.SafeConfigParser(server_defaults)
921
693
    del server_defaults
922
 
    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"
923
696
    # Convert the SafeConfigParser object to a dict
924
 
    server_settings = server_config.defaults()
 
697
    server_settings = dict(server_config.items(server_section))
925
698
    # Use getboolean on the boolean config option
926
 
    server_settings["debug"] = (server_config.getboolean
927
 
                                ("DEFAULT", "debug"))
 
699
    server_settings["debug"] = server_config.getboolean\
 
700
                               (server_section, "debug")
928
701
    del server_config
929
702
    
930
703
    # Override the settings from the config file with command line
937
710
    del options
938
711
    # Now we have our good server settings in "server_settings"
939
712
    
940
 
    debug = server_settings["debug"]
941
 
    
942
 
    if not debug:
943
 
        syslogger.setLevel(logging.WARNING)
944
 
        console.setLevel(logging.WARNING)
945
 
    
946
 
    if server_settings["servicename"] != "Mandos":
947
 
        syslogger.setFormatter(logging.Formatter
948
 
                               ('Mandos (%s): %%(levelname)s:'
949
 
                                ' %%(message)s'
950
 
                                % server_settings["servicename"]))
951
 
    
952
713
    # Parse config file with clients
953
714
    client_defaults = { "timeout": "1h",
954
715
                        "interval": "5m",
955
 
                        "checker": "fping -q -- %(host)s",
956
 
                        "host": "",
 
716
                        "checker": "fping -q -- %%(fqdn)s",
957
717
                        }
958
718
    client_config = ConfigParser.SafeConfigParser(client_defaults)
959
719
    client_config.read(os.path.join(server_settings["configdir"],
960
720
                                    "clients.conf"))
961
721
    
962
 
    clients = Set()
963
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
964
 
                                 server_settings["port"]),
965
 
                                TCP_handler,
966
 
                                settings=server_settings,
967
 
                                clients=clients)
968
 
    pidfilename = "/var/run/mandos.pid"
969
 
    try:
970
 
        pidfile = open(pidfilename, "w")
971
 
    except IOError, error:
972
 
        logger.error("Could not open file %r", pidfilename)
973
 
    
974
 
    uid = 65534
975
 
    gid = 65534
976
 
    try:
977
 
        uid = pwd.getpwnam("mandos").pw_uid
978
 
    except KeyError:
979
 
        try:
980
 
            uid = pwd.getpwnam("nobody").pw_uid
981
 
        except KeyError:
982
 
            pass
983
 
    try:
984
 
        gid = pwd.getpwnam("mandos").pw_gid
985
 
    except KeyError:
986
 
        try:
987
 
            gid = pwd.getpwnam("nogroup").pw_gid
988
 
        except KeyError:
989
 
            pass
990
 
    try:
991
 
        os.setuid(uid)
992
 
        os.setgid(gid)
993
 
    except OSError, error:
994
 
        if error[0] != errno.EPERM:
995
 
            raise error
996
 
    
997
722
    global service
998
723
    service = AvahiService(name = server_settings["servicename"],
999
 
                           servicetype = "_mandos._tcp", )
 
724
                           type = "_mandos._tcp", );
1000
725
    if server_settings["interface"]:
1001
 
        service.interface = (if_nametoindex
1002
 
                             (server_settings["interface"]))
 
726
        service.interface = if_nametoindex(server_settings["interface"])
1003
727
    
1004
728
    global main_loop
1005
729
    global bus
1008
732
    DBusGMainLoop(set_as_default=True )
1009
733
    main_loop = gobject.MainLoop()
1010
734
    bus = dbus.SystemBus()
1011
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1012
 
                                           avahi.DBUS_PATH_SERVER),
1013
 
                            avahi.DBUS_INTERFACE_SERVER)
 
735
    server = dbus.Interface(
 
736
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
737
            avahi.DBUS_INTERFACE_SERVER )
1014
738
    # End of Avahi example code
1015
 
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
1016
 
    
 
739
    
 
740
    debug = server_settings["debug"]
 
741
    
 
742
    if debug:
 
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()
1017
751
    def remove_from_clients(client):
1018
752
        clients.remove(client)
1019
753
        if not clients:
1020
 
            logger.critical(u"No clients left, exiting")
 
754
            logger.debug(u"No clients left, exiting")
1021
755
            sys.exit()
1022
756
    
1023
 
    clients.update(Set(Client(name = section,
 
757
    clients.update(Set(Client(name=section,
1024
758
                              stop_hook = remove_from_clients,
1025
 
                              config
1026
 
                              = dict(client_config.items(section)))
 
759
                              **(dict(client_config\
 
760
                                      .items(section))))
1027
761
                       for section in client_config.sections()))
1028
 
    if not clients:
1029
 
        logger.critical(u"No clients defined")
1030
 
        sys.exit(1)
1031
 
    
1032
 
    if debug:
1033
 
        # Redirect stdin so all checkers get /dev/null
1034
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1035
 
        os.dup2(null, sys.stdin.fileno())
1036
 
        if null > 2:
1037
 
            os.close(null)
1038
 
    else:
1039
 
        # No console logging
1040
 
        logger.removeHandler(console)
1041
 
        # Close all input and output, do double fork, etc.
1042
 
        daemon()
1043
 
    
1044
 
    try:
1045
 
        pid = os.getpid()
1046
 
        pidfile.write(str(pid) + "\n")
1047
 
        pidfile.close()
1048
 
        del pidfile
1049
 
    except IOError:
1050
 
        logger.error(u"Could not write to file %r with PID %d",
1051
 
                     pidfilename, pid)
1052
 
    except NameError:
1053
 
        # "pidfile" was never created
1054
 
        pass
1055
 
    del pidfilename
 
762
    
 
763
    if not debug:
 
764
        daemon(False, False)
1056
765
    
1057
766
    def cleanup():
1058
767
        "Cleanup function; run on exit"
1078
787
    for client in clients:
1079
788
        client.start()
1080
789
    
1081
 
    tcp_server.enable()
1082
 
    tcp_server.server_activate()
1083
 
    
 
790
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
791
                                 server_settings["port"]),
 
792
                                tcp_handler,
 
793
                                settings=server_settings,
 
794
                                clients=clients)
1084
795
    # Find out what port we got
1085
796
    service.port = tcp_server.socket.getsockname()[1]
1086
 
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
1087
 
                u" scope_id %d" % 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())
1088
799
    
1089
800
    #service.interface = tcp_server.socket.getsockname()[3]
1090
801
    
1100
811
        
1101
812
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1102
813
                             lambda *args, **kwargs:
1103
 
                             (tcp_server.handle_request
1104
 
                              (*args[2:], **kwargs) or True))
 
814
                             tcp_server.handle_request\
 
815
                             (*args[2:], **kwargs) or True)
1105
816
        
1106
 
        logger.debug(u"Starting main loop")
 
817
        logger.debug("Starting main loop")
 
818
        main_loop_started = True
1107
819
        main_loop.run()
1108
820
    except AvahiError, error:
1109
821
        logger.critical(u"AvahiError: %s" + unicode(error))