/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
3 by Björn Påhlsson
Python based server
1
#!/usr/bin/python
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
2
# -*- mode: python; coding: utf-8 -*-
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
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
46 by Teddy Hogeborn
* network-protocol.txt: New.
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".
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
12
# 
28 by Teddy Hogeborn
* server.conf: New file.
13
# Everything else is
14
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
15
# 
16
# This program is free software: you can redistribute it and/or modify
17
# it under the terms of the GNU General Public License as published by
18
# the Free Software Foundation, either version 3 of the License, or
19
# (at your option) any later version.
20
#
21
#     This program is distributed in the hope that it will be useful,
22
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
23
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
24
#     GNU General Public License for more details.
25
# 
26
# You should have received a copy of the GNU General Public License
109 by Teddy Hogeborn
* .bzrignore: New.
27
# along with this program.  If not, see
28
# <http://www.gnu.org/licenses/>.
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
29
# 
28 by Teddy Hogeborn
* server.conf: New file.
30
# Contact the authors at <mandos@fukt.bsnet.se>.
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
31
# 
3 by Björn Påhlsson
Python based server
32
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
33
from __future__ import division
34
3 by Björn Påhlsson
Python based server
35
import SocketServer
36
import socket
37
import select
38
from optparse import OptionParser
39
import datetime
40
import errno
41
import gnutls.crypto
42
import gnutls.connection
43
import gnutls.errors
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
44
import gnutls.library.functions
45
import gnutls.library.constants
46
import gnutls.library.types
3 by Björn Påhlsson
Python based server
47
import ConfigParser
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
48
import sys
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
49
import re
50
import os
51
import signal
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
52
from sets import Set
53
import subprocess
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
54
import atexit
55
import stat
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
56
import logging
57
import logging.handlers
5 by Teddy Hogeborn
* server.py (server_metaclass): New.
58
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
59
import dbus
60
import gobject
61
import avahi
62
from dbus.mainloop.glib import DBusGMainLoop
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
63
import ctypes
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
64
57 by Teddy Hogeborn
* mandos (version): New variable.
65
version = "1.0"
13 by Björn Påhlsson
Added following support:
66
67
logger = logging.Logger('mandos')
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
68
syslogger = logging.handlers.SysLogHandler\
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
69
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
70
             address = "/dev/log")
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
71
syslogger.setFormatter(logging.Formatter\
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
72
                        ('Mandos: %(levelname)s: %(message)s'))
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
73
logger.addHandler(syslogger)
13 by Björn Påhlsson
Added following support:
74
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
75
console = logging.StreamHandler()
76
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
77
                                       ' %(message)s'))
78
logger.addHandler(console)
28 by Teddy Hogeborn
* server.conf: New file.
79
80
class AvahiError(Exception):
81
    def __init__(self, value):
82
        self.value = value
83
    def __str__(self):
84
        return repr(self.value)
85
86
class AvahiServiceError(AvahiError):
87
    pass
88
89
class AvahiGroupError(AvahiError):
90
    pass
91
92
93
class AvahiService(object):
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
94
    """An Avahi (Zeroconf) service.
95
    Attributes:
28 by Teddy Hogeborn
* server.conf: New file.
96
    interface: integer; avahi.IF_UNSPEC or an interface index.
97
               Used to optionally bind to the specified interface.
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
98
    name: string; Example: 'Mandos'
99
    type: string; Example: '_mandos._tcp'.
100
                  See <http://www.dns-sd.org/ServiceTypes.html>
101
    port: integer; what port to announce
102
    TXT: list of strings; TXT record for the service
103
    domain: string; Domain to publish on, default to .local if empty.
104
    host: string; Host to publish records for, default is localhost
105
    max_renames: integer; maximum number of renames
106
    rename_count: integer; counter so we only rename after collisions
107
                  a sensible number of times
28 by Teddy Hogeborn
* server.conf: New file.
108
    """
109
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
110
                 type = None, port = None, TXT = None, domain = "",
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
111
                 host = "", max_renames = 32768):
28 by Teddy Hogeborn
* server.conf: New file.
112
        self.interface = interface
113
        self.name = name
114
        self.type = type
115
        self.port = port
116
        if TXT is None:
117
            self.TXT = []
118
        else:
119
            self.TXT = TXT
120
        self.domain = domain
121
        self.host = host
122
        self.rename_count = 0
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
123
        self.max_renames = max_renames
28 by Teddy Hogeborn
* server.conf: New file.
124
    def rename(self):
125
        """Derived from the Avahi example code"""
126
        if self.rename_count >= self.max_renames:
109 by Teddy Hogeborn
* .bzrignore: New.
127
            logger.critical(u"No suitable Zeroconf service name found"
128
                            u" after %i retries, exiting.",
129
                            rename_count)
