/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 server.py

merge commit

Show diffs side-by-side

added added

removed removed

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