To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 520
- compare with another revision
- download diff
- download tarball
- view history from revision 520
- Committer: Björn Påhlsson
- Date: 2011-11-09 17:16:03 UTC
- mfrom: (518.1.1 mandos-persistent)
- Revision ID: belorn@fukt.bsnet.se-20111109171603-srz21uoclpldp5ve
merge persistent state
- files added:
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@fukt.bsnet.se>.
31
# Contact the authors at <mandos@recompile.se>.
32
32
#
33
33
34
from __future__ import division, with_statement, absolute_import
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
37
import SocketServer as socketserver
37
38
import socket
38
import optparse
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
61
62
import functools
62
63
import cPickle as pickle
63
64
import multiprocessing
65
import types
66
import hashlib
64
67
65
68
import dbus
66
69
import dbus.service
71
74
import ctypes.util
72
75
import xml.dom.minidom
73
76
import inspect
77
import Crypto.Cipher.AES
74
78
75
79
try:
76
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
85
SO_BINDTODEVICE = None
82
86
83
87
84
version = "1.0.14"
85
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
88
version = "1.4.1"
89
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
88
93
syslogger = (logging.handlers.SysLogHandler
89
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
address = "/dev/log"))
95
address = str("/dev/log")))
91
96
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
93
u' %(message)s'))
97
('Mandos [%(process)d]: %(levelname)s:'
98
' %(message)s'))
94
99
logger.addHandler(syslogger)
95
100
96
101
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
u' %(levelname)s:'
99
u' %(message)s'))
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
' [%(process)d]:'
104
' %(levelname)s:'
105
' %(message)s'))
100
106
logger.addHandler(console)
101
107
108
102
109
class AvahiError(Exception):
103
110
def __init__(self, value, *args, **kwargs):
104
111
self.value = value
119
126
Attributes:
120
127
interface: integer; avahi.IF_UNSPEC or an interface index.
121
128
Used to optionally bind to the specified interface.
122
name: string; Example: u'Mandos'
123
type: string; Example: u'_mandos._tcp'.
129
name: string; Example: 'Mandos'
130
type: string; Example: '_mandos._tcp'.
124
131
See <http://www.dns-sd.org/ServiceTypes.html>
125
132
port: integer; what port to announce
126
133
TXT: list of strings; TXT record for the service
135
142
"""
136
143
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
144
servicetype = None, port = None, TXT = None,
138
domain = u"", host = u"", max_renames = 32768,
145
domain = "", host = "", max_renames = 32768,
139
146
protocol = avahi.PROTO_UNSPEC, bus = None):
140
147
self.interface = interface
141
148
self.name = name
150
157
self.group = None # our entry group
151
158
self.server = None
152
159
self.bus = bus
160
self.entry_group_state_changed_match = None
153
161
def rename(self):
154
162
"""Derived from the Avahi example code"""
155
163
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
164
logger.critical("No suitable Zeroconf service name found"
165
" after %i retries, exiting.",
158
166
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
167
raise AvahiServiceError("Too many renames")
168
self.name = unicode(self.server
169
.GetAlternativeServiceName(self.name))
170
logger.info("Changing Zeroconf service name to %r ...",
162
171
self.name)
163
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
% self.name))
167
172
self.remove()
168
173
try:
169
174
self.add()
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
175
except dbus.exceptions.DBusException as error:
176
logger.critical("DBusException: %s", error)
172
177
self.cleanup()
173
178
os._exit(1)
174
179
self.rename_count += 1
175
180
def remove(self):
176
181
"""Derived from the Avahi example code"""
182
if self.entry_group_state_changed_match is not None:
183
self.entry_group_state_changed_match.remove()
184
self.entry_group_state_changed_match = None
177
185
if self.group is not None:
178
186
self.group.Reset()
179
187
def add(self):
180
188
"""Derived from the Avahi example code"""
189
self.remove()
181
190
if self.group is None:
182
191
self.group = dbus.Interface(
183
192
self.bus.get_object(avahi.DBUS_NAME,
184
193
self.server.EntryGroupNew()),
185
194
avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
self.group.connect_to_signal('StateChanged',
187
self
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
195
self.entry_group_state_changed_match = (
196
self.group.connect_to_signal(
197
'StateChanged', self.entry_group_state_changed))
198
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
199
self.name, self.type)
191
200
self.group.AddService(
192
201
self.interface,
199
208
self.group.Commit()
200
209
def entry_group_state_changed(self, state, error):
201
210
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
211
logger.debug("Avahi entry group state change: %i", state)
203
212
204
213
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
214
logger.debug("Zeroconf service established.")
206
215
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
216
logger.info("Zeroconf service name collision.")
208
217
self.rename()
209
218
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
219
logger.critical("Avahi: Error in group state changed %s",
211
220
unicode(error))
212
raise AvahiGroupError(u"State changed: %s"
221
raise AvahiGroupError("State changed: %s"
213
222
% unicode(error))
214
223
def cleanup(self):
215
224
"""Derived from the Avahi example code"""
216
225
if self.group is not None:
217
self.group.Free()
226
try:
227
self.group.Free()
228
except (dbus.exceptions.UnknownMethodException,
229
dbus.exceptions.DBusException) as e:
230
pass
218
231
self.group = None
219
def server_state_changed(self, state):
232
self.remove()
233
def server_state_changed(self, state, error=None):
220
234
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
224
self.remove()
235
logger.debug("Avahi server state change: %i", state)
236
bad_states = { avahi.SERVER_INVALID:
237
"Zeroconf server invalid",
238
avahi.SERVER_REGISTERING: None,
239
avahi.SERVER_COLLISION:
240
"Zeroconf server name collision",
241
avahi.SERVER_FAILURE:
242
"Zeroconf server failure" }
243
if state in bad_states:
244
if bad_states[state] is not None:
245
if error is None:
246
logger.error(bad_states[state])
247
else:
248
logger.error(bad_states[state] + ": %r", error)
249
self.cleanup()
225
250
elif state == avahi.SERVER_RUNNING:
226
251
self.add()
252
else:
253
if error is None:
254
logger.debug("Unknown state: %r", state)
255
else:
256
logger.debug("Unknown state: %r: %r", state, error)
227
257
def activate(self):
228
258
"""Derived from the Avahi example code"""
229
259
if self.server is None:
230
260
self.server = dbus.Interface(
231
261
self.bus.get_object(avahi.DBUS_NAME,
232
avahi.DBUS_PATH_SERVER),
262
avahi.DBUS_PATH_SERVER,
263
follow_name_owner_changes=True),
233
264
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
265
self.server.connect_to_signal("StateChanged",
235
266
self.server_state_changed)
236
267
self.server_state_changed(self.server.GetState())
237
268
269
class AvahiServiceToSyslog(AvahiService):
270
def rename(self):
271
"""Add the new name to the syslog messages"""
272
ret = AvahiService.rename(self)
273
syslogger.setFormatter(logging.Formatter
274
('Mandos (%s) [%%(process)d]:'
275
' %%(levelname)s: %%(message)s'
276
% self.name))
277
return ret
238
278
279
def _timedelta_to_milliseconds(td):
280
"Convert a datetime.timedelta() to milliseconds"
281
return ((td.days * 24 * 60 * 60 * 1000)
282
+ (td.seconds * 1000)
283
+ (td.microseconds // 1000))
284
239
285
class Client(object):
240
286
"""A representation of a client host served by this server.
241
287
242
288
Attributes:
243
name: string; from the config file, used in log messages and
244
D-Bus identifiers
289
_approved: bool(); 'None' if not yet approved/disapproved
290
approval_delay: datetime.timedelta(); Time to wait for approval
291
approval_duration: datetime.timedelta(); Duration of one approval
292
checker: subprocess.Popen(); a running checker process used
293
to see if the client lives.
294
'None' if no process is running.
295
checker_callback_tag: a gobject event source tag, or None
296
checker_command: string; External command which is run to check
297
if client lives. %() expansions are done at
298
runtime with vars(self) as dict, so that for
299
instance %(name)s can be used in the command.
300
checker_initiator_tag: a gobject event source tag, or None
301
created: datetime.datetime(); (UTC) object creation
302
client_structure: Object describing what attributes a client has
303
and is used for storing the client at exit
304
current_checker_command: string; current running checker_command
305
disable_initiator_tag: a gobject event source tag, or None
306
enabled: bool()
245
307
fingerprint: string (40 or 32 hexadecimal digits); used to
246
308
uniquely identify the client
247
secret: bytestring; sent verbatim (over TLS) to client
248
309
host: string; available for use by the checker command
249
created: datetime.datetime(); (UTC) object creation
310
interval: datetime.timedelta(); How often to start a new checker
311
last_approval_request: datetime.datetime(); (UTC) or None
312
last_checked_ok: datetime.datetime(); (UTC) or None
313
last_checker_status: integer between 0 and 255 reflecting exit status
314
of last checker. -1 reflect crashed checker,
315
or None.
250
316
last_enabled: datetime.datetime(); (UTC)
251
enabled: bool()
252
last_checked_ok: datetime.datetime(); (UTC) or None
317
name: string; from the config file, used in log messages and
318
D-Bus identifiers
319
secret: bytestring; sent verbatim (over TLS) to client
253
320
timeout: datetime.timedelta(); How long from last_checked_ok
254
321
until this client is disabled
255
interval: datetime.timedelta(); How often to start a new checker
256
disable_hook: If set, called by disable() as disable_hook(self)
257
checker: subprocess.Popen(); a running checker process used
258
to see if the client lives.
259
'None' if no process is running.
260
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
262
checker_callback_tag: - '' -
263
checker_command: string; External command which is run to check if
264
client lives. %() expansions are done at
265
runtime with vars(self) as dict, so that for
266
instance %(name)s can be used in the command.
267
current_checker_command: string; current running checker_command
268
approval_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approval_duration: datetime.timedelta(); Duration of one approval
322
extended_timeout: extra long timeout when password has been sent
323
runtime_expansions: Allowed attributes for runtime expansion.
324
expires: datetime.datetime(); time (UTC) when a client will be
325
disabled, or None
271
326
"""
272
327
273
@staticmethod
274
def _timedelta_to_milliseconds(td):
275
"Convert a datetime.timedelta() to milliseconds"
276
return ((td.days * 24 * 60 * 60 * 1000)
277
+ (td.seconds * 1000)
278
+ (td.microseconds // 1000))
328
runtime_expansions = ("approval_delay", "approval_duration",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
331
"last_enabled", "name", "timeout")
279
332
280
333
def timeout_milliseconds(self):
281
334
"Return the 'timeout' attribute in milliseconds"
282
return self._timedelta_to_milliseconds(self.timeout)
335
return _timedelta_to_milliseconds(self.timeout)
336
337
def extended_timeout_milliseconds(self):
338
"Return the 'extended_timeout' attribute in milliseconds"
339
return _timedelta_to_milliseconds(self.extended_timeout)
283
340
284
341
def interval_milliseconds(self):
285
342
"Return the 'interval' attribute in milliseconds"
286
return self._timedelta_to_milliseconds(self.interval)
287
343
return _timedelta_to_milliseconds(self.interval)
344
288
345
def approval_delay_milliseconds(self):
289
return self._timedelta_to_milliseconds(self.approval_delay)
346
return _timedelta_to_milliseconds(self.approval_delay)
290
347
291
def __init__(self, name = None, disable_hook=None, config=None):
348
def __init__(self, name = None, config=None):
292
349
"""Note: the 'checker' key in 'config' sets the
293
350
'checker_command' attribute and *not* the 'checker'
294
351
attribute."""
295
352
self.name = name
296
353
if config is None:
297
354
config = {}
298
logger.debug(u"Creating client %r", self.name)
355
logger.debug("Creating client %r", self.name)
299
356
# Uppercase and remove spaces from fingerprint for later
300
357
# comparison purposes with return value from the fingerprint()
301
358
# function
302
self.fingerprint = (config[u"fingerprint"].upper()
303
.replace(u" ", u""))
304
logger.debug(u" Fingerprint: %s", self.fingerprint)
305
if u"secret" in config:
306
self.secret = config[u"secret"].decode(u"base64")
307
elif u"secfile" in config:
359
self.fingerprint = (config["fingerprint"].upper()
360
.replace(" ", ""))
361
logger.debug(" Fingerprint: %s", self.fingerprint)
362
if "secret" in config:
363
self.secret = config["secret"].decode("base64")
364
elif "secfile" in config:
308
365
with open(os.path.expanduser(os.path.expandvars
309
(config[u"secfile"])),
366
(config["secfile"])),
310
367
"rb") as secfile:
311
368
self.secret = secfile.read()
312
369
else:
313
raise TypeError(u"No secret or secfile for client %s"
370
raise TypeError("No secret or secfile for client %s"
314
371
% self.name)
315
self.host = config.get(u"host", u"")
372
self.host = config.get("host", "")
316
373
self.created = datetime.datetime.utcnow()
317
self.enabled = False
318
self.last_enabled = None
374
self.enabled = True
375
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
319
377
self.last_checked_ok = None
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
322
self.disable_hook = disable_hook
378
self.last_checker_status = None
379
self.timeout = string_to_delta(config["timeout"])
380
self.extended_timeout = string_to_delta(config
381
["extended_timeout"])
382
self.interval = string_to_delta(config["interval"])
323
383
self.checker = None
324
384
self.checker_initiator_tag = None
325
385
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
326
387
self.checker_callback_tag = None
327
self.checker_command = config[u"checker"]
388
self.checker_command = config["checker"]
328
389
self.current_checker_command = None
329
self.last_connect = None
330
390
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
391
self.approved_by_default = config.get("approved_by_default",
332
392
True)
333
393
self.approvals_pending = 0
334
394
self.approval_delay = string_to_delta(
335
config[u"approval_delay"])
395
config["approval_delay"])
336
396
self.approval_duration = string_to_delta(
337
config[u"approval_duration"])
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
397
config["approval_duration"])
398
self.changedstate = (multiprocessing_manager
399
.Condition(multiprocessing_manager
400
.Lock()))
401
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
402
self.client_structure.append("client_structure")
403
404
405
for name, t in inspect.getmembers(type(self),
406
lambda obj: isinstance(obj, property)):
407
if not name.startswith("_"):
408
self.client_structure.append(name)
339
409
410
# Send notice to process children that client state has changed
340
411
def send_changedstate(self):
341
self.changedstate.acquire()
342
self.changedstate.notify_all()
343
self.changedstate.release()
344
412
with self.changedstate:
413
self.changedstate.notify_all()
414
345
415
def enable(self):
346
416
"""Start this client's checker and timeout hooks"""
347
if getattr(self, u"enabled", False):
417
if getattr(self, "enabled", False):
348
418
# Already enabled
349
419
return
350
420
self.send_changedstate()
421
self.expires = datetime.datetime.utcnow() + self.timeout
422
self.enabled = True
351
423
self.last_enabled = datetime.datetime.utcnow()
352
# Schedule a new checker to be started an 'interval' from now,
353
# and every interval from then on.
354
self.checker_initiator_tag = (gobject.timeout_add
355
(self.interval_milliseconds(),
356
self.start_checker))
357
# Schedule a disable() when 'timeout' has passed
358
self.disable_initiator_tag = (gobject.timeout_add
359
(self.timeout_milliseconds(),
360
self.disable))
361
self.enabled = True
362
# Also start a new checker *right now*.
363
self.start_checker()
424
self.init_checker()
364
425
365
426
def disable(self, quiet=True):
366
427
"""Disable this client."""
369
430
if not quiet:
370
431
self.send_changedstate()
371
432
if not quiet:
372
logger.info(u"Disabling client %s", self.name)
373
if getattr(self, u"disable_initiator_tag", False):
433
logger.info("Disabling client %s", self.name)
434
if getattr(self, "disable_initiator_tag", False):
374
435
gobject.source_remove(self.disable_initiator_tag)
375
436
self.disable_initiator_tag = None
376
if getattr(self, u"checker_initiator_tag", False):
437
self.expires = None
438
if getattr(self, "checker_initiator_tag", False):
377
439
gobject.source_remove(self.checker_initiator_tag)
378
440
self.checker_initiator_tag = None
379
441
self.stop_checker()
380
if self.disable_hook:
381
self.disable_hook(self)
382
442
self.enabled = False
383
443
# Do not run this again if called by a gobject.timeout_add
384
444
return False
385
445
386
446
def __del__(self):
387
self.disable_hook = None
388
447
self.disable()
389
448
449
def init_checker(self):
450
# Schedule a new checker to be started an 'interval' from now,
451
# and every interval from then on.
452
self.checker_initiator_tag = (gobject.timeout_add
453
(self.interval_milliseconds(),
454
self.start_checker))
455
# Schedule a disable() when 'timeout' has passed
456
self.disable_initiator_tag = (gobject.timeout_add
457
(self.timeout_milliseconds(),
458
self.disable))
459
# Also start a new checker *right now*.
460
self.start_checker()
461
462
390
463
def checker_callback(self, pid, condition, command):
391
464
"""The checker has completed, so take appropriate actions."""
392
465
self.checker_callback_tag = None
393
466
self.checker = None
394
467
if os.WIFEXITED(condition):
395
exitstatus = os.WEXITSTATUS(condition)
396
if exitstatus == 0:
397
logger.info(u"Checker for %(name)s succeeded",
468
self.last_checker_status = os.WEXITSTATUS(condition)
469
if self.last_checker_status == 0:
470
logger.info("Checker for %(name)s succeeded",
398
471
vars(self))
399
472
self.checked_ok()
400
473
else:
401
logger.info(u"Checker for %(name)s failed",
474
logger.info("Checker for %(name)s failed",
402
475
vars(self))
403
476
else:
404
logger.warning(u"Checker for %(name)s crashed?",
477
self.last_checker_status = -1
478
logger.warning("Checker for %(name)s crashed?",
405
479
vars(self))
406
480
407
def checked_ok(self):
481
def checked_ok(self, timeout=None):
408
482
"""Bump up the timeout for this client.
409
483
410
484
This should only be called when the client has been seen,
411
485
alive and well.
412
486
"""
487
if timeout is None:
488
timeout = self.timeout
413
489
self.last_checked_ok = datetime.datetime.utcnow()
414
gobject.source_remove(self.disable_initiator_tag)
415
self.disable_initiator_tag = (gobject.timeout_add
416
(self.timeout_milliseconds(),
417
self.disable))
490
if self.disable_initiator_tag is not None:
491
gobject.source_remove(self.disable_initiator_tag)
492
if getattr(self, "enabled", False):
493
self.disable_initiator_tag = (gobject.timeout_add
494
(_timedelta_to_milliseconds
495
(timeout), self.disable))
496
self.expires = datetime.datetime.utcnow() + timeout
497
498
def need_approval(self):
499
self.last_approval_request = datetime.datetime.utcnow()
418
500
419
501
def start_checker(self):
420
502
"""Start a new checker subprocess if one is not running.
433
515
# If a checker exists, make sure it is not a zombie
434
516
try:
435
517
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
436
except (AttributeError, OSError), error:
518
except (AttributeError, OSError) as error:
437
519
if (isinstance(error, OSError)
438
520
and error.errno != errno.ECHILD):
439
521
raise error
440
522
else:
441
523
if pid:
442
logger.warning(u"Checker was a zombie")
524
logger.warning("Checker was a zombie")
443
525
gobject.source_remove(self.checker_callback_tag)
444
526
self.checker_callback(pid, status,
445
527
self.current_checker_command)
450
532
command = self.checker_command % self.host
451
533
except TypeError:
452
534
# Escape attributes for the shell
453
escaped_attrs = dict((key,
454
re.escape(unicode(str(val),
455
errors=
456
u'replace')))
457
for key, val in
458
vars(self).iteritems())
535
escaped_attrs = dict(
536
(attr,
537
re.escape(unicode(str(getattr(self, attr, "")),
538
errors=
539
'replace')))
540
for attr in
541
self.runtime_expansions)
542
459
543
try:
460
544
command = self.checker_command % escaped_attrs
461
except TypeError, error:
462
logger.error(u'Could not format string "%s":'
463
u' %s', self.checker_command, error)
545
except TypeError as error:
546
logger.error('Could not format string "%s":'
547
' %s', self.checker_command, error)
464
548
return True # Try again later
465
549
self.current_checker_command = command
466
550
try:
467
logger.info(u"Starting checker %r for %s",
551
logger.info("Starting checker %r for %s",
468
552
command, self.name)
469
553
# We don't need to redirect stdout and stderr, since
470
554
# in normal mode, that is already done by daemon(),
472
556
# always replaced by /dev/null.)
473
557
self.checker = subprocess.Popen(command,
474
558
close_fds=True,
475
shell=True, cwd=u"/")
559
shell=True, cwd="/")
476
560
self.checker_callback_tag = (gobject.child_watch_add
477
561
(self.checker.pid,
478
562
self.checker_callback,
483
567
if pid:
484
568
gobject.source_remove(self.checker_callback_tag)
485
569
self.checker_callback(pid, status, command)
486
except OSError, error:
487
logger.error(u"Failed to start subprocess: %s",
570
except OSError as error:
571
logger.error("Failed to start subprocess: %s",
488
572
error)
489
573
# Re-run this periodically if run by gobject.timeout_add
490
574
return True
494
578
if self.checker_callback_tag:
495
579
gobject.source_remove(self.checker_callback_tag)
496
580
self.checker_callback_tag = None
497
if getattr(self, u"checker", None) is None:
581
if getattr(self, "checker", None) is None:
498
582
return
499
logger.debug(u"Stopping checker for %(name)s", vars(self))
583
logger.debug("Stopping checker for %(name)s", vars(self))
500
584
try:
501
585
os.kill(self.checker.pid, signal.SIGTERM)
502
586
#time.sleep(0.5)
503
587
#if self.checker.poll() is None:
504
588
# os.kill(self.checker.pid, signal.SIGKILL)
505
except OSError, error:
589
except OSError as error:
506
590
if error.errno != errno.ESRCH: # No such process
507
591
raise
508
592
self.checker = None
509
593
510
def dbus_service_property(dbus_interface, signature=u"v",
511
access=u"readwrite", byte_arrays=False):
594
# Encrypts a client secret and stores it in a varible encrypted_secret
595
def encrypt_secret(self, key):
596
# Encryption-key need to be of a specific size, so we hash inputed key
597
hasheng = hashlib.sha256()
598
hasheng.update(key)
599
encryptionkey = hasheng.digest()
600
601
# Create validation hash so we know at decryption if it was sucessful
602
hasheng = hashlib.sha256()
603
hasheng.update(self.secret)
604
validationhash = hasheng.digest()
605
606
# Encrypt secret
607
iv = os.urandom(Crypto.Cipher.AES.block_size)
608
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
609
Crypto.Cipher.AES.MODE_CFB, iv)
610
ciphertext = ciphereng.encrypt(validationhash+self.secret)
611
self.encrypted_secret = (ciphertext, iv)
612
613
# Decrypt a encrypted client secret
614
def decrypt_secret(self, key):
615
# Decryption-key need to be of a specific size, so we hash inputed key
616
hasheng = hashlib.sha256()
617
hasheng.update(key)
618
encryptionkey = hasheng.digest()
619
620
# Decrypt encrypted secret
621
ciphertext, iv = self.encrypted_secret
622
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
623
Crypto.Cipher.AES.MODE_CFB, iv)
624
plain = ciphereng.decrypt(ciphertext)
625
626
# Validate decrypted secret to know if it was succesful
627
hasheng = hashlib.sha256()
628
validationhash = plain[:hasheng.digest_size]
629
secret = plain[hasheng.digest_size:]
630
hasheng.update(secret)
631
632
# if validation fails, we use key as new secret. Otherwhise, we use
633
# the decrypted secret
634
if hasheng.digest() == validationhash:
635
self.secret = secret
636
else:
637
self.secret = key
638
del self.encrypted_secret
639
640
641
def dbus_service_property(dbus_interface, signature="v",
642
access="readwrite", byte_arrays=False):
512
643
"""Decorators for marking methods of a DBusObjectWithProperties to
513
644
become properties on the D-Bus.
514
645
521
652
"""
522
653
# Encoding deeply encoded byte arrays is not supported yet by the
523
654
# "Set" method, so we fail early here:
524
if byte_arrays and signature != u"ay":
525
raise ValueError(u"Byte arrays not supported for non-'ay'"
526
u" signature %r" % signature)
655
if byte_arrays and signature != "ay":
656
raise ValueError("Byte arrays not supported for non-'ay'"
657
" signature %r" % signature)
527
658
def decorator(func):
528
659
func._dbus_is_property = True
529
660
func._dbus_interface = dbus_interface
530
661
func._dbus_signature = signature
531
662
func._dbus_access = access
532
663
func._dbus_name = func.__name__
533
if func._dbus_name.endswith(u"_dbus_property"):
664
if func._dbus_name.endswith("_dbus_property"):
534
665
func._dbus_name = func._dbus_name[:-14]
535
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
666
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
536
667
return func
537
668
return decorator
538
669
558
689
559
690
class DBusObjectWithProperties(dbus.service.Object):
560
691
"""A D-Bus object with properties.
561
692
562
693
Classes inheriting from this can use the dbus_service_property
563
694
decorator to expose methods as D-Bus properties. It exposes the
564
695
standard Get(), Set(), and GetAll() methods on the D-Bus.
566
697
567
698
@staticmethod
568
699
def _is_dbus_property(obj):
569
return getattr(obj, u"_dbus_is_property", False)
700
return getattr(obj, "_dbus_is_property", False)
570
701
571
702
def _get_all_dbus_properties(self):
572
703
"""Returns a generator of (name, attribute) pairs
573
704
"""
574
return ((prop._dbus_name, prop)
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
706
for cls in self.__class__.__mro__
575
707
for name, prop in
576
inspect.getmembers(self, self._is_dbus_property))
708
inspect.getmembers(cls, self._is_dbus_property))
577
709
578
710
def _get_dbus_property(self, interface_name, property_name):
579
711
"""Returns a bound method if one exists which is a D-Bus
580
712
property with the specified name and interface.
581
713
"""
582
for name in (property_name,
583
property_name + u"_dbus_property"):
584
prop = getattr(self, name, None)
585
if (prop is None
586
or not self._is_dbus_property(prop)
587
or prop._dbus_name != property_name
588
or (interface_name and prop._dbus_interface
589
and interface_name != prop._dbus_interface)):
590
continue
591
return prop
714
for cls in self.__class__.__mro__:
715
for name, value in (inspect.getmembers
716
(cls, self._is_dbus_property)):
717
if (value._dbus_name == property_name
718
and value._dbus_interface == interface_name):
719
return value.__get__(self)
720
592
721
# No such property
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
722
raise DBusPropertyNotFound(self.dbus_object_path + ":"
723
+ interface_name + "."
595
724
+ property_name)
596
725
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
598
out_signature=u"v")
726
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
727
out_signature="v")
599
728
def Get(self, interface_name, property_name):
600
729
"""Standard D-Bus property Get() method, see D-Bus standard.
601
730
"""
602
731
prop = self._get_dbus_property(interface_name, property_name)
603
if prop._dbus_access == u"write":
732
if prop._dbus_access == "write":
604
733
raise DBusPropertyAccessException(property_name)
605
734
value = prop()
606
if not hasattr(value, u"variant_level"):
735
if not hasattr(value, "variant_level"):
607
736
return value
608
737
return type(value)(value, variant_level=value.variant_level+1)
609
738
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
739
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
611
740
def Set(self, interface_name, property_name, value):
612
741
"""Standard D-Bus property Set() method, see D-Bus standard.
613
742
"""
614
743
prop = self._get_dbus_property(interface_name, property_name)
615
if prop._dbus_access == u"read":
744
if prop._dbus_access == "read":
616
745
raise DBusPropertyAccessException(property_name)
617
if prop._dbus_get_args_options[u"byte_arrays"]:
746
if prop._dbus_get_args_options["byte_arrays"]:
618
747
# The byte_arrays option is not supported yet on
619
748
# signatures other than "ay".
620
if prop._dbus_signature != u"ay":
749
if prop._dbus_signature != "ay":
621
750
raise ValueError
622
751
value = dbus.ByteArray(''.join(unichr(byte)
623
752
for byte in value))
624
753
prop(value)
625
754
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
756
out_signature="a{sv}")
628
757
def GetAll(self, interface_name):
629
758
"""Standard D-Bus property GetAll() method, see D-Bus
630
759
standard.
631
760
632
761
Note: Will not include properties with access="write".
633
762
"""
634
763
all = {}
638
767
# Interface non-empty but did not match
639
768
continue
640
769
# Ignore write-only properties
641
if prop._dbus_access == u"write":
770
if prop._dbus_access == "write":
642
771
continue
643
772
value = prop()
644
if not hasattr(value, u"variant_level"):
773
if not hasattr(value, "variant_level"):
645
774
all[name] = value
646
775
continue
647
776
all[name] = type(value)(value, variant_level=
648
777
value.variant_level+1)
649
return dbus.Dictionary(all, signature=u"sv")
778
return dbus.Dictionary(all, signature="sv")
650
779
651
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
652
out_signature=u"s",
781
out_signature="s",
653
782
path_keyword='object_path',
654
783
connection_keyword='connection')
655
784
def Introspect(self, object_path, connection):
660
789
try:
661
790
document = xml.dom.minidom.parseString(xmlstring)
662
791
def make_tag(document, name, prop):
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
792
e = document.createElement("property")
793
e.setAttribute("name", name)
794
e.setAttribute("type", prop._dbus_signature)
795
e.setAttribute("access", prop._dbus_access)
667
796
return e
668
for if_tag in document.getElementsByTagName(u"interface"):
797
for if_tag in document.getElementsByTagName("interface"):
669
798
for tag in (make_tag(document, name, prop)
670
799
for name, prop
671
800
in self._get_all_dbus_properties()
672
801
if prop._dbus_interface
673
== if_tag.getAttribute(u"name")):
802
== if_tag.getAttribute("name")):
674
803
if_tag.appendChild(tag)
675
804
# Add the names to the return values for the
676
805
# "org.freedesktop.DBus.Properties" methods
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
683
== u"out"):
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
688
== u"out"):
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
806
if (if_tag.getAttribute("name")
807
== "org.freedesktop.DBus.Properties"):
808
for cn in if_tag.getElementsByTagName("method"):
809
if cn.getAttribute("name") == "Get":
810
for arg in cn.getElementsByTagName("arg"):
811
if (arg.getAttribute("direction")
812
== "out"):
813
arg.setAttribute("name", "value")
814
elif cn.getAttribute("name") == "GetAll":
815
for arg in cn.getElementsByTagName("arg"):
816
if (arg.getAttribute("direction")
817
== "out"):
818
arg.setAttribute("name", "props")
819
xmlstring = document.toxml("utf-8")
691
820
document.unlink()
692
821
except (AttributeError, xml.dom.DOMException,
693
xml.parsers.expat.ExpatError), error:
694
logger.error(u"Failed to override Introspection method",
822
xml.parsers.expat.ExpatError) as error:
823
logger.error("Failed to override Introspection method",
695
824
error)
696
825
return xmlstring
697
826
698
827
828
def datetime_to_dbus (dt, variant_level=0):
829
"""Convert a UTC datetime.datetime() to a D-Bus type."""
830
if dt is None:
831
return dbus.String("", variant_level = variant_level)
832
return dbus.String(dt.isoformat(),
833
variant_level=variant_level)
834
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
836
.__metaclass__):
837
"""Applied to an empty subclass of a D-Bus object, this metaclass
838
will add additional D-Bus attributes matching a certain pattern.
839
"""
840
def __new__(mcs, name, bases, attr):
841
# Go through all the base classes which could have D-Bus
842
# methods, signals, or properties in them
843
for base in (b for b in bases
844
if issubclass(b, dbus.service.Object)):
845
# Go though all attributes of the base class
846
for attrname, attribute in inspect.getmembers(base):
847
# Ignore non-D-Bus attributes, and D-Bus attributes
848
# with the wrong interface name
849
if (not hasattr(attribute, "_dbus_interface")
850
or not attribute._dbus_interface
851
.startswith("se.recompile.Mandos")):
852
continue
853
# Create an alternate D-Bus interface name based on
854
# the current name
855
alt_interface = (attribute._dbus_interface
856
.replace("se.recompile.Mandos",
857
"se.bsnet.fukt.Mandos"))
858
# Is this a D-Bus signal?
859
if getattr(attribute, "_dbus_is_signal", False):
860
# Extract the original non-method function by
861
# black magic
862
nonmethod_func = (dict(
863
zip(attribute.func_code.co_freevars,
864
attribute.__closure__))["func"]
865
.cell_contents)
866
# Create a new, but exactly alike, function
867
# object, and decorate it to be a new D-Bus signal
868
# with the alternate D-Bus interface name
869
new_function = (dbus.service.signal
870
(alt_interface,
871
attribute._dbus_signature)
872
(types.FunctionType(
873
nonmethod_func.func_code,
874
nonmethod_func.func_globals,
875
nonmethod_func.func_name,
876
nonmethod_func.func_defaults,
877
nonmethod_func.func_closure)))
878
# Define a creator of a function to call both the
879
# old and new functions, so both the old and new
880
# signals gets sent when the function is called
881
def fixscope(func1, func2):
882
"""This function is a scope container to pass
883
func1 and func2 to the "call_both" function
884
outside of its arguments"""
885
def call_both(*args, **kwargs):
886
"""This function will emit two D-Bus
887
signals by calling func1 and func2"""
888
func1(*args, **kwargs)
889
func2(*args, **kwargs)
890
return call_both
891
# Create the "call_both" function and add it to
892
# the class
893
attr[attrname] = fixscope(attribute,
894
new_function)
895
# Is this a D-Bus method?
896
elif getattr(attribute, "_dbus_is_method", False):
897
# Create a new, but exactly alike, function
898
# object. Decorate it to be a new D-Bus method
899
# with the alternate D-Bus interface name. Add it
900
# to the class.
901
attr[attrname] = (dbus.service.method
902
(alt_interface,
903
attribute._dbus_in_signature,
904
attribute._dbus_out_signature)
905
(types.FunctionType
906
(attribute.func_code,
907
attribute.func_globals,
908
attribute.func_name,
909
attribute.func_defaults,
910
attribute.func_closure)))
911
# Is this a D-Bus property?
912
elif getattr(attribute, "_dbus_is_property", False):
913
# Create a new, but exactly alike, function
914
# object, and decorate it to be a new D-Bus
915
# property with the alternate D-Bus interface
916
# name. Add it to the class.
917
attr[attrname] = (dbus_service_property
918
(alt_interface,
919
attribute._dbus_signature,
920
attribute._dbus_access,
921
attribute
922
._dbus_get_args_options
923
["byte_arrays"])
924
(types.FunctionType
925
(attribute.func_code,
926
attribute.func_globals,
927
attribute.func_name,
928
attribute.func_defaults,
929
attribute.func_closure)))
930
return type.__new__(mcs, name, bases, attr)
931
699
932
class ClientDBus(Client, DBusObjectWithProperties):
700
933
"""A Client class using D-Bus
701
934
703
936
dbus_object_path: dbus.ObjectPath
704
937
bus: dbus.SystemBus()
705
938
"""
939
940
runtime_expansions = (Client.runtime_expansions
941
+ ("dbus_object_path",))
942
706
943
# dbus.service.Object doesn't use super(), so we can't either.
707
944
708
945
def __init__(self, bus = None, *args, **kwargs):
946
self.bus = bus
947
Client.__init__(self, *args, **kwargs)
948
709
949
self._approvals_pending = 0
710
self.bus = bus
711
Client.__init__(self, *args, **kwargs)
712
950
# Only now, when this client is initialized, can it show up on
713
951
# the D-Bus
952
client_object_name = unicode(self.name).translate(
953
{ord("."): ord("_"),
954
ord("-"): ord("_")})
714
955
self.dbus_object_path = (dbus.ObjectPath
715
(u"/clients/"
716
+ self.name.replace(u".", u"_")))
956
("/clients/" + client_object_name))
717
957
DBusObjectWithProperties.__init__(self, self.bus,
718
958
self.dbus_object_path)
719
959
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
725
bval = bool(value)
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"ApprovalPending"),
730
dbus_bool)
960
def notifychangeproperty(transform_func,
961
dbus_name, type_func=lambda x: x,
962
variant_level=1):
963
""" Modify a variable so that it's a property which announces
964
its changes to DBus.
731
965
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
735
736
@staticmethod
737
def _datetime_to_dbus(dt, variant_level=0):
738
"""Convert a UTC datetime.datetime() to a D-Bus type."""
739
return dbus.String(dt.isoformat(),
740
variant_level=variant_level)
741
742
def enable(self):
743
oldstate = getattr(self, u"enabled", False)
744
r = Client.enable(self)
745
if oldstate != self.enabled:
746
# Emit D-Bus signals
747
self.PropertyChanged(dbus.String(u"Enabled"),
748
dbus.Boolean(True, variant_level=1))
749
self.PropertyChanged(
750
dbus.String(u"LastEnabled"),
751
self._datetime_to_dbus(self.last_enabled,
752
variant_level=1))
753
return r
754
755
def disable(self, quiet = False):
756
oldstate = getattr(self, u"enabled", False)
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
759
# Emit D-Bus signal
760
self.PropertyChanged(dbus.String(u"Enabled"),
761
dbus.Boolean(False, variant_level=1))
762
return r
966
transform_fun: Function that takes a value and a variant_level
967
and transforms it to a D-Bus type.
968
dbus_name: D-Bus name of the variable
969
type_func: Function that transform the value before sending it
970
to the D-Bus. Default: no transform
971
variant_level: D-Bus variant level. Default: 1
972
"""
973
attrname = "_{0}".format(dbus_name)
974
def setter(self, value):
975
if hasattr(self, "dbus_object_path"):
976
if (not hasattr(self, attrname) or
977
type_func(getattr(self, attrname, None))
978
!= type_func(value)):
979
dbus_value = transform_func(type_func(value),
980
variant_level
981
=variant_level)
982
self.PropertyChanged(dbus.String(dbus_name),
983
dbus_value)
984
setattr(self, attrname, value)
985
986
return property(lambda self: getattr(self, attrname), setter)
987
988
989
expires = notifychangeproperty(datetime_to_dbus, "Expires")
990
approvals_pending = notifychangeproperty(dbus.Boolean,
991
"ApprovalPending",
992
type_func = bool)
993
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
994
last_enabled = notifychangeproperty(datetime_to_dbus,
995
"LastEnabled")
996
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
997
type_func = lambda checker:
998
checker is not None)
999
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1000
"LastCheckedOK")
1001
last_approval_request = notifychangeproperty(
1002
datetime_to_dbus, "LastApprovalRequest")
1003
approved_by_default = notifychangeproperty(dbus.Boolean,
1004
"ApprovedByDefault")
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1006
"ApprovalDelay",
1007
type_func =
1008
_timedelta_to_milliseconds)
1009
approval_duration = notifychangeproperty(
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
1012
host = notifychangeproperty(dbus.String, "Host")
1013
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1014
type_func =
1015
_timedelta_to_milliseconds)
1016
extended_timeout = notifychangeproperty(
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1020
"Interval",
1021
type_func =
1022
_timedelta_to_milliseconds)
1023
checker_command = notifychangeproperty(dbus.String, "Checker")
1024
1025
del notifychangeproperty
763
1026
764
1027
def __del__(self, *args, **kwargs):
765
1028
try:
766
1029
self.remove_from_connection()
767
1030
except LookupError:
768
1031
pass
769
if hasattr(DBusObjectWithProperties, u"__del__"):
1032
if hasattr(DBusObjectWithProperties, "__del__"):
770
1033
DBusObjectWithProperties.__del__(self, *args, **kwargs)
771
1034
Client.__del__(self, *args, **kwargs)
772
1035
774
1037
*args, **kwargs):
775
1038
self.checker_callback_tag = None
776
1039
self.checker = None
777
# Emit D-Bus signal
778
self.PropertyChanged(dbus.String(u"CheckerRunning"),
779
dbus.Boolean(False, variant_level=1))
780
1040
if os.WIFEXITED(condition):
781
1041
exitstatus = os.WEXITSTATUS(condition)
782
1042
# Emit D-Bus signal
792
1052
return Client.checker_callback(self, pid, condition, command,
793
1053
*args, **kwargs)
794
1054
795
def checked_ok(self, *args, **kwargs):
796
r = Client.checked_ok(self, *args, **kwargs)
797
# Emit D-Bus signal
798
self.PropertyChanged(
799
dbus.String(u"LastCheckedOK"),
800
(self._datetime_to_dbus(self.last_checked_ok,
801
variant_level=1)))
802
return r
803
804
1055
def start_checker(self, *args, **kwargs):
805
1056
old_checker = self.checker
806
1057
if self.checker is not None:
813
1064
and old_checker_pid != self.checker.pid):
814
1065
# Emit D-Bus signal
815
1066
self.CheckerStarted(self.current_checker_command)
816
self.PropertyChanged(
817
dbus.String(u"CheckerRunning"),
818
dbus.Boolean(True, variant_level=1))
819
1067
return r
820
1068
821
def stop_checker(self, *args, **kwargs):
822
old_checker = getattr(self, u"checker", None)
823
r = Client.stop_checker(self, *args, **kwargs)
824
if (old_checker is not None
825
and getattr(self, u"checker", None) is None):
826
self.PropertyChanged(dbus.String(u"CheckerRunning"),
827
dbus.Boolean(False, variant_level=1))
828
return r
829
830
1069
def _reset_approved(self):
831
1070
self._approved = None
832
1071
return False
834
1073
def approve(self, value=True):
835
1074
self.send_changedstate()
836
1075
self._approved = value
837
gobject.timeout_add(self._timedelta_to_milliseconds
1076
gobject.timeout_add(_timedelta_to_milliseconds
838
1077
(self.approval_duration),
839
1078
self._reset_approved)
840
1079
841
1080
842
1081
## D-Bus methods, signals & properties
843
_interface = u"se.bsnet.fukt.Mandos.Client"
1082
_interface = "se.recompile.Mandos.Client"
844
1083
845
1084
## Signals
846
1085
847
1086
# CheckerCompleted - signal
848
@dbus.service.signal(_interface, signature=u"nxs")
1087
@dbus.service.signal(_interface, signature="nxs")
849
1088
def CheckerCompleted(self, exitcode, waitstatus, command):
850
1089
"D-Bus signal"
851
1090
pass
852
1091
853
1092
# CheckerStarted - signal
854
@dbus.service.signal(_interface, signature=u"s")
1093
@dbus.service.signal(_interface, signature="s")
855
1094
def CheckerStarted(self, command):
856
1095
"D-Bus signal"
857
1096
pass
858
1097
859
1098
# PropertyChanged - signal
860
@dbus.service.signal(_interface, signature=u"sv")
1099
@dbus.service.signal(_interface, signature="sv")
861
1100
def PropertyChanged(self, property, value):
862
1101
"D-Bus signal"
863
1102
pass
872
1111
pass
873
1112
874
1113
# Rejected - signal
875
@dbus.service.signal(_interface, signature=u"s")
1114
@dbus.service.signal(_interface, signature="s")
876
1115
def Rejected(self, reason):
877
1116
"D-Bus signal"
878
1117
pass
879
1118
880
1119
# NeedApproval - signal
881
@dbus.service.signal(_interface, signature=u"tb")
1120
@dbus.service.signal(_interface, signature="tb")
882
1121
def NeedApproval(self, timeout, default):
883
1122
"D-Bus signal"
884
pass
1123
return self.need_approval()
885
1124
886
1125
## Methods
887
1126
888
1127
# Approve - method
889
@dbus.service.method(_interface, in_signature=u"b")
1128
@dbus.service.method(_interface, in_signature="b")
890
1129
def Approve(self, value):
891
1130
self.approve(value)
892
1131
893
1132
# CheckedOK - method
894
1133
@dbus.service.method(_interface)
895
1134
def CheckedOK(self):
896
return self.checked_ok()
1135
self.checked_ok()
897
1136
898
1137
# Enable - method
899
1138
@dbus.service.method(_interface)
921
1160
## Properties
922
1161
923
1162
# ApprovalPending - property
924
@dbus_service_property(_interface, signature=u"b", access=u"read")
1163
@dbus_service_property(_interface, signature="b", access="read")
925
1164
def ApprovalPending_dbus_property(self):
926
1165
return dbus.Boolean(bool(self.approvals_pending))
927
1166
928
1167
# ApprovedByDefault - property
929
@dbus_service_property(_interface, signature=u"b",
930
access=u"readwrite")
1168
@dbus_service_property(_interface, signature="b",
1169
access="readwrite")
931
1170
def ApprovedByDefault_dbus_property(self, value=None):
932
1171
if value is None: # get
933
1172
return dbus.Boolean(self.approved_by_default)
934
1173
self.approved_by_default = bool(value)
935
# Emit D-Bus signal
936
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
937
dbus.Boolean(value, variant_level=1))
938
1174
939
1175
# ApprovalDelay - property
940
@dbus_service_property(_interface, signature=u"t",
941
access=u"readwrite")
1176
@dbus_service_property(_interface, signature="t",
1177
access="readwrite")
942
1178
def ApprovalDelay_dbus_property(self, value=None):
943
1179
if value is None: # get
944
1180
return dbus.UInt64(self.approval_delay_milliseconds())
945
1181
self.approval_delay = datetime.timedelta(0, 0, 0, value)
946
# Emit D-Bus signal
947
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
948
dbus.UInt64(value, variant_level=1))
949
1182
950
1183
# ApprovalDuration - property
951
@dbus_service_property(_interface, signature=u"t",
952
access=u"readwrite")
1184
@dbus_service_property(_interface, signature="t",
1185
access="readwrite")
953
1186
def ApprovalDuration_dbus_property(self, value=None):
954
1187
if value is None: # get
955
return dbus.UInt64(self._timedelta_to_milliseconds(
1188
return dbus.UInt64(_timedelta_to_milliseconds(
956
1189
self.approval_duration))
957
1190
self.approval_duration = datetime.timedelta(0, 0, 0, value)
958
# Emit D-Bus signal
959
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
960
dbus.UInt64(value, variant_level=1))
961
1191
962
1192
# Name - property
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
1193
@dbus_service_property(_interface, signature="s", access="read")
964
1194
def Name_dbus_property(self):
965
1195
return dbus.String(self.name)
966
1196
967
1197
# Fingerprint - property
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
1198
@dbus_service_property(_interface, signature="s", access="read")
969
1199
def Fingerprint_dbus_property(self):
970
1200
return dbus.String(self.fingerprint)
971
1201
972
1202
# Host - property
973
@dbus_service_property(_interface, signature=u"s",
974
access=u"readwrite")
1203
@dbus_service_property(_interface, signature="s",
1204
access="readwrite")
975
1205
def Host_dbus_property(self, value=None):
976
1206
if value is None: # get
977
1207
return dbus.String(self.host)
978
1208
self.host = value
979
# Emit D-Bus signal
980
self.PropertyChanged(dbus.String(u"Host"),
981
dbus.String(value, variant_level=1))
982
1209
983
1210
# Created - property
984
@dbus_service_property(_interface, signature=u"s", access=u"read")
1211
@dbus_service_property(_interface, signature="s", access="read")
985
1212
def Created_dbus_property(self):
986
return dbus.String(self._datetime_to_dbus(self.created))
1213
return dbus.String(datetime_to_dbus(self.created))
987
1214
988
1215
# LastEnabled - property
989
@dbus_service_property(_interface, signature=u"s", access=u"read")
1216
@dbus_service_property(_interface, signature="s", access="read")
990
1217
def LastEnabled_dbus_property(self):
991
if self.last_enabled is None:
992
return dbus.String(u"")
993
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1218
return datetime_to_dbus(self.last_enabled)
994
1219
995
1220
# Enabled - property
996
@dbus_service_property(_interface, signature=u"b",
997
access=u"readwrite")
1221
@dbus_service_property(_interface, signature="b",
1222
access="readwrite")
998
1223
def Enabled_dbus_property(self, value=None):
999
1224
if value is None: # get
1000
1225
return dbus.Boolean(self.enabled)
1004
1229
self.disable()
1005
1230
1006
1231
# LastCheckedOK - property
1007
@dbus_service_property(_interface, signature=u"s",
1008
access=u"readwrite")
1232
@dbus_service_property(_interface, signature="s",
1233
access="readwrite")
1009
1234
def LastCheckedOK_dbus_property(self, value=None):
1010
1235
if value is not None:
1011
1236
self.checked_ok()
1012
1237
return
1013
if self.last_checked_ok is None:
1014
return dbus.String(u"")
1015
return dbus.String(self._datetime_to_dbus(self
1016
.last_checked_ok))
1238
return datetime_to_dbus(self.last_checked_ok)
1239
1240
# Expires - property
1241
@dbus_service_property(_interface, signature="s", access="read")
1242
def Expires_dbus_property(self):
1243
return datetime_to_dbus(self.expires)
1244
1245
# LastApprovalRequest - property
1246
@dbus_service_property(_interface, signature="s", access="read")
1247
def LastApprovalRequest_dbus_property(self):
1248
return datetime_to_dbus(self.last_approval_request)
1017
1249
1018
1250
# Timeout - property
1019
@dbus_service_property(_interface, signature=u"t",
1020
access=u"readwrite")
1251
@dbus_service_property(_interface, signature="t",
1252
access="readwrite")
1021
1253
def Timeout_dbus_property(self, value=None):
1022
1254
if value is None: # get
1023
1255
return dbus.UInt64(self.timeout_milliseconds())
1024
1256
self.timeout = datetime.timedelta(0, 0, 0, value)
1025
# Emit D-Bus signal
1026
self.PropertyChanged(dbus.String(u"Timeout"),
1027
dbus.UInt64(value, variant_level=1))
1028
if getattr(self, u"disable_initiator_tag", None) is None:
1257
if getattr(self, "disable_initiator_tag", None) is None:
1029
1258
return
1030
1259
# Reschedule timeout
1031
1260
gobject.source_remove(self.disable_initiator_tag)
1032
1261
self.disable_initiator_tag = None
1033
time_to_die = (self.
1034
_timedelta_to_milliseconds((self
1035
.last_checked_ok
1036
+ self.timeout)
1037
- datetime.datetime
1038
.utcnow()))
1262
self.expires = None
1263
time_to_die = _timedelta_to_milliseconds((self
1264
.last_checked_ok
1265
+ self.timeout)
1266
- datetime.datetime
1267
.utcnow())
1039
1268
if time_to_die <= 0:
1040
1269
# The timeout has passed
1041
1270
self.disable()
1042
1271
else:
1272
self.expires = (datetime.datetime.utcnow()
1273
+ datetime.timedelta(milliseconds =
1274
time_to_die))
1043
1275
self.disable_initiator_tag = (gobject.timeout_add
1044
1276
(time_to_die, self.disable))
1045
1277
1278
# ExtendedTimeout - property
1279
@dbus_service_property(_interface, signature="t",
1280
access="readwrite")
1281
def ExtendedTimeout_dbus_property(self, value=None):
1282
if value is None: # get
1283
return dbus.UInt64(self.extended_timeout_milliseconds())
1284
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1285
1046
1286
# Interval - property
1047
@dbus_service_property(_interface, signature=u"t",
1048
access=u"readwrite")
1287
@dbus_service_property(_interface, signature="t",
1288
access="readwrite")
1049
1289
def Interval_dbus_property(self, value=None):
1050
1290
if value is None: # get
1051
1291
return dbus.UInt64(self.interval_milliseconds())
1052
1292
self.interval = datetime.timedelta(0, 0, 0, value)
1053
# Emit D-Bus signal
1054
self.PropertyChanged(dbus.String(u"Interval"),
1055
dbus.UInt64(value, variant_level=1))
1056
if getattr(self, u"checker_initiator_tag", None) is None:
1293
if getattr(self, "checker_initiator_tag", None) is None:
1057
1294
return
1058
1295
# Reschedule checker run
1059
1296
gobject.source_remove(self.checker_initiator_tag)
1060
1297
self.checker_initiator_tag = (gobject.timeout_add
1061
1298
(value, self.start_checker))
1062
1299
self.start_checker() # Start one now, too
1063
1300
1064
1301
# Checker - property
1065
@dbus_service_property(_interface, signature=u"s",
1066
access=u"readwrite")
1302
@dbus_service_property(_interface, signature="s",
1303
access="readwrite")
1067
1304
def Checker_dbus_property(self, value=None):
1068
1305
if value is None: # get
1069
1306
return dbus.String(self.checker_command)
1070
1307
self.checker_command = value
1071
# Emit D-Bus signal
1072
self.PropertyChanged(dbus.String(u"Checker"),
1073
dbus.String(self.checker_command,
1074
variant_level=1))
1075
1308
1076
1309
# CheckerRunning - property
1077
@dbus_service_property(_interface, signature=u"b",
1078
access=u"readwrite")
1310
@dbus_service_property(_interface, signature="b",
1311
access="readwrite")
1079
1312
def CheckerRunning_dbus_property(self, value=None):
1080
1313
if value is None: # get
1081
1314
return dbus.Boolean(self.checker is not None)
1085
1318
self.stop_checker()
1086
1319
1087
1320
# ObjectPath - property
1088
@dbus_service_property(_interface, signature=u"o", access=u"read")
1321
@dbus_service_property(_interface, signature="o", access="read")
1089
1322
def ObjectPath_dbus_property(self):
1090
1323
return self.dbus_object_path # is already a dbus.ObjectPath
1091
1324
1092
1325
# Secret = property
1093
@dbus_service_property(_interface, signature=u"ay",
1094
access=u"write", byte_arrays=True)
1326
@dbus_service_property(_interface, signature="ay",
1327
access="write", byte_arrays=True)
1095
1328
def Secret_dbus_property(self, value):
1096
1329
self.secret = str(value)
1097
1330
1104
1337
self._pipe.send(('init', fpr, address))
1105
1338
if not self._pipe.recv():
1106
1339
raise KeyError()
1107
1340
1108
1341
def __getattribute__(self, name):
1109
1342
if(name == '_pipe'):
1110
1343
return super(ProxyClient, self).__getattribute__(name)
1117
1350
self._pipe.send(('funcall', name, args, kwargs))
1118
1351
return self._pipe.recv()[1]
1119
1352
return func
1120
1353
1121
1354
def __setattr__(self, name, value):
1122
1355
if(name == '_pipe'):
1123
1356
return super(ProxyClient, self).__setattr__(name, value)
1124
1357
self._pipe.send(('setattr', name, value))
1125
1358
1359
class ClientDBusTransitional(ClientDBus):
1360
__metaclass__ = AlternateDBusNamesMetaclass
1126
1361
1127
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
1128
1363
"""A class to handle client connections.
1132
1367
1133
1368
def handle(self):
1134
1369
with contextlib.closing(self.server.child_pipe) as child_pipe:
1135
logger.info(u"TCP connection from: %s",
1370
logger.info("TCP connection from: %s",
1136
1371
unicode(self.client_address))
1137
logger.debug(u"Pipe FD: %d",
1372
logger.debug("Pipe FD: %d",
1138
1373
self.server.child_pipe.fileno())
1139
1374
1140
1375
session = (gnutls.connection
1141
1376
.ClientSession(self.request,
1142
1377
gnutls.connection
1143
1378
.X509Credentials()))
1144
1379
1145
1380
# Note: gnutls.connection.X509Credentials is really a
1146
1381
# generic GnuTLS certificate credentials object so long as
1147
1382
# no X.509 keys are added to it. Therefore, we can use it
1148
1383
# here despite using OpenPGP certificates.
1149
1150
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1151
# u"+AES-256-CBC", u"+SHA1",
1152
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1153
# u"+DHE-DSS"))
1384
1385
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1386
# "+AES-256-CBC", "+SHA1",
1387
# "+COMP-NULL", "+CTYPE-OPENPGP",
1388
# "+DHE-DSS"))
1154
1389
# Use a fallback default, since this MUST be set.
1155
1390
priority = self.server.gnutls_priority
1156
1391
if priority is None:
1157
priority = u"NORMAL"
1392
priority = "NORMAL"
1158
1393
(gnutls.library.functions
1159
1394
.gnutls_priority_set_direct(session._c_object,
1160
1395
priority, None))
1161
1396
1162
1397
# Start communication using the Mandos protocol
1163
1398
# Get protocol number
1164
1399
line = self.request.makefile().readline()
1165
logger.debug(u"Protocol version: %r", line)
1400
logger.debug("Protocol version: %r", line)
1166
1401
try:
1167
1402
if int(line.strip().split()[0]) > 1:
1168
1403
raise RuntimeError
1169
except (ValueError, IndexError, RuntimeError), error:
1170
logger.error(u"Unknown protocol version: %s", error)
1404
except (ValueError, IndexError, RuntimeError) as error:
1405
logger.error("Unknown protocol version: %s", error)
1171
1406
return
1172
1407
1173
1408
# Start GnuTLS connection
1174
1409
try:
1175
1410
session.handshake()
1176
except gnutls.errors.GNUTLSError, error:
1177
logger.warning(u"Handshake failed: %s", error)
1411
except gnutls.errors.GNUTLSError as error:
1412
logger.warning("Handshake failed: %s", error)
1178
1413
# Do not run session.bye() here: the session is not
1179
1414
# established. Just abandon the request.
1180
1415
return
1181
logger.debug(u"Handshake succeeded")
1182
1416
logger.debug("Handshake succeeded")
1417
1183
1418
approval_required = False
1184
1419
try:
1185
1420
try:
1186
1421
fpr = self.fingerprint(self.peer_certificate
1187
1422
(session))
1188
except (TypeError, gnutls.errors.GNUTLSError), error:
1189
logger.warning(u"Bad certificate: %s", error)
1423
except (TypeError,
1424
gnutls.errors.GNUTLSError) as error:
1425
logger.warning("Bad certificate: %s", error)
1190
1426
return
1191
logger.debug(u"Fingerprint: %s", fpr)
1192
1427
logger.debug("Fingerprint: %s", fpr)
1428
1193
1429
try:
1194
1430
client = ProxyClient(child_pipe, fpr,
1195
1431
self.client_address)
1203
1439
1204
1440
while True:
1205
1441
if not client.enabled:
1206
logger.warning(u"Client %s is disabled",
1442
logger.info("Client %s is disabled",
1207
1443
client.name)
1208
1444
if self.server.use_dbus:
1209
1445
# Emit D-Bus signal
1210
client.Rejected("Disabled")
1446
client.Rejected("Disabled")
1211
1447
return
1212
1448
1213
1449
if client._approved or not client.approval_delay:
1214
1450
#We are approved or approval is disabled
1215
1451
break
1216
1452
elif client._approved is None:
1217
logger.info(u"Client %s needs approval",
1453
logger.info("Client %s needs approval",
1218
1454
client.name)
1219
1455
if self.server.use_dbus:
1220
1456
# Emit D-Bus signal
1222
1458
client.approval_delay_milliseconds(),
1223
1459
client.approved_by_default)
1224
1460
else:
1225
logger.warning(u"Client %s was not approved",
1461
logger.warning("Client %s was not approved",
1226
1462
client.name)
1227
1463
if self.server.use_dbus:
1228
1464
# Emit D-Bus signal
1230
1466
return
1231
1467
1232
1468
#wait until timeout or approved
1233
#x = float(client._timedelta_to_milliseconds(delay))
1234
1469
time = datetime.datetime.now()
1235
1470
client.changedstate.acquire()
1236
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1471
(client.changedstate.wait
1472
(float(client._timedelta_to_milliseconds(delay)
1473
/ 1000)))
1237
1474
client.changedstate.release()
1238
1475
time2 = datetime.datetime.now()
1239
1476
if (time2 - time) >= delay:
1254
1491
while sent_size < len(client.secret):
1255
1492
try:
1256
1493
sent = session.send(client.secret[sent_size:])
1257
except (gnutls.errors.GNUTLSError), error:
1494
except gnutls.errors.GNUTLSError as error:
1258
1495
logger.warning("gnutls send failed")
1259
1496
return
1260
logger.debug(u"Sent: %d, remaining: %d",
1497
logger.debug("Sent: %d, remaining: %d",
1261
1498
sent, len(client.secret)
1262
1499
- (sent_size + sent))
1263
1500
sent_size += sent
1264
1265
logger.info(u"Sending secret to %s", client.name)
1266
# bump the timeout as if seen
1267
client.checked_ok()
1501
1502
logger.info("Sending secret to %s", client.name)
1503
# bump the timeout using extended_timeout
1504
client.checked_ok(client.extended_timeout)
1268
1505
if self.server.use_dbus:
1269
1506
# Emit D-Bus signal
1270
1507
client.GotSecret()
1274
1511
client.approvals_pending -= 1
1275
1512
try:
1276
1513
session.bye()
1277
except (gnutls.errors.GNUTLSError), error:
1514
except gnutls.errors.GNUTLSError as error:
1278
1515
logger.warning("GnuTLS bye failed")
1279
1516
1280
1517
@staticmethod
1291
1528
.gnutls_certificate_get_peers
1292
1529
(session._c_object, ctypes.byref(list_size)))
1293
1530
if not bool(cert_list) and list_size.value != 0:
1294
raise gnutls.errors.GNUTLSError(u"error getting peer"
1295
u" certificate")
1531
raise gnutls.errors.GNUTLSError("error getting peer"
1532
" certificate")
1296
1533
if list_size.value == 0:
1297
1534
return None
1298
1535
cert = cert_list[0]
1324
1561
if crtverify.value != 0:
1325
1562
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1326
1563
raise (gnutls.errors.CertificateSecurityError
1327
(u"Verify failed"))
1564
("Verify failed"))
1328
1565
# New buffer for the fingerprint
1329
1566
buf = ctypes.create_string_buffer(20)
1330
1567
buf_len = ctypes.c_size_t()
1337
1574
# Convert the buffer to a Python bytestring
1338
1575
fpr = ctypes.string_at(buf, buf_len.value)
1339
1576
# Convert the bytestring to hexadecimal notation
1340
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1577
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1341
1578
return hex_fpr
1342
1579
1343
1580
1349
1586
except:
1350
1587
self.handle_error(request, address)
1351
1588
self.close_request(request)
1352
1589
1353
1590
def process_request(self, request, address):
1354
1591
"""Start a new process to process the request."""
1355
multiprocessing.Process(target = self.sub_process_main,
1356
args = (request, address)).start()
1592
proc = multiprocessing.Process(target = self.sub_process_main,
1593
args = (request,
1594
address))
1595
proc.start()
1596
return proc
1597
1357
1598
1358
1599
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1359
1600
""" adds a pipe to the MixIn """
1363
1604
This function creates a new pipe in self.pipe
1364
1605
"""
1365
1606
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1366
1367
super(MultiprocessingMixInWithPipe,
1368
self).process_request(request, client_address)
1607
1608
proc = MultiprocessingMixIn.process_request(self, request,
1609
client_address)
1369
1610
self.child_pipe.close()
1370
self.add_pipe(parent_pipe)
1371
1372
def add_pipe(self, parent_pipe):
1611
self.add_pipe(parent_pipe, proc)
1612
1613
def add_pipe(self, parent_pipe, proc):
1373
1614
"""Dummy function; override as necessary"""
1374
pass
1615
raise NotImplementedError
1616
1375
1617
1376
1618
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1377
1619
socketserver.TCPServer, object):
1395
1637
bind to an address or port if they were not specified."""
1396
1638
if self.interface is not None:
1397
1639
if SO_BINDTODEVICE is None:
1398
logger.error(u"SO_BINDTODEVICE does not exist;"
1399
u" cannot bind to interface %s",
1640
logger.error("SO_BINDTODEVICE does not exist;"
1641
" cannot bind to interface %s",
1400
1642
self.interface)
1401
1643
else:
1402
1644
try:
1403
1645
self.socket.setsockopt(socket.SOL_SOCKET,
1404
1646
SO_BINDTODEVICE,
1405
1647
str(self.interface
1406
+ u'\0'))
1407
except socket.error, error:
1648
+ '\0'))
1649
except socket.error as error:
1408
1650
if error[0] == errno.EPERM:
1409
logger.error(u"No permission to"
1410
u" bind to interface %s",
1651
logger.error("No permission to"
1652
" bind to interface %s",
1411
1653
self.interface)
1412
1654
elif error[0] == errno.ENOPROTOOPT:
1413
logger.error(u"SO_BINDTODEVICE not available;"
1414
u" cannot bind to interface %s",
1655
logger.error("SO_BINDTODEVICE not available;"
1656
" cannot bind to interface %s",
1415
1657
self.interface)
1416
1658
else:
1417
1659
raise
1419
1661
if self.server_address[0] or self.server_address[1]:
1420
1662
if not self.server_address[0]:
1421
1663
if self.address_family == socket.AF_INET6:
1422
any_address = u"::" # in6addr_any
1664
any_address = "::" # in6addr_any
1423
1665
else:
1424
1666
any_address = socket.INADDR_ANY
1425
1667
self.server_address = (any_address,
1452
1694
self.enabled = False
1453
1695
self.clients = clients
1454
1696
if self.clients is None:
1455
self.clients = set()
1697
self.clients = {}
1456
1698
self.use_dbus = use_dbus
1457
1699
self.gnutls_priority = gnutls_priority
1458
1700
IPv6_TCPServer.__init__(self, server_address,
1462
1704
def server_activate(self):
1463
1705
if self.enabled:
1464
1706
return socketserver.TCPServer.server_activate(self)
1707
1465
1708
def enable(self):
1466
1709
self.enabled = True
1467
def add_pipe(self, parent_pipe):
1710
1711
def add_pipe(self, parent_pipe, proc):
1468
1712
# Call "handle_ipc" for both data and EOF events
1469
1713
gobject.io_add_watch(parent_pipe.fileno(),
1470
1714
gobject.IO_IN | gobject.IO_HUP,
1471
1715
functools.partial(self.handle_ipc,
1472
parent_pipe = parent_pipe))
1473
1716
parent_pipe =
1717
parent_pipe,
1718
proc = proc))
1719
1474
1720
def handle_ipc(self, source, condition, parent_pipe=None,
1475
client_object=None):
1721
proc = None, client_object=None):
1476
1722
condition_names = {
1477
gobject.IO_IN: u"IN", # There is data to read.
1478
gobject.IO_OUT: u"OUT", # Data can be written (without
1723
gobject.IO_IN: "IN", # There is data to read.
1724
gobject.IO_OUT: "OUT", # Data can be written (without
1479
1725
# blocking).
1480
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1481
gobject.IO_ERR: u"ERR", # Error condition.
1482
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1726
gobject.IO_PRI: "PRI", # There is urgent data to read.
1727
gobject.IO_ERR: "ERR", # Error condition.
1728
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1483
1729
# broken, usually for pipes and
1484
1730
# sockets).
1485
1731
}
1487
1733
for cond, name in
1488
1734
condition_names.iteritems()
1489
1735
if cond & condition)
1490
# error or the other end of multiprocessing.Pipe has closed
1736
# error, or the other end of multiprocessing.Pipe has closed
1491
1737
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1738
# Wait for other process to exit
1739
proc.join()
1492
1740
return False
1493
1741
1494
1742
# Read a request from the child
1499
1747
fpr = request[1]
1500
1748
address = request[2]
1501
1749
1502
for c in self.clients:
1750
for c in self.clients.itervalues():
1503
1751
if c.fingerprint == fpr:
1504
1752
client = c
1505
1753
break
1506
1754
else:
1507
logger.warning(u"Client not found for fingerprint: %s, ad"
1508
u"dress: %s", fpr, address)
1755
logger.info("Client not found for fingerprint: %s, ad"
1756
"dress: %s", fpr, address)
1509
1757
if self.use_dbus:
1510
1758
# Emit D-Bus signal
1511
mandos_dbus_service.ClientNotFound(fpr, address)
1759
mandos_dbus_service.ClientNotFound(fpr,
1760
address[0])
1512
1761
parent_pipe.send(False)
1513
1762
return False
1514
1763
1515
1764
gobject.io_add_watch(parent_pipe.fileno(),
1516
1765
gobject.IO_IN | gobject.IO_HUP,
1517
1766
functools.partial(self.handle_ipc,
1518
parent_pipe = parent_pipe,
1519
client_object = client))
1767
parent_pipe =
1768
parent_pipe,
1769
proc = proc,
1770
client_object =
1771
client))
1520
1772
parent_pipe.send(True)
1521
# remove the old hook in favor of the new above hook on same fileno
1773
# remove the old hook in favor of the new above hook on
1774
# same fileno
1522
1775
return False
1523
1776
if command == 'funcall':
1524
1777
funcname = request[1]
1525
1778
args = request[2]
1526
1779
kwargs = request[3]
1527
1780
1528
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1529
1781
parent_pipe.send(('data', getattr(client_object,
1782
funcname)(*args,
1783
**kwargs)))
1784
1530
1785
if command == 'getattr':
1531
1786
attrname = request[1]
1532
1787
if callable(client_object.__getattribute__(attrname)):
1533
1788
parent_pipe.send(('function',))
1534
1789
else:
1535
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1790
parent_pipe.send(('data', client_object
1791
.__getattribute__(attrname)))
1536
1792
1537
1793
if command == 'setattr':
1538
1794
attrname = request[1]
1539
1795
value = request[2]
1540
1796
setattr(client_object, attrname, value)
1541
1797
1542
1798
return True
1543
1799
1544
1800
1545
1801
def string_to_delta(interval):
1546
1802
"""Parse a string and return a datetime.timedelta
1547
1803
1548
>>> string_to_delta(u'7d')
1804
>>> string_to_delta('7d')
1549
1805
datetime.timedelta(7)
1550
>>> string_to_delta(u'60s')
1806
>>> string_to_delta('60s')
1551
1807
datetime.timedelta(0, 60)
1552
>>> string_to_delta(u'60m')
1808
>>> string_to_delta('60m')
1553
1809
datetime.timedelta(0, 3600)
1554
>>> string_to_delta(u'24h')
1810
>>> string_to_delta('24h')
1555
1811
datetime.timedelta(1)
1556
>>> string_to_delta(u'1w')
1812
>>> string_to_delta('1w')
1557
1813
datetime.timedelta(7)
1558
>>> string_to_delta(u'5m 30s')
1814
>>> string_to_delta('5m 30s')
1559
1815
datetime.timedelta(0, 330)
1560
1816
"""
1561
1817
timevalue = datetime.timedelta(0)
1563
1819
try:
1564
1820
suffix = unicode(s[-1])
1565
1821
value = int(s[:-1])
1566
if suffix == u"d":
1822
if suffix == "d":
1567
1823
delta = datetime.timedelta(value)
1568
elif suffix == u"s":
1824
elif suffix == "s":
1569
1825
delta = datetime.timedelta(0, value)
1570
elif suffix == u"m":
1826
elif suffix == "m":
1571
1827
delta = datetime.timedelta(0, 0, 0, 0, value)
1572
elif suffix == u"h":
1828
elif suffix == "h":
1573
1829
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1574
elif suffix == u"w":
1830
elif suffix == "w":
1575
1831
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1576
1832
else:
1577
raise ValueError(u"Unknown suffix %r" % suffix)
1578
except (ValueError, IndexError), e:
1579
raise ValueError(e.message)
1833
raise ValueError("Unknown suffix %r" % suffix)
1834
except (ValueError, IndexError) as e:
1835
raise ValueError(*(e.args))
1580
1836
timevalue += delta
1581
1837
return timevalue
1582
1838
1588
1844
global if_nametoindex
1589
1845
try:
1590
1846
if_nametoindex = (ctypes.cdll.LoadLibrary
1591
(ctypes.util.find_library(u"c"))
1847
(ctypes.util.find_library("c"))
1592
1848
.if_nametoindex)
1593
1849
except (OSError, AttributeError):
1594
logger.warning(u"Doing if_nametoindex the hard way")
1850
logger.warning("Doing if_nametoindex the hard way")
1595
1851
def if_nametoindex(interface):
1596
1852
"Get an interface index the hard way, i.e. using fcntl()"
1597
1853
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1598
1854
with contextlib.closing(socket.socket()) as s:
1599
1855
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1600
struct.pack(str(u"16s16x"),
1856
struct.pack(str("16s16x"),
1601
1857
interface))
1602
interface_index = struct.unpack(str(u"I"),
1858
interface_index = struct.unpack(str("I"),
1603
1859
ifreq[16:20])[0]
1604
1860
return interface_index
1605
1861
return if_nametoindex(interface)
1613
1869
sys.exit()
1614
1870
os.setsid()
1615
1871
if not nochdir:
1616
os.chdir(u"/")
1872
os.chdir("/")
1617
1873
if os.fork():
1618
1874
sys.exit()
1619
1875
if not noclose:
1621
1877
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1622
1878
if not stat.S_ISCHR(os.fstat(null).st_mode):
1623
1879
raise OSError(errno.ENODEV,
1624
u"%s not a character device"
1880
"%s not a character device"
1625
1881
% os.path.devnull)
1626
1882
os.dup2(null, sys.stdin.fileno())
1627
1883
os.dup2(null, sys.stdout.fileno())
1635
1891
##################################################################
1636
1892
# Parsing of options, both command line and config file
1637
1893
1638
parser = optparse.OptionParser(version = "%%prog %s" % version)
1639
parser.add_option("-i", u"--interface", type=u"string",
1640
metavar="IF", help=u"Bind to interface IF")
1641
parser.add_option("-a", u"--address", type=u"string",
1642
help=u"Address to listen for requests on")
1643
parser.add_option("-p", u"--port", type=u"int",
1644
help=u"Port number to receive requests on")
1645
parser.add_option("--check", action=u"store_true",
1646
help=u"Run self-test")
1647
parser.add_option("--debug", action=u"store_true",
1648
help=u"Debug mode; run in foreground and log to"
1649
u" terminal")
1650
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1651
help=u"Debug level for stdout output")
1652
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1653
u" priority string (see GnuTLS documentation)")
1654
parser.add_option("--servicename", type=u"string",
1655
metavar=u"NAME", help=u"Zeroconf service name")
1656
parser.add_option("--configdir", type=u"string",
1657
default=u"/etc/mandos", metavar=u"DIR",
1658
help=u"Directory to search for configuration"
1659
u" files")
1660
parser.add_option("--no-dbus", action=u"store_false",
1661
dest=u"use_dbus", help=u"Do not provide D-Bus"
1662
u" system bus interface")
1663
parser.add_option("--no-ipv6", action=u"store_false",
1664
dest=u"use_ipv6", help=u"Do not use IPv6")
1665
options = parser.parse_args()[0]
1894
parser = argparse.ArgumentParser()
1895
parser.add_argument("-v", "--version", action="version",
1896
version = "%%(prog)s %s" % version,
1897
help="show version number and exit")
1898
parser.add_argument("-i", "--interface", metavar="IF",
1899
help="Bind to interface IF")
1900
parser.add_argument("-a", "--address",
1901
help="Address to listen for requests on")
1902
parser.add_argument("-p", "--port", type=int,
1903
help="Port number to receive requests on")
1904
parser.add_argument("--check", action="store_true",
1905
help="Run self-test")
1906
parser.add_argument("--debug", action="store_true",
1907
help="Debug mode; run in foreground and log"
1908
" to terminal")
1909
parser.add_argument("--debuglevel", metavar="LEVEL",
1910
help="Debug level for stdout output")
1911
parser.add_argument("--priority", help="GnuTLS"
1912
" priority string (see GnuTLS documentation)")
1913
parser.add_argument("--servicename",
1914
metavar="NAME", help="Zeroconf service name")
1915
parser.add_argument("--configdir",
1916
default="/etc/mandos", metavar="DIR",
1917
help="Directory to search for configuration"
1918
" files")
1919
parser.add_argument("--no-dbus", action="store_false",
1920
dest="use_dbus", help="Do not provide D-Bus"
1921
" system bus interface")
1922
parser.add_argument("--no-ipv6", action="store_false",
1923
dest="use_ipv6", help="Do not use IPv6")
1924
parser.add_argument("--no-restore", action="store_false",
1925
dest="restore", help="Do not restore stored state",
1926
default=True)
1927
1928
options = parser.parse_args()
1666
1929
1667
1930
if options.check:
1668
1931
import doctest
1670
1933
sys.exit()
1671
1934
1672
1935
# Default values for config file for server-global settings
1673
server_defaults = { u"interface": u"",
1674
u"address": u"",
1675
u"port": u"",
1676
u"debug": u"False",
1677
u"priority":
1678
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1679
u"servicename": u"Mandos",
1680
u"use_dbus": u"True",
1681
u"use_ipv6": u"True",
1682
u"debuglevel": u"",
1936
server_defaults = { "interface": "",
1937
"address": "",
1938
"port": "",
1939
"debug": "False",
1940
"priority":
1941
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1942
"servicename": "Mandos",
1943
"use_dbus": "True",
1944
"use_ipv6": "True",
1945
"debuglevel": "",
1683
1946
}
1684
1947
1685
1948
# Parse config file for server-global settings
1686
1949
server_config = configparser.SafeConfigParser(server_defaults)
1687
1950
del server_defaults
1688
1951
server_config.read(os.path.join(options.configdir,
1689
u"mandos.conf"))
1952
"mandos.conf"))
1690
1953
# Convert the SafeConfigParser object to a dict
1691
1954
server_settings = server_config.defaults()
1692
1955
# Use the appropriate methods on the non-string config options
1693
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1694
server_settings[option] = server_config.getboolean(u"DEFAULT",
1956
for option in ("debug", "use_dbus", "use_ipv6"):
1957
server_settings[option] = server_config.getboolean("DEFAULT",
1695
1958
option)
1696
1959
if server_settings["port"]:
1697
server_settings["port"] = server_config.getint(u"DEFAULT",
1698
u"port")
1960
server_settings["port"] = server_config.getint("DEFAULT",
1961
"port")
1699
1962
del server_config
1700
1963
1701
1964
# Override the settings from the config file with command line
1702
1965
# options, if set.
1703
for option in (u"interface", u"address", u"port", u"debug",
1704
u"priority", u"servicename", u"configdir",
1705
u"use_dbus", u"use_ipv6", u"debuglevel"):
1966
for option in ("interface", "address", "port", "debug",
1967
"priority", "servicename", "configdir",
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
1706
1969
value = getattr(options, option)
1707
1970
if value is not None:
1708
1971
server_settings[option] = value
1716
1979
##################################################################
1717
1980
1718
1981
# For convenience
1719
debug = server_settings[u"debug"]
1720
debuglevel = server_settings[u"debuglevel"]
1721
use_dbus = server_settings[u"use_dbus"]
1722
use_ipv6 = server_settings[u"use_ipv6"]
1723
1724
if server_settings[u"servicename"] != u"Mandos":
1982
debug = server_settings["debug"]
1983
debuglevel = server_settings["debuglevel"]
1984
use_dbus = server_settings["use_dbus"]
1985
use_ipv6 = server_settings["use_ipv6"]
1986
1987
if server_settings["servicename"] != "Mandos":
1725
1988
syslogger.setFormatter(logging.Formatter
1726
(u'Mandos (%s) [%%(process)d]:'
1727
u' %%(levelname)s: %%(message)s'
1728
% server_settings[u"servicename"]))
1989
('Mandos (%s) [%%(process)d]:'
1990
' %%(levelname)s: %%(message)s'
1991
% server_settings["servicename"]))
1729
1992
1730
1993
# Parse config file with clients
1731
client_defaults = { u"timeout": u"1h",
1732
u"interval": u"5m",
1733
u"checker": u"fping -q -- %%(host)s",
1734
u"host": u"",
1735
u"approval_delay": u"0s",
1736
u"approval_duration": u"1s",
1994
client_defaults = { "timeout": "5m",
1995
"extended_timeout": "15m",
1996
"interval": "2m",
1997
"checker": "fping -q -- %%(host)s",
1998
"host": "",
1999
"approval_delay": "0s",
2000
"approval_duration": "1s",
1737
2001
}
1738
2002
client_config = configparser.SafeConfigParser(client_defaults)
1739
client_config.read(os.path.join(server_settings[u"configdir"],
1740
u"clients.conf"))
2003
client_config.read(os.path.join(server_settings["configdir"],
2004
"clients.conf"))
1741
2005
1742
2006
global mandos_dbus_service
1743
2007
mandos_dbus_service = None
1744
2008
1745
tcp_server = MandosServer((server_settings[u"address"],
1746
server_settings[u"port"]),
2009
tcp_server = MandosServer((server_settings["address"],
2010
server_settings["port"]),
1747
2011
ClientHandler,
1748
interface=(server_settings[u"interface"]
2012
interface=(server_settings["interface"]
1749
2013
or None),
1750
2014
use_ipv6=use_ipv6,
1751
2015
gnutls_priority=
1752
server_settings[u"priority"],
2016
server_settings["priority"],
1753
2017
use_dbus=use_dbus)
1754
pidfilename = u"/var/run/mandos.pid"
1755
try:
1756
pidfile = open(pidfilename, u"w")
1757
except IOError:
1758
logger.error(u"Could not open file %r", pidfilename)
2018
if not debug:
2019
pidfilename = "/var/run/mandos.pid"
2020
try:
2021
pidfile = open(pidfilename, "w")
2022
except IOError:
2023
logger.error("Could not open file %r", pidfilename)
1759
2024
1760
2025
try:
1761
uid = pwd.getpwnam(u"_mandos").pw_uid
1762
gid = pwd.getpwnam(u"_mandos").pw_gid
2026
uid = pwd.getpwnam("_mandos").pw_uid
2027
gid = pwd.getpwnam("_mandos").pw_gid
1763
2028
except KeyError:
1764
2029
try:
1765
uid = pwd.getpwnam(u"mandos").pw_uid
1766
gid = pwd.getpwnam(u"mandos").pw_gid
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
1767
2032
except KeyError:
1768
2033
try:
1769
uid = pwd.getpwnam(u"nobody").pw_uid
1770
gid = pwd.getpwnam(u"nobody").pw_gid
2034
uid = pwd.getpwnam("nobody").pw_uid
2035
gid = pwd.getpwnam("nobody").pw_gid
1771
2036
except KeyError:
1772
2037
uid = 65534
1773
2038
gid = 65534
1774
2039
try:
1775
2040
os.setgid(gid)
1776
2041
os.setuid(uid)
1777
except OSError, error:
2042
except OSError as error:
1778
2043
if error[0] != errno.EPERM:
1779
2044
raise error
1780
2045
1781
2046
if not debug and not debuglevel:
1782
syslogger.setLevel(logging.WARNING)
1783
console.setLevel(logging.WARNING)
2047
logger.setLevel(logging.WARNING)
1784
2048
if debuglevel:
1785
2049
level = getattr(logging, debuglevel.upper())
1786
syslogger.setLevel(level)
1787
console.setLevel(level)
1788
2050
logger.setLevel(level)
2051
1789
2052
if debug:
2053
logger.setLevel(logging.DEBUG)
1790
2054
# Enable all possible GnuTLS debugging
1791
2055
1792
2056
# "Use a log level over 10 to enable all debugging options."
1795
2059
1796
2060
@gnutls.library.types.gnutls_log_func
1797
2061
def debug_gnutls(level, string):
1798
logger.debug(u"GnuTLS: %s", string[:-1])
2062
logger.debug("GnuTLS: %s", string[:-1])
1799
2063
1800
2064
(gnutls.library.functions
1801
2065
.gnutls_global_set_log_function(debug_gnutls))
1809
2073
# No console logging
1810
2074
logger.removeHandler(console)
1811
2075
2076
# Need to fork before connecting to D-Bus
2077
if not debug:
2078
# Close all input and output, do double fork, etc.
2079
daemon()
1812
2080
1813
2081
global main_loop
1814
2082
# From the Avahi example code
1818
2086
# End of Avahi example code
1819
2087
if use_dbus:
1820
2088
try:
1821
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2089
bus_name = dbus.service.BusName("se.recompile.Mandos",
1822
2090
bus, do_not_queue=True)
1823
except dbus.exceptions.NameExistsException, e:
1824
logger.error(unicode(e) + u", disabling D-Bus")
2091
old_bus_name = (dbus.service.BusName
2092
("se.bsnet.fukt.Mandos", bus,
2093
do_not_queue=True))
2094
except dbus.exceptions.NameExistsException as e:
2095
logger.error(unicode(e) + ", disabling D-Bus")
1825
2096
use_dbus = False
1826
server_settings[u"use_dbus"] = False
2097
server_settings["use_dbus"] = False
1827
2098
tcp_server.use_dbus = False
1828
2099
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1829
service = AvahiService(name = server_settings[u"servicename"],
1830
servicetype = u"_mandos._tcp",
1831
protocol = protocol, bus = bus)
2100
service = AvahiServiceToSyslog(name =
2101
server_settings["servicename"],
2102
servicetype = "_mandos._tcp",
2103
protocol = protocol, bus = bus)
1832
2104
if server_settings["interface"]:
1833
2105
service.interface = (if_nametoindex
1834
(str(server_settings[u"interface"])))
1835
1836
if not debug:
1837
# Close all input and output, do double fork, etc.
1838
daemon()
1839
2106
(str(server_settings["interface"])))
2107
1840
2108
global multiprocessing_manager
1841
2109
multiprocessing_manager = multiprocessing.Manager()
1842
2110
1843
2111
client_class = Client
1844
2112
if use_dbus:
1845
client_class = functools.partial(ClientDBus, bus = bus)
1846
def client_config_items(config, section):
1847
special_settings = {
1848
"approved_by_default":
1849
lambda: config.getboolean(section,
1850
"approved_by_default"),
1851
}
1852
for name, value in config.items(section):
2113
client_class = functools.partial(ClientDBusTransitional,
2114
bus = bus)
2115
2116
special_settings = {
2117
# Some settings need to be accessd by special methods;
2118
# booleans need .getboolean(), etc. Here is a list of them:
2119
"approved_by_default":
2120
lambda section:
2121
client_config.getboolean(section, "approved_by_default"),
2122
}
2123
# Construct a new dict of client settings of this form:
2124
# { client_name: {setting_name: value, ...}, ...}
2125
# with exceptions for any special settings as defined above
2126
client_settings = dict((clientname,
2127
dict((setting,
2128
(value if setting not in special_settings
2129
else special_settings[setting](clientname)))
2130
for setting, value in client_config.items(clientname)))
2131
for clientname in client_config.sections())
2132
2133
old_client_settings = {}
2134
clients_data = []
2135
2136
# Get client data and settings from last running state.
2137
if server_settings["restore"]:
2138
try:
2139
with open(stored_state_path, "rb") as stored_state:
2140
clients_data, old_client_settings = pickle.load(stored_state)
2141
os.remove(stored_state_path)
2142
except IOError as e:
2143
logger.warning("Could not load persistant state: {0}".format(e))
2144
if e.errno != errno.ENOENT:
2145
raise
2146
2147
for client in clients_data:
2148
client_name = client["name"]
2149
2150
# Decide which value to use after restoring saved state.
2151
# We have three different values: Old config file,
2152
# new config file, and saved state.
2153
# New config value takes precedence if it differs from old
2154
# config value, otherwise use saved state.
2155
for name, value in client_settings[client_name].items():
1853
2156
try:
1854
yield (name, special_settings[name]())
2157
# For each value in new config, check if it differs
2158
# from the old config value (Except for the "secret"
2159
# attribute)
2160
if name != "secret" and value != old_client_settings[client_name][name]:
2161
setattr(client, name, value)
1855
2162
except KeyError:
1856
yield (name, value)
2163
pass
2164
2165
# Clients who has passed its expire date, can still be enabled if its
2166
# last checker was sucessful. Clients who checkers failed before we
2167
# stored it state is asumed to had failed checker during downtime.
2168
if client["enabled"] and client["last_checked_ok"]:
2169
if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2170
> client["interval"]):
2171
if client["last_checker_status"] != 0:
2172
client["enabled"] = False
2173
else:
2174
client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2175
2176
client["changedstate"] = (multiprocessing_manager
2177
.Condition(multiprocessing_manager
2178
.Lock()))
2179
if use_dbus:
2180
new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2181
tcp_server.clients[client_name] = new_client
2182
new_client.bus = bus
2183
for name, value in client.iteritems():
2184
setattr(new_client, name, value)
2185
client_object_name = unicode(client_name).translate(
2186
{ord("."): ord("_"),
2187
ord("-"): ord("_")})
2188
new_client.dbus_object_path = (dbus.ObjectPath
2189
("/clients/" + client_object_name))
2190
DBusObjectWithProperties.__init__(new_client,
2191
new_client.bus,
2192
new_client.dbus_object_path)
2193
else:
2194
tcp_server.clients[client_name] = Client.__new__(Client)
2195
for name, value in client.iteritems():
2196
setattr(tcp_server.clients[client_name], name, value)
2197
2198
tcp_server.clients[client_name].decrypt_secret(
2199
client_settings[client_name]["secret"])
2200
2201
# Create/remove clients based on new changes made to config
2202
for clientname in set(old_client_settings) - set(client_settings):
2203
del tcp_server.clients[clientname]
2204
for clientname in set(client_settings) - set(old_client_settings):
2205
tcp_server.clients[clientname] = (client_class(name = clientname,
2206
config =
2207
client_settings
2208
[clientname]))
1857
2209
1858
tcp_server.clients.update(set(
1859
client_class(name = section,
1860
config= dict(client_config_items(
1861
client_config, section)))
1862
for section in client_config.sections()))
2210
1863
2211
if not tcp_server.clients:
1864
logger.warning(u"No clients defined")
2212
logger.warning("No clients defined")
1865
2213
1866
try:
1867
with pidfile:
1868
pid = os.getpid()
1869
pidfile.write(str(pid) + "\n")
1870
del pidfile
1871
except IOError:
1872
logger.error(u"Could not write to file %r with PID %d",
1873
pidfilename, pid)
1874
except NameError:
1875
# "pidfile" was never created
1876
pass
1877
del pidfilename
1878
1879
2214
if not debug:
2215
try:
2216
with pidfile:
2217
pid = os.getpid()
2218
pidfile.write(str(pid) + "\n".encode("utf-8"))
2219
del pidfile
2220
except IOError:
2221
logger.error("Could not write to file %r with PID %d",
2222
pidfilename, pid)
2223
except NameError:
2224
# "pidfile" was never created
2225
pass
2226
del pidfilename
2227
1880
2228
signal.signal(signal.SIGINT, signal.SIG_IGN)
2229
1881
2230
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1882
2231
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1883
2232
1885
2234
class MandosDBusService(dbus.service.Object):
1886
2235
"""A D-Bus proxy object"""
1887
2236
def __init__(self):
1888
dbus.service.Object.__init__(self, bus, u"/")
1889
_interface = u"se.bsnet.fukt.Mandos"
2237
dbus.service.Object.__init__(self, bus, "/")
2238
_interface = "se.recompile.Mandos"
1890
2239
1891
@dbus.service.signal(_interface, signature=u"o")
2240
@dbus.service.signal(_interface, signature="o")
1892
2241
def ClientAdded(self, objpath):
1893
2242
"D-Bus signal"
1894
2243
pass
1895
2244
1896
@dbus.service.signal(_interface, signature=u"ss")
2245
@dbus.service.signal(_interface, signature="ss")
1897
2246
def ClientNotFound(self, fingerprint, address):
1898
2247
"D-Bus signal"
1899
2248
pass
1900
2249
1901
@dbus.service.signal(_interface, signature=u"os")
2250
@dbus.service.signal(_interface, signature="os")
1902
2251
def ClientRemoved(self, objpath, name):
1903
2252
"D-Bus signal"
1904
2253
pass
1905
2254
1906
@dbus.service.method(_interface, out_signature=u"ao")
2255
@dbus.service.method(_interface, out_signature="ao")
1907
2256
def GetAllClients(self):
1908
2257
"D-Bus method"
1909
2258
return dbus.Array(c.dbus_object_path
1910
for c in tcp_server.clients)
2259
for c in
2260
tcp_server.clients.itervalues())
1911
2261
1912
2262
@dbus.service.method(_interface,
1913
out_signature=u"a{oa{sv}}")
2263
out_signature="a{oa{sv}}")
1914
2264
def GetAllClientsWithProperties(self):
1915
2265
"D-Bus method"
1916
2266
return dbus.Dictionary(
1917
((c.dbus_object_path, c.GetAll(u""))
1918
for c in tcp_server.clients),
1919
signature=u"oa{sv}")
2267
((c.dbus_object_path, c.GetAll(""))
2268
for c in tcp_server.clients.itervalues()),
2269
signature="oa{sv}")
1920
2270
1921
@dbus.service.method(_interface, in_signature=u"o")
2271
@dbus.service.method(_interface, in_signature="o")
1922
2272
def RemoveClient(self, object_path):
1923
2273
"D-Bus method"
1924
for c in tcp_server.clients:
2274
for c in tcp_server.clients.itervalues():
1925
2275
if c.dbus_object_path == object_path:
1926
tcp_server.clients.remove(c)
2276
del tcp_server.clients[c.name]
1927
2277
c.remove_from_connection()
1928
2278
# Don't signal anything except ClientRemoved
1929
2279
c.disable(quiet=True)
1934
2284
1935
2285
del _interface
1936
2286
1937
mandos_dbus_service = MandosDBusService()
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
1938
2290
1939
2291
def cleanup():
1940
2292
"Cleanup function; run on exit"
1941
2293
service.cleanup()
1942
2294
2295
multiprocessing.active_children()
2296
if not (tcp_server.clients or client_settings):
2297
return
2298
2299
# Store client before exiting. Secrets are encrypted with key based
2300
# on what config file has. If config file is removed/edited, old
2301
# secret will thus be unrecovable.
2302
clients = []
2303
for client in tcp_server.clients.itervalues():
2304
client.encrypt_secret(client_settings[client.name]["secret"])
2305
2306
client_dict = {}
2307
2308
# A list of attributes that will not be stored when shuting down.
2309
exclude = set(("bus", "changedstate", "secret"))
2310
for name, typ in inspect.getmembers(dbus.service.Object):
2311
exclude.add(name)
2312
2313
client_dict["encrypted_secret"] = client.encrypted_secret
2314
for attr in client.client_structure:
2315
if attr not in exclude:
2316
client_dict[attr] = getattr(client, attr)
2317
2318
clients.append(client_dict)
2319
del client_settings[client.name]["secret"]
2320
2321
try:
2322
with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2323
pickle.dump((clients, client_settings), stored_state)
2324
except IOError as e:
2325
logger.warning("Could not save persistant state: {0}".format(e))
2326
if e.errno != errno.ENOENT:
2327
raise
2328
2329
# Delete all clients, and settings from config
1943
2330
while tcp_server.clients:
1944
client = tcp_server.clients.pop()
2331
name, client = tcp_server.clients.popitem()
1945
2332
if use_dbus:
1946
2333
client.remove_from_connection()
1947
client.disable_hook = None
1948
2334
# Don't signal anything except ClientRemoved
1949
2335
client.disable(quiet=True)
1950
2336
if use_dbus:
1951
2337
# Emit D-Bus signal
1952
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2338
mandos_dbus_service.ClientRemoved(client
2339
.dbus_object_path,
1953
2340
client.name)
2341
client_settings.clear()
1954
2342
1955
2343
atexit.register(cleanup)
1956
2344
1957
for client in tcp_server.clients:
2345
for client in tcp_server.clients.itervalues():
1958
2346
if use_dbus:
1959
2347
# Emit D-Bus signal
1960
2348
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1961
client.enable()
2349
# Need to initiate checking of clients
2350
if client.enabled:
2351
client.init_checker()
2352
1962
2353
1963
2354
tcp_server.enable()
1964
2355
tcp_server.server_activate()
1966
2357
# Find out what port we got
1967
2358
service.port = tcp_server.socket.getsockname()[1]
1968
2359
if use_ipv6:
1969
logger.info(u"Now listening on address %r, port %d,"
2360
logger.info("Now listening on address %r, port %d,"
1970
2361
" flowinfo %d, scope_id %d"
1971
2362
% tcp_server.socket.getsockname())
1972
2363
else: # IPv4
1973
logger.info(u"Now listening on address %r, port %d"
2364
logger.info("Now listening on address %r, port %d"
1974
2365
% tcp_server.socket.getsockname())
1975
2366
1976
2367
#service.interface = tcp_server.socket.getsockname()[3]
1979
2370
# From the Avahi example code
1980
2371
try:
1981
2372
service.activate()
1982
except dbus.exceptions.DBusException, error:
1983
logger.critical(u"DBusException: %s", error)
2373
except dbus.exceptions.DBusException as error:
2374
logger.critical("DBusException: %s", error)
1984
2375
cleanup()
1985
2376
sys.exit(1)
1986
2377
# End of Avahi example code
1990
2381
(tcp_server.handle_request
1991
2382
(*args[2:], **kwargs) or True))
1992
2383
1993
logger.debug(u"Starting main loop")
2384
logger.debug("Starting main loop")
1994
2385
main_loop.run()
1995
except AvahiError, error:
1996
logger.critical(u"AvahiError: %s", error)
2386
except AvahiError as error:
2387
logger.critical("AvahiError: %s", error)
1997
2388
cleanup()
1998
2389
sys.exit(1)
1999
2390
except KeyboardInterrupt:
2000
2391
if debug:
2001
print >> sys.stderr
2002
logger.debug(u"Server received KeyboardInterrupt")
2003
logger.debug(u"Server exiting")
2392
print("", file=sys.stderr)
2393
logger.debug("Server received KeyboardInterrupt")
2394
logger.debug("Server exiting")
2004
2395
# Must run before the D-Bus bus name gets deregistered
2005
2396
cleanup()
2006
2397
2398
2007
2399
if __name__ == '__main__':
2008
2400
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0