28 by Teddy Hogeborn
* server.conf: New file.
130
            raise AvahiServiceError("Too many renames")
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
131
        self.name = server.GetAlternativeServiceName(self.name)
109 by Teddy Hogeborn
* .bzrignore: New.
132
        logger.info(u"Changing Zeroconf service name to %r ...",
133
                    str(self.name))
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
134
        syslogger.setFormatter(logging.Formatter\
135
                               ('Mandos (%s): %%(levelname)s:'
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
136
                               ' %%(message)s' % self.name))
28 by Teddy Hogeborn
* server.conf: New file.
137
        self.remove()
138
        self.add()
139
        self.rename_count += 1
140
    def remove(self):
141
        """Derived from the Avahi example code"""
142
        if group is not None:
143
            group.Reset()
144
    def add(self):
145
        """Derived from the Avahi example code"""
146
        global group
147
        if group is None:
148
            group = dbus.Interface\
149
                    (bus.get_object(avahi.DBUS_NAME,
150
                                    server.EntryGroupNew()),
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
152
            group.connect_to_signal('StateChanged',
153
                                    entry_group_state_changed)
109 by Teddy Hogeborn
* .bzrignore: New.
154
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
28 by Teddy Hogeborn
* server.conf: New file.
155
                     service.name, service.type)
156
        group.AddService(
157
                self.interface,         # interface
158
                avahi.PROTO_INET6,      # protocol
159
                dbus.UInt32(0),         # flags
160
                self.name, self.type,
161
                self.domain, self.host,
162
                dbus.UInt16(self.port),
163
                avahi.string_array_to_txt_array(self.TXT))
164
        group.Commit()
165
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
166
# From the Avahi example code:
28 by Teddy Hogeborn
* server.conf: New file.
167
group = None                            # our entry group
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
168
# End of Avahi example code
169
170
3 by Björn Påhlsson
Python based server
171
class Client(object):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
172
    """A representation of a client host served by this server.
173
    Attributes:
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
174
    name:      string; from the config file, used in log messages
175
    fingerprint: string (40 or 32 hexadecimal digits); used to
176
                 uniquely identify the client
177
    secret:    bytestring; sent verbatim (over TLS) to client
51 by Teddy Hogeborn
* clients.conf: Better comments.
178
    host:      string; available for use by the checker command
28 by Teddy Hogeborn
* server.conf: New file.
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
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
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.
28 by Teddy Hogeborn
* server.conf: New file.
187
                                   'None' if no process is running.
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
188
    checker_initiator_tag: a gobject event source tag, or None
189
    stop_initiator_tag:    - '' -
190
    checker_callback_tag:  - '' -
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
191
    checker_command: string; External command which is run to check if
28 by Teddy Hogeborn
* server.conf: New file.
192
                     client lives.  %() expansions are done at
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
193
                     runtime with vars(self) as dict, so that for
194
                     instance %(name)s can be used in the command.
195
    Private attibutes:
196
    _timeout: Real variable for 'timeout'
197
    _interval: Real variable for 'interval'
28 by Teddy Hogeborn
* server.conf: New file.
198
    _timeout_milliseconds: Used when calling gobject.timeout_add()
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
199
    _interval_milliseconds: - '' -
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
200
    """
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
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
44 by Teddy Hogeborn
* ca.pem: Removed.
224
    def __init__(self, name = None, stop_hook=None, config={}):
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
225
        """Note: the 'checker' key in 'config' sets the
226
        'checker_command' attribute and *not* the 'checker'
227
        attribute."""
3 by Björn Påhlsson
Python based server
228
        self.name = name
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
229
        logger.debug(u"Creating client %r", self.name)
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
230
        # Uppercase and remove spaces from fingerprint for later
231
        # comparison purposes with return value from the fingerprint()
232
        # function
44 by Teddy Hogeborn
* ca.pem: Removed.
233
        self.fingerprint = config["fingerprint"].upper()\
234
                           .replace(u" ", u"")
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
235
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
44 by Teddy Hogeborn
* ca.pem: Removed.
236
        if "secret" in config:
237
            self.secret = config["secret"].decode(u"base64")
238
        elif "secfile" in config:
239
            sf = open(config["secfile"])
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
240
            self.secret = sf.read()
241
            sf.close()
3 by Björn Påhlsson
Python based server
242
        else:
28 by Teddy Hogeborn
* server.conf: New file.
243
            raise TypeError(u"No secret or secfile for client %s"
244
                            % self.name)
51 by Teddy Hogeborn
* clients.conf: Better comments.
245
        self.host = config.get("host", "")
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
246
        self.created = datetime.datetime.now()
28 by Teddy Hogeborn
* server.conf: New file.
247
        self.last_checked_ok = None
44 by Teddy Hogeborn
* ca.pem: Removed.
248
        self.timeout = string_to_delta(config["timeout"])
