/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-13 05:38:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090213053821-03e696gckk4nbjps
Support not using IPv6 in server:

* mandos (AvahiService.__init__): Take new "protocol" parameter.  All
                                  callers changed.
  (IPv6_TCPServer.__init__): Take new "use_ipv6" parameter.  All
                             callers changed.
  (IPv6_TCPServer.server_bind): Create IPv4 socket if not using IPv6.
  (main): New "--no-ipv6" command line option.  New "use_ipv6" config
          option.
* mandos-options.xml ([@id="address"]): Document conditional IPv4
                                        address support.
  ([@id="ipv6"]): New paragraph.
* mandos.conf (use_ipv6): New config option.
* mandos.conf.xml (OPTIONS): Document new "use_dbus" option.
  (EXAMPLE): Changed to use IPv6 link-local address.  Added "use_ipv6"
             option.
* mandos.xml (SYNOPSIS): New "--no-ipv6" option.
  (OPTIONS): Document new "--no-ipv6" option.

Show diffs side-by-side

added added

removed removed

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