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