249
        self.interval = string_to_delta(config["interval"])
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
250
        self.stop_hook = stop_hook
251
        self.checker = None
252
        self.checker_initiator_tag = None
253
        self.stop_initiator_tag = None
254
        self.checker_callback_tag = None
44 by Teddy Hogeborn
* ca.pem: Removed.
255
        self.check_command = config["checker"]
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
256
    def start(self):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
257
        """Start this client's checker and timeout hooks"""
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
258
        # Schedule a new checker to be started an 'interval' from now,
259
        # and every interval from then on.
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
260
        self.checker_initiator_tag = gobject.timeout_add\
261
                                     (self._interval_milliseconds,
262
                                      self.start_checker)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
263
        # Also start a new checker *right now*.
264
        self.start_checker()
265
        # Schedule a stop() when 'timeout' has passed
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
266
        self.stop_initiator_tag = gobject.timeout_add\
267
                                  (self._timeout_milliseconds,
268
                                   self.stop)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
269
    def stop(self):
270
        """Stop this client.
28 by Teddy Hogeborn
* server.conf: New file.
271
        The possibility that a client might be restarted is left open,
272
        but not currently used."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
273
        # If this client doesn't have a secret, it is already stopped.
51 by Teddy Hogeborn
* clients.conf: Better comments.
274
        if hasattr(self, "secret") and self.secret:
44 by Teddy Hogeborn
* ca.pem: Removed.
275
            logger.info(u"Stopping client %s", self.name)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
276
            self.secret = None
277
        else:
278
            return False
28 by Teddy Hogeborn
* server.conf: New file.
279
        if getattr(self, "stop_initiator_tag", False):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
280
            gobject.source_remove(self.stop_initiator_tag)
281
            self.stop_initiator_tag = None
28 by Teddy Hogeborn
* server.conf: New file.
282
        if getattr(self, "checker_initiator_tag", False):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
283
            gobject.source_remove(self.checker_initiator_tag)
284
            self.checker_initiator_tag = None
285
        self.stop_checker()
286
        if self.stop_hook:
287
            self.stop_hook(self)
288
        # Do not run this again if called by a gobject.timeout_add
289
        return False
290
    def __del__(self):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
291
        self.stop_hook = None
292
        self.stop()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
293
    def checker_callback(self, pid, condition):
294
        """The checker has completed, so take appropriate actions."""
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
295
        now = datetime.datetime.now()
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
296
        self.checker_callback_tag = None
297
        self.checker = None
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
298
        if os.WIFEXITED(condition) \
299
               and (os.WEXITSTATUS(condition) == 0):
44 by Teddy Hogeborn
* ca.pem: Removed.
300
            logger.info(u"Checker for %(name)s succeeded",
301
                        vars(self))
28 by Teddy Hogeborn
* server.conf: New file.
302
            self.last_checked_ok = now
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
303
            gobject.source_remove(self.stop_initiator_tag)
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
304
            self.stop_initiator_tag = gobject.timeout_add\
305
                                      (self._timeout_milliseconds,
306
                                       self.stop)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
307
        elif not os.WIFEXITED(condition):
13 by Björn Påhlsson
Added following support:
308
            logger.warning(u"Checker for %(name)s crashed?",
309
                           vars(self))
310
        else:
44 by Teddy Hogeborn
* ca.pem: Removed.
311
            logger.info(u"Checker for %(name)s failed",
312
                        vars(self))
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
313
    def start_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
314
        """Start a new checker subprocess if one is not running.
315
        If a checker already exists, leave it running and do
316
        nothing."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
317
        # The reason for not killing a running checker is that if we
318
        # did that, then if a checker (for some reason) started
319
        # running slowly and taking more than 'interval' time, the
320
        # client would inevitably timeout, since no checker would get
321
        # a chance to run to completion.  If we instead leave running
322
        # checkers alone, the checker would have to take more time
323
        # than 'timeout' for the client to be declared invalid, which
324
        # is as it should be.
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
325
        if self.checker is None:
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
326
            try:
28 by Teddy Hogeborn
* server.conf: New file.
327
                # In case check_command has exactly one % operator
51 by Teddy Hogeborn
* clients.conf: Better comments.
328
                command = self.check_command % self.host
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
329
            except TypeError:
28 by Teddy Hogeborn
* server.conf: New file.
330
                # Escape attributes for the shell
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
331
                escaped_attrs = dict((key, re.escape(str(val)))
332
                                     for key, val in
333
                                     vars(self).iteritems())
13 by Björn Påhlsson
Added following support:
334
                try:
335
                    command = self.check_command % escaped_attrs
336
                except TypeError, error:
28 by Teddy Hogeborn
* server.conf: New file.
337
                    logger.error(u'Could not format string "%s":'
338
                                 u' %s', self.check_command, error)
