/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* README: Update copyright year; add "2009".
* debian/copyright: - '' -
* mandos: - '' -
* mandos-clients.conf.xml: - '' -
* mandos-keygen: - '' -
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.c: - '' -
* plugin-runner.xml: - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/askpass-fifo.xml: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugins.d/splashy.c: - '' -
* plugins.d/splashy.xml: - '' -
* plugins.d/usplash.c: - '' -
* plugins.d/usplash.xml: - '' -

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