/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

merge

Show diffs side-by-side

added added

removed removed

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