13 by Björn Påhlsson
Added following support:
339
                    return True # Try again later
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
340
            try:
44 by Teddy Hogeborn
* ca.pem: Removed.
341
                logger.info(u"Starting checker %r for %s",
342
                            command, self.name)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
343
                # We don't need to redirect stdout and stderr, since
344
                # in normal mode, that is already done by daemon(),
345
                # and in debug mode we don't want to.  (Stdin is
346
                # always replaced by /dev/null.)
28 by Teddy Hogeborn
* server.conf: New file.
347
                self.checker = subprocess.Popen(command,
348
                                                close_fds=True,
349
                                                shell=True, cwd="/")
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
350
                self.checker_callback_tag = gobject.child_watch_add\
351
                                            (self.checker.pid,
352
                                             self.checker_callback)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
353
            except OSError, error:
13 by Björn Påhlsson
Added following support:
354
                logger.error(u"Failed to start subprocess: %s",
355
                             error)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
356
        # Re-run this periodically if run by gobject.timeout_add
357
        return True
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
358
    def stop_checker(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
359
        """Force the checker process, if any, to stop."""
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
360
        if self.checker_callback_tag:
361
            gobject.source_remove(self.checker_callback_tag)
362
            self.checker_callback_tag = None
28 by Teddy Hogeborn
* server.conf: New file.
363
        if getattr(self, "checker", None) is None:
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
364
            return
51 by Teddy Hogeborn
* clients.conf: Better comments.
365
        logger.debug(u"Stopping checker for %(name)s", vars(self))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
366
        try:
367
            os.kill(self.checker.pid, signal.SIGTERM)
368
            #os.sleep(0.5)
369
            #if self.checker.poll() is None:
370
            #    os.kill(self.checker.pid, signal.SIGKILL)
371
        except OSError, error:
28 by Teddy Hogeborn
* server.conf: New file.
372
            if error.errno != errno.ESRCH: # No such process
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
373
                raise
9 by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits.
374
        self.checker = None
28 by Teddy Hogeborn
* server.conf: New file.
375
    def still_valid(self):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
376
        """Has the timeout not yet passed for this client?"""
28 by Teddy Hogeborn
* server.conf: New file.
377
        now = datetime.datetime.now()
378
        if self.last_checked_ok is None:
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
379
            return now < (self.created + self.timeout)
380
        else:
28 by Teddy Hogeborn
* server.conf: New file.
381
            return now < (self.last_checked_ok + self.timeout)
3 by Björn Påhlsson
Python based server
382
383
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
384
def peer_certificate(session):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
385
    "Return the peer's OpenPGP certificate as a bytestring"
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
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):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
402
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
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)))
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
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))
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
412
    # Import the OpenPGP public key into the certificate
45 by Teddy Hogeborn
* server.py: Cosmetic changes.
413
    gnutls.library.functions.gnutls_openpgp_crt_import\
