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