/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-18 05:24:20 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080818052420-ab5eurrioz8n2qy6
* Makefile: Bug fix: fixed creation of man pages in "plugins.d".

* mandos-keygen Bug fix: make the --expire option modify
                KEYEXPIRE, not KEYCOMMENT.  Use the "--no-options"
                option to gpg when exporting keys from the temporary
                key ring files.

* mandos-keygen.xml (EXIT STATUS): Filled in.
  (ENVIRONMENT): New section, documenting use of TMPDIR.
  (FILES): Document use of key files and /tmp.
  (BUGS): Filled in.
  (EXAMPLE): Added two examples.
  (SECURITY): Added some text.

* plugins.d/password-prompt.xml (NOTES): Removed, since this is
                                         created automatically for
                                         footnotes.
  (ENVIRONMENT, FILES): Added empty sections.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

* plugins.d/password-request.xml: Reordered sections.
  (ENVIRONMENT): New empty section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

Show diffs side-by-side

added added

removed removed

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