414
                    (crt, ctypes.byref(datum),
415
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
24.1.62 by Björn Påhlsson
merge + small bugfix
416
    # Verify the self signature in the key
417
    crtverify = ctypes.c_uint();
418
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
109 by Teddy Hogeborn
* .bzrignore: New.
419
        (crt, 0, ctypes.byref(crtverify))
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
420
    if crtverify.value != 0:
24.1.62 by Björn Påhlsson
merge + small bugfix
421
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
422
        raise gnutls.errors.CertificateSecurityError("Verify failed")
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
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
3 by Björn Påhlsson
Python based server
438
class tcp_handler(SocketServer.BaseRequestHandler, object):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
439
    """A TCP request handler class.
440
    Instantiated by IPv6_TCPServer for each request to handle it.
441
    Note: This will run in its own forked process."""
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
442
    
3 by Björn Påhlsson
Python based server
443
    def handle(self):
44 by Teddy Hogeborn
* ca.pem: Removed.
444
        logger.info(u"TCP connection from: %s",
13 by Björn Påhlsson
Added following support:
445
                     unicode(self.client_address))
41 by Teddy Hogeborn
Merge.
446
        session = gnutls.connection.ClientSession\
447
                  (self.request, gnutls.connection.X509Credentials())
448
        
24.1.12 by Björn Påhlsson
merge +
449
        line = self.request.makefile().readline()
450
        logger.debug(u"Protocol version: %r", line)
24.1.11 by Björn Påhlsson
Added support for protocol version handling
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
        
28 by Teddy Hogeborn
* server.conf: New file.
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.
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
462
        
463
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
464
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
465
        #                "+DHE-DSS"))
28 by Teddy Hogeborn
* server.conf: New file.
466
        priority = "NORMAL"             # Fallback default, since this
467
                                        # MUST be set.
468
        if self.server.settings["priority"]:
469
            priority = self.server.settings["priority"]
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
470
        gnutls.library.functions.gnutls_priority_set_direct\
471
            (session._c_object, priority, None);
472
        
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
473
        try:
474
            session.handshake()
475
        except gnutls.errors.GNUTLSError, error:
44 by Teddy Hogeborn
* ca.pem: Removed.
476
            logger.warning(u"Handshake failed: %s", error)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
477
            # Do not run session.bye() here: the session is not
478
            # established.  Just abandon the request.
479
            return
3 by Björn Påhlsson
Python based server
480
        try:
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
481
            fpr = fingerprint(peer_certificate(session))
482
        except (TypeError, gnutls.errors.GNUTLSError), error:
44 by Teddy Hogeborn
* ca.pem: Removed.
483
            logger.warning(u"Bad certificate: %s", error)
3 by Björn Påhlsson
Python based server
484
            session.bye()
485
            return
13 by Björn Påhlsson
Added following support:
486
        logger.debug(u"Fingerprint: %s", fpr)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
487
        client = None
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
488
        for c in self.server.clients:
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
489
            if c.fingerprint == fpr:
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
490
                client = c
491
                break
28 by Teddy Hogeborn
* server.conf: New file.
492
        if not client:
44 by Teddy Hogeborn
* ca.pem: Removed.
493
            logger.warning(u"Client not found for fingerprint: %s",
494
                           fpr)
28 by Teddy Hogeborn
* server.conf: New file.
495
            session.bye()
496
            return
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
497
        # Have to check if client.still_valid(), since it is possible
498
        # that the client timed out while establishing the GnuTLS
499
        # session.
28 by Teddy Hogeborn
* server.conf: New file.
500
        if not client.still_valid():
44 by Teddy Hogeborn
* ca.pem: Removed.
501
            logger.warning(u"Client %(name)s is invalid",
502
                           vars(client))
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
503
            session.bye()
504
            return
505
        sent_size = 0
506
        while sent_size < len(client.secret):
507
            sent = session.send(client.secret[sent_size:])
13 by Björn Påhlsson
Added following support:
508
            logger.debug(u"Sent: %d, remaining: %d",
509
                         sent, len(client.secret)
510
                         - (sent_size + sent))
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
511
            sent_size += sent
3 by Björn Påhlsson
Python based server
512
        session.bye()
513
5 by Teddy Hogeborn
* server.py (server_metaclass): New.
514
3 by Björn Påhlsson
Python based server
515
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
516
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
517
    Attributes:
28 by Teddy Hogeborn
* server.conf: New file.
518
        settings:       Server settings
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
519
        clients:        Set() of Client objects
520
    """
521
    address_family = socket.AF_INET6
522
    def __init__(self, *args, **kwargs):
28 by Teddy Hogeborn
* server.conf: New file.
523
        if "settings" in kwargs:
524
            self.settings = kwargs["settings"]
525
            del kwargs["settings"]
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
526
        if "clients" in kwargs:
527
            self.clients = kwargs["clients"]
528
            del kwargs["clients"]
529
        return super(type(self), self).__init__(*args, **kwargs)
530
    def server_bind(self):
531
        """This overrides the normal server_bind() function
532
        to bind to an interface if one was specified, and also NOT to
533
        bind to an address or port if they were not specified."""
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
534
        if self.settings["interface"]:
28 by Teddy Hogeborn
* server.conf: New file.
535
            # 25 is from /usr/include/asm-i486/socket.h
536
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
537
            try:
538
                self.socket.setsockopt(socket.SOL_SOCKET,
28 by Teddy Hogeborn
* server.conf: New file.
539
                                       SO_BINDTODEVICE,
540
                                       self.settings["interface"])
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
541
            except socket.error, error:
542
                if error[0] == errno.EPERM:
44 by Teddy Hogeborn
* ca.pem: Removed.
543
                    logger.error(u"No permission to"
544
                                 u" bind to interface %s",
545
                                 self.settings["interface"])
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
546
                else:
547
                    raise error
548
        # Only bind(2) the socket if we really need to.
549
        if self.server_address[0] or self.server_address[1]:
550
            if not self.server_address[0]:
551
                in6addr_any = "::"
552
                self.server_address = (in6addr_any,
553
                                       self.server_address[1])
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
554
            elif not self.server_address[1]:
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
555
                self.server_address = (self.server_address[0],
556
                                       0)
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
557
#                 if self.settings["interface"]:
558
#                     self.server_address = (self.server_address[0],
559
#                                            0, # port
560
#                                            0, # flowinfo
561
#                                            if_nametoindex
562
#                                            (self.settings
563
#                                             ["interface"]))
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
564
            return super(type(self), self).server_bind()
10 by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division".
565
3 by Björn Påhlsson
Python based server
566
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
567
def string_to_delta(interval):
568
    """Parse a string and return a datetime.timedelta
569
570
    >>> string_to_delta('7d')
571
    datetime.timedelta(7)
572
    >>> string_to_delta('60s')
573
    datetime.timedelta(0, 60)
574
    >>> string_to_delta('60m')
575
    datetime.timedelta(0, 3600)
576
    >>> string_to_delta('24h')
577
    datetime.timedelta(1)
578
    >>> string_to_delta(u'1w')
579
    datetime.timedelta(7)
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
580
    >>> string_to_delta('5m 30s')
581
    datetime.timedelta(0, 330)
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
582
    """
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
583
    timevalue = datetime.timedelta(0)
584
    for s in interval.split():
585
        try:
586
            suffix=unicode(s[-1])
587
            value=int(s[:-1])
588
            if suffix == u"d":
589
                delta = datetime.timedelta(value)
590
            elif suffix == u"s":
591
                delta = datetime.timedelta(0, value)
592
            elif suffix == u"m":
593
                delta = datetime.timedelta(0, 0, 0, 0, value)
594
            elif suffix == u"h":
595
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
596
            elif suffix == u"w":
597
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
598
            else:
599
                raise ValueError
600
        except (ValueError, IndexError):
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
601
            raise ValueError
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
602
        timevalue += delta
603
    return timevalue
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
604
8 by Teddy Hogeborn
* Makefile (client_debug): Bug fix; add quotes and / to CERT_ROOT.
605
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
606
def server_state_changed(state):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
607
    """Derived from the Avahi example code"""
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
608
    if state == avahi.SERVER_COLLISION:
109 by Teddy Hogeborn
* .bzrignore: New.
609
        logger.error(u"Zeroconf server name collision")
28 by Teddy Hogeborn
* server.conf: New file.
610
        service.remove()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
611
    elif state == avahi.SERVER_RUNNING:
28 by Teddy Hogeborn
* server.conf: New file.
612
        service.add()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
613
614
615
def entry_group_state_changed(state, error):
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
616
    """Derived from the Avahi example code"""
109 by Teddy Hogeborn
* .bzrignore: New.
617
    logger.debug(u"Avahi state change: %i", state)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
618
    
619
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
109 by Teddy Hogeborn
* .bzrignore: New.
620
        logger.debug(u"Zeroconf service established.")
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
621
    elif state == avahi.ENTRY_GROUP_COLLISION:
109 by Teddy Hogeborn
* .bzrignore: New.
622
        logger.warning(u"Zeroconf service name collision.")
28 by Teddy Hogeborn
* server.conf: New file.
623
        service.rename()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
624
    elif state == avahi.ENTRY_GROUP_FAILURE:
109 by Teddy Hogeborn
* .bzrignore: New.
625
        logger.critical(u"Avahi: Error in group state changed %s",
28 by Teddy Hogeborn
* server.conf: New file.
626
                        unicode(error))
627
        raise AvahiGroupError("State changed: %s", str(error))
628
24.1.13 by Björn Påhlsson
mandosclient
629
def if_nametoindex(interface):
28 by Teddy Hogeborn
* server.conf: New file.
630
    """Call the C function if_nametoindex(), or equivalent"""
24.1.13 by Björn Påhlsson
mandosclient
631
    global if_nametoindex
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
632
    try:
28 by Teddy Hogeborn
* server.conf: New file.
633
        if "ctypes.util" not in sys.modules:
634
            import ctypes.util
24.1.13 by Björn Påhlsson
mandosclient
635
        if_nametoindex = ctypes.cdll.LoadLibrary\
636
            (ctypes.util.find_library("c")).if_nametoindex
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
637
    except (OSError, AttributeError):
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
638
        if "struct" not in sys.modules:
639
            import struct
640
        if "fcntl" not in sys.modules:
641
            import fcntl
24.1.13 by Björn Påhlsson
mandosclient
642
        def if_nametoindex(interface):
28 by Teddy Hogeborn
* server.conf: New file.
643
            "Get an interface index the hard way, i.e. using fcntl()"
644
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
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]
650
            return interface_index
24.1.13 by Björn Påhlsson
mandosclient
651
    return if_nametoindex(interface)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
652
653
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
654
def daemon(nochdir = False, noclose = False):
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
655
    """See daemon(3).  Standard BSD Unix function.
656
    This should really exist as os.daemon, but it doesn't (yet)."""
657
    if os.fork():
658
        sys.exit()
659
    os.setsid()
660
    if not nochdir:
661
        os.chdir("/")
46 by Teddy Hogeborn
* network-protocol.txt: New.
662
    if os.fork():
663
        sys.exit()
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
664
    if not noclose:
665
        # Close all standard open file descriptors
28 by Teddy Hogeborn
* server.conf: New file.
666
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
667
        if not stat.S_ISCHR(os.fstat(null).st_mode):
668
            raise OSError(errno.ENODEV,
669
                          "/dev/null not a character device")
670
        os.dup2(null, sys.stdin.fileno())
671
        os.dup2(null, sys.stdout.fileno())
672
        os.dup2(null, sys.stderr.fileno())
673
        if null > 2:
674
            os.close(null)
675
676
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
677
def main():
678
    global main_loop_started
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
679
    main_loop_started = False
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
680
    
59 by Teddy Hogeborn
* mandos (main): Use program name in --version output.
681
    parser = OptionParser(version = "%%prog %s" % version)
3 by Björn Påhlsson
Python based server
682
    parser.add_option("-i", "--interface", type="string",
28 by Teddy Hogeborn
* server.conf: New file.
683
                      metavar="IF", help="Bind to interface IF")
684
    parser.add_option("-a", "--address", type="string",
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
685
                      help="Address to listen for requests on")
28 by Teddy Hogeborn
* server.conf: New file.
686
    parser.add_option("-p", "--port", type="int",
3 by Björn Påhlsson
Python based server
687
                      help="Port number to receive requests on")
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
688
    parser.add_option("--check", action="store_true", default=False,
689
                      help="Run self-test")
49 by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
690
    parser.add_option("--debug", action="store_true",
28 by Teddy Hogeborn
* server.conf: New file.
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")
3 by Björn Påhlsson
Python based server
701
    (options, args) = parser.parse_args()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
702
    
4 by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New.
703
    if options.check:
704
        import doctest
705
        doctest.testmod()
706
        sys.exit()
3 by Björn Påhlsson
Python based server
707
    
28 by Teddy Hogeborn
* server.conf: New file.
708
    # Default values for config file for server-global settings
709
    server_defaults = { "interface": "",
710
                        "address": "",
711
                        "port": "",
712
                        "debug": "False",
713
                        "priority":
714
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
715
                        "servicename": "Mandos",
716
                        }
717
    
718
    # Parse config file for server-global settings
719
    server_config = ConfigParser.SafeConfigParser(server_defaults)
720
    del server_defaults
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
721
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
28 by Teddy Hogeborn
* server.conf: New file.
722
    # Convert the SafeConfigParser object to a dict
89 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
723
    server_settings = server_config.defaults()
28 by Teddy Hogeborn
* server.conf: New file.
724
    # Use getboolean on the boolean config option
725
    server_settings["debug"] = server_config.getboolean\
89 by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages.
726
                               ("DEFAULT", "debug")
28 by Teddy Hogeborn
* server.conf: New file.
727
    del server_config
728
    
729
    # Override the settings from the config file with command line
730
    # options, if set.
731
    for option in ("interface", "address", "port", "debug",
732
                   "priority", "servicename", "configdir"):
733
        value = getattr(options, option)
734
        if value is not None:
735
            server_settings[option] = value
736
    del options
737
    # Now we have our good server settings in "server_settings"
738
    
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
739
    debug = server_settings["debug"]
740
    
741
    if not debug:
742
        syslogger.setLevel(logging.WARNING)
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
743
        console.setLevel(logging.WARNING)
52 by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost.
744
    
745
    if server_settings["servicename"] != "Mandos":
746
        syslogger.setFormatter(logging.Formatter\
747
                               ('Mandos (%s): %%(levelname)s:'
748
                                ' %%(message)s'
749
                                % server_settings["servicename"]))
750
    
28 by Teddy Hogeborn
* server.conf: New file.
751
    # Parse config file with clients
752
    client_defaults = { "timeout": "1h",
753
                        "interval": "5m",
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
754
                        "checker": "fping -q -- %(host)s",
93 by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of
755
                        "host": "",
28 by Teddy Hogeborn
* server.conf: New file.
756
                        }
757
    client_config = ConfigParser.SafeConfigParser(client_defaults)
758
    client_config.read(os.path.join(server_settings["configdir"],
759
                                    "clients.conf"))
760
    
761
    global service
762
    service = AvahiService(name = server_settings["servicename"],
763
                           type = "_mandos._tcp", );
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
764
    if server_settings["interface"]:
109 by Teddy Hogeborn
* .bzrignore: New.
765
        service.interface = if_nametoindex\
766
                            (server_settings["interface"])
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
767
    
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
768
    global main_loop
769
    global bus
770
    global server
771
    # From the Avahi example code
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
772
    DBusGMainLoop(set_as_default=True )
773
    main_loop = gobject.MainLoop()
774
    bus = dbus.SystemBus()
109 by Teddy Hogeborn
* .bzrignore: New.
775
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
776
                                           avahi.DBUS_PATH_SERVER),
777
                            avahi.DBUS_INTERFACE_SERVER)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
