/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 mandos

  • Committer: Björn Påhlsson
  • Date: 2008-08-09 20:11:07 UTC
  • mto: (237.7.1 mandos) (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 56.
  • Revision ID: belorn@braxen-20080809201107-81j2nuz9p0u7x51v
removed * [[http://en.tldp.org/HOWTO/Software-Release-Practice-HOWTO/][Software Release Practice HOWTO]]

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