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