/mandos/trunk

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

« back to all changes in this revision

Viewing changes to server.py

  • Committer: Björn Påhlsson
  • Date: 2008-07-20 02:52:20 UTC
  • Revision ID: belorn@braxen-20080720025220-r5u0388uy9iu23h6
Added following support:
Pluginbased client handler
rewritten Mandos client
       Avahi instead of udp server discovery
       openpgp encrypted key support
Passprompt stand alone application for direct console input
Added logging for Mandos server

Show diffs side-by-side

added added

removed removed

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