/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-29 07:30:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080829073017-tvryowganbf75zp5
* mandos-clients.conf.xml (SEE ALSO): Alphabetized, as per
                                      man-pages(7).
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/password-request.xml (SEE ALSO): Changed from an
                                             <itemizedlist> to a
                                             <para>, as per
                                             man-pages(7).  Also
                                             alphabetize.

Show diffs side-by-side

added added

removed removed

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