778
    # End of Avahi example code
779
    
780
    clients = Set()
781
    def remove_from_clients(client):
782
        clients.remove(client)
783
        if not clients:
44 by Teddy Hogeborn
* ca.pem: Removed.
784
            logger.critical(u"No clients left, exiting")
28 by Teddy Hogeborn
* server.conf: New file.
785
            sys.exit()
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
786
    
44 by Teddy Hogeborn
* ca.pem: Removed.
787
    clients.update(Set(Client(name = section,
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
788
                              stop_hook = remove_from_clients,
44 by Teddy Hogeborn
* ca.pem: Removed.
789
                              config
790
                              = dict(client_config.items(section)))
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
791
                       for section in client_config.sections()))
51 by Teddy Hogeborn
* clients.conf: Better comments.
792
    if not clients:
793
        logger.critical(u"No clients defined")
794
        sys.exit(1)
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
795
    
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
796
    if debug:
797
        # Redirect stdin so all checkers get /dev/null
798
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
799
        os.dup2(null, sys.stdin.fileno())
800
        if null > 2:
801
            os.close(null)
802
    else:
803
        # No console logging
61 by Teddy Hogeborn
* mandos (console): Define handler globally.
804
        logger.removeHandler(console)
94 by Teddy Hogeborn
* clients.conf ([DEFAULT]/checker): Update to new default value.
805
        # Close all input and output, do double fork, etc.
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
806
        daemon()
51 by Teddy Hogeborn
* clients.conf: Better comments.
807
    
50 by Teddy Hogeborn
* Makefile: Do DocBook manual conversion in a better way.
808
    pidfilename = "/var/run/mandos/mandos.pid"
809
    pid = os.getpid()
810
    try:
811
        pidfile = open(pidfilename, "w")
812
        pidfile.write(str(pid) + "\n")
813
        pidfile.close()
814
        del pidfile
815
    except IOError, err:
51 by Teddy Hogeborn
* clients.conf: Better comments.
816
        logger.error(u"Could not write %s file with PID %d",
50 by Teddy Hogeborn
* Makefile: Do DocBook manual conversion in a better way.
817
                     pidfilename, os.getpid())
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
818
    
819
    def cleanup():
820
        "Cleanup function; run on exit"
821
        global group
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
822
        # From the Avahi example code
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
823
        if not group is None:
824
            group.Free()
825
            group = None
826
        # End of Avahi example code
827
        
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
828
        while clients:
829
            client = clients.pop()
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
830
            client.stop_hook = None
831
            client.stop()
832
    
833
    atexit.register(cleanup)
834
    
835
    if not debug:
836
        signal.signal(signal.SIGINT, signal.SIG_IGN)
28 by Teddy Hogeborn
* server.conf: New file.
837
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
838
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
839
    
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
840
    for client in clients:
841
        client.start()
842
    
28 by Teddy Hogeborn
* server.conf: New file.
843
    tcp_server = IPv6_TCPServer((server_settings["address"],
844
                                 server_settings["port"]),
3 by Björn Påhlsson
Python based server
845
                                tcp_handler,
28 by Teddy Hogeborn
* server.conf: New file.
846
                                settings=server_settings,
12 by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn,
847
                                clients=clients)
28 by Teddy Hogeborn
* server.conf: New file.
848
    # Find out what port we got
849
    service.port = tcp_server.socket.getsockname()[1]
44 by Teddy Hogeborn
* ca.pem: Removed.
850
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
851
                u" scope_id %d" % tcp_server.socket.getsockname())
28 by Teddy Hogeborn
* server.conf: New file.
852
    
29 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed
853
    #service.interface = tcp_server.socket.getsockname()[3]
28 by Teddy Hogeborn
* server.conf: New file.
854
    
855
    try:
856
        # From the Avahi example code
857
        server.connect_to_signal("StateChanged", server_state_changed)
858
        try:
859
            server_state_changed(server.GetState())
860
        except dbus.exceptions.DBusException, error:
861
            logger.critical(u"DBusException: %s", error)
862
            sys.exit(1)
863
        # End of Avahi example code
864
        
865
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
866
                             lambda *args, **kwargs:
867
                             tcp_server.handle_request\
868
                             (*args[2:], **kwargs) or True)
869
        
51 by Teddy Hogeborn
* clients.conf: Better comments.
870
        logger.debug(u"Starting main loop")
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
871
        main_loop_started = True
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
872
        main_loop.run()
28 by Teddy Hogeborn
* server.conf: New file.
873
    except AvahiError, error:
874
        logger.critical(u"AvahiError: %s" + unicode(error))
875
        sys.exit(1)
11 by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the
876
    except KeyboardInterrupt:
15 by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented.
877
        if debug:
878
            print
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
879
880
if __name__ == '__main__':
881
    main()