/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

* debian/mandos-client.postinst: Converted to Bourne shell.  Also
                                 minor message change.
* debian/mandos-client.postrm: Minor message change.
* debian/mandos.postinst: Converted to Bourne shell.  Also minor
                          message change.
* debian/mandos.prerm: Minor message change.

Show diffs side-by-side

added added

removed removed

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