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:
- DBUS-API
- 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
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
from contextlib import closing
59
import contextlib
59
60
import struct
60
61
import fcntl
61
62
import functools
63
import cPickle as pickle
64
import multiprocessing
65
import types
66
import hashlib
62
67
63
68
import dbus
64
69
import dbus.service
67
72
from dbus.mainloop.glib import DBusGMainLoop
68
73
import ctypes
69
74
import ctypes.util
75
import xml.dom.minidom
76
import inspect
77
import Crypto.Cipher.AES
70
78
71
79
try:
72
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
77
85
SO_BINDTODEVICE = None
78
86
79
87
80
version = "1.0.12"
81
82
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
83
93
syslogger = (logging.handlers.SysLogHandler
84
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
85
address = "/dev/log"))
95
address = str("/dev/log")))
86
96
syslogger.setFormatter(logging.Formatter
87
(u'Mandos [%(process)d]: %(levelname)s:'
88
u' %(message)s'))
97
('Mandos [%(process)d]: %(levelname)s:'
98
' %(message)s'))
89
99
logger.addHandler(syslogger)
90
100
91
101
console = logging.StreamHandler()
92
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
93
u' %(levelname)s:'
94
u' %(message)s'))
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
' [%(process)d]:'
104
' %(levelname)s:'
105
' %(message)s'))
95
106
logger.addHandler(console)
96
107
108
97
109
class AvahiError(Exception):
98
110
def __init__(self, value, *args, **kwargs):
99
111
self.value = value
114
126
Attributes:
115
127
interface: integer; avahi.IF_UNSPEC or an interface index.
116
128
Used to optionally bind to the specified interface.
117
name: string; Example: u'Mandos'
118
type: string; Example: u'_mandos._tcp'.
129
name: string; Example: 'Mandos'
130
type: string; Example: '_mandos._tcp'.
119
131
See <http://www.dns-sd.org/ServiceTypes.html>
120
132
port: integer; what port to announce
121
133
TXT: list of strings; TXT record for the service
130
142
"""
131
143
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
132
144
servicetype = None, port = None, TXT = None,
133
domain = u"", host = u"", max_renames = 32768,
145
domain = "", host = "", max_renames = 32768,
134
146
protocol = avahi.PROTO_UNSPEC, bus = None):
135
147
self.interface = interface
136
148
self.name = name
145
157
self.group = None # our entry group
146
158
self.server = None
147
159
self.bus = bus
160
self.entry_group_state_changed_match = None
148
161
def rename(self):
149
162
"""Derived from the Avahi example code"""
150
163
if self.rename_count >= self.max_renames:
151
logger.critical(u"No suitable Zeroconf service name found"
152
u" after %i retries, exiting.",
164
logger.critical("No suitable Zeroconf service name found"
165
" after %i retries, exiting.",
153
166
self.rename_count)
154
raise AvahiServiceError(u"Too many renames")
155
self.name = self.server.GetAlternativeServiceName(self.name)
156
logger.info(u"Changing Zeroconf service name to %r ...",
157
unicode(self.name))
158
syslogger.setFormatter(logging.Formatter
159
(u'Mandos (%s) [%%(process)d]:'
160
u' %%(levelname)s: %%(message)s'
161
% self.name))
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 ...",
171
self.name)
162
172
self.remove()
163
self.add()
173
try:
174
self.add()
175
except dbus.exceptions.DBusException as error:
176
logger.critical("DBusException: %s", error)
177
self.cleanup()
178
os._exit(1)
164
179
self.rename_count += 1
165
180
def remove(self):
166
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
167
185
if self.group is not None:
168
186
self.group.Reset()
169
187
def add(self):
170
188
"""Derived from the Avahi example code"""
189
self.remove()
171
190
if self.group is None:
172
191
self.group = dbus.Interface(
173
192
self.bus.get_object(avahi.DBUS_NAME,
174
193
self.server.EntryGroupNew()),
175
194
avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
self.group.connect_to_signal('StateChanged',
177
self.entry_group_state_changed)
178
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' ...",
179
199
self.name, self.type)
180
200
self.group.AddService(
181
201
self.interface,
188
208
self.group.Commit()
189
209
def entry_group_state_changed(self, state, error):
190
210
"""Derived from the Avahi example code"""
191
logger.debug(u"Avahi state change: %i", state)
211
logger.debug("Avahi entry group state change: %i", state)
192
212
193
213
if state == avahi.ENTRY_GROUP_ESTABLISHED:
194
logger.debug(u"Zeroconf service established.")
214
logger.debug("Zeroconf service established.")
195
215
elif state == avahi.ENTRY_GROUP_COLLISION:
196
logger.warning(u"Zeroconf service name collision.")
216
logger.info("Zeroconf service name collision.")
197
217
self.rename()
198
218
elif state == avahi.ENTRY_GROUP_FAILURE:
199
logger.critical(u"Avahi: Error in group state changed %s",
219
logger.critical("Avahi: Error in group state changed %s",
200
220
unicode(error))
201
raise AvahiGroupError(u"State changed: %s"
221
raise AvahiGroupError("State changed: %s"
202
222
% unicode(error))
203
223
def cleanup(self):
204
224
"""Derived from the Avahi example code"""
205
225
if self.group is not None:
206
self.group.Free()
226
try:
227
self.group.Free()
228
except (dbus.exceptions.UnknownMethodException,
229
dbus.exceptions.DBusException) as e:
230
pass
207
231
self.group = None
208
def server_state_changed(self, state):
232
self.remove()
233
def server_state_changed(self, state, error=None):
209
234
"""Derived from the Avahi example code"""
210
if state == avahi.SERVER_COLLISION:
211
logger.error(u"Zeroconf server name collision")
212
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()
213
250
elif state == avahi.SERVER_RUNNING:
214
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)
215
257
def activate(self):
216
258
"""Derived from the Avahi example code"""
217
259
if self.server is None:
218
260
self.server = dbus.Interface(
219
261
self.bus.get_object(avahi.DBUS_NAME,
220
avahi.DBUS_PATH_SERVER),
262
avahi.DBUS_PATH_SERVER,
263
follow_name_owner_changes=True),
221
264
avahi.DBUS_INTERFACE_SERVER)
222
self.server.connect_to_signal(u"StateChanged",
265
self.server.connect_to_signal("StateChanged",
223
266
self.server_state_changed)
224
267
self.server_state_changed(self.server.GetState())
225
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
226
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
227
285
class Client(object):
228
286
"""A representation of a client host served by this server.
229
287
230
288
Attributes:
231
name: string; from the config file, used in log messages and
232
D-Bus identifiers
233
fingerprint: string (40 or 32 hexadecimal digits); used to
234
uniquely identify the client
235
secret: bytestring; sent verbatim (over TLS) to client
236
host: string; available for use by the checker command
237
created: datetime.datetime(); (UTC) object creation
238
last_enabled: datetime.datetime(); (UTC)
239
enabled: bool()
240
last_checked_ok: datetime.datetime(); (UTC) or None
241
timeout: datetime.timedelta(); How long from last_checked_ok
242
until this client is invalid
243
interval: datetime.timedelta(); How often to start a new checker
244
disable_hook: If set, called by disable() as disable_hook(self)
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
245
292
checker: subprocess.Popen(); a running checker process used
246
293
to see if the client lives.
247
294
'None' if no process is running.
248
checker_initiator_tag: a gobject event source tag, or None
249
disable_initiator_tag: - '' -
250
checker_callback_tag: - '' -
251
checker_command: string; External command which is run to check if
252
client lives. %() expansions are done at
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
253
298
runtime with vars(self) as dict, so that for
254
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
255
304
current_checker_command: string; current running checker_command
305
disable_initiator_tag: a gobject event source tag, or None
306
enabled: bool()
307
fingerprint: string (40 or 32 hexadecimal digits); used to
308
uniquely identify the client
309
host: string; available for use by the checker command
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.
316
last_enabled: datetime.datetime(); (UTC)
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
320
timeout: datetime.timedelta(); How long from last_checked_ok
321
until this client is disabled
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
256
326
"""
257
327
258
@staticmethod
259
def _datetime_to_milliseconds(dt):
260
"Convert a datetime.datetime() to milliseconds"
261
return ((dt.days * 24 * 60 * 60 * 1000)
262
+ (dt.seconds * 1000)
263
+ (dt.microseconds // 1000))
328
runtime_expansions = ("approval_delay", "approval_duration",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
331
"last_enabled", "name", "timeout")
264
332
265
333
def timeout_milliseconds(self):
266
334
"Return the 'timeout' attribute in milliseconds"
267
return self._datetime_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)
268
340
269
341
def interval_milliseconds(self):
270
342
"Return the 'interval' attribute in milliseconds"
271
return self._datetime_to_milliseconds(self.interval)
272
273
def __init__(self, name = None, disable_hook=None, config=None):
343
return _timedelta_to_milliseconds(self.interval)
344
345
def approval_delay_milliseconds(self):
346
return _timedelta_to_milliseconds(self.approval_delay)
347
348
def __init__(self, name = None, config=None):
274
349
"""Note: the 'checker' key in 'config' sets the
275
350
'checker_command' attribute and *not* the 'checker'
276
351
attribute."""
277
352
self.name = name
278
353
if config is None:
279
354
config = {}
280
logger.debug(u"Creating client %r", self.name)
355
logger.debug("Creating client %r", self.name)
281
356
# Uppercase and remove spaces from fingerprint for later
282
357
# comparison purposes with return value from the fingerprint()
283
358
# function
284
self.fingerprint = (config[u"fingerprint"].upper()
285
.replace(u" ", u""))
286
logger.debug(u" Fingerprint: %s", self.fingerprint)
287
if u"secret" in config:
288
self.secret = config[u"secret"].decode(u"base64")
289
elif u"secfile" in config:
290
with closing(open(os.path.expanduser
291
(os.path.expandvars
292
(config[u"secfile"])))) as secfile:
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:
365
with open(os.path.expanduser(os.path.expandvars
366
(config["secfile"])),
367
"rb") as secfile:
293
368
self.secret = secfile.read()
294
369
else:
295
raise TypeError(u"No secret or secfile for client %s"
370
raise TypeError("No secret or secfile for client %s"
296
371
% self.name)
297
self.host = config.get(u"host", u"")
372
self.host = config.get("host", "")
298
373
self.created = datetime.datetime.utcnow()
299
self.enabled = False
300
self.last_enabled = None
374
self.enabled = True
375
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
301
377
self.last_checked_ok = None
302
self.timeout = string_to_delta(config[u"timeout"])
303
self.interval = string_to_delta(config[u"interval"])
304
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"])
305
383
self.checker = None
306
384
self.checker_initiator_tag = None
307
385
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
308
387
self.checker_callback_tag = None
309
self.checker_command = config[u"checker"]
388
self.checker_command = config["checker"]
310
389
self.current_checker_command = None
311
self.last_connect = None
390
self._approved = None
391
self.approved_by_default = config.get("approved_by_default",
392
True)
393
self.approvals_pending = 0
394
self.approval_delay = string_to_delta(
395
config["approval_delay"])
396
self.approval_duration = string_to_delta(
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)
409
410
# Send notice to process children that client state has changed
411
def send_changedstate(self):
412
with self.changedstate:
413
self.changedstate.notify_all()
312
414
313
415
def enable(self):
314
416
"""Start this client's checker and timeout hooks"""
315
if getattr(self, u"enabled", False):
417
if getattr(self, "enabled", False):
316
418
# Already enabled
317
419
return
420
self.send_changedstate()
421
self.expires = datetime.datetime.utcnow() + self.timeout
422
self.enabled = True
318
423
self.last_enabled = datetime.datetime.utcnow()
424
self.init_checker()
425
426
def disable(self, quiet=True):
427
"""Disable this client."""
428
if not getattr(self, "enabled", False):
429
return False
430
if not quiet:
431
self.send_changedstate()
432
if not quiet:
433
logger.info("Disabling client %s", self.name)
434
if getattr(self, "disable_initiator_tag", False):
435
gobject.source_remove(self.disable_initiator_tag)
436
self.disable_initiator_tag = None
437
self.expires = None
438
if getattr(self, "checker_initiator_tag", False):
439
gobject.source_remove(self.checker_initiator_tag)
440
self.checker_initiator_tag = None
441
self.stop_checker()
442
self.enabled = False
443
# Do not run this again if called by a gobject.timeout_add
444
return False
445
446
def __del__(self):
447
self.disable()
448
449
def init_checker(self):
319
450
# Schedule a new checker to be started an 'interval' from now,
320
451
# and every interval from then on.
321
452
self.checker_initiator_tag = (gobject.timeout_add
322
453
(self.interval_milliseconds(),
323
454
self.start_checker))
324
# Also start a new checker *right now*.
325
self.start_checker()
326
455
# Schedule a disable() when 'timeout' has passed
327
456
self.disable_initiator_tag = (gobject.timeout_add
328
457
(self.timeout_milliseconds(),
329
458
self.disable))
330
self.enabled = True
331
332
def disable(self):
333
"""Disable this client."""
334
if not getattr(self, "enabled", False):
335
return False
336
logger.info(u"Disabling client %s", self.name)
337
if getattr(self, u"disable_initiator_tag", False):
338
gobject.source_remove(self.disable_initiator_tag)
339
self.disable_initiator_tag = None
340
if getattr(self, u"checker_initiator_tag", False):
341
gobject.source_remove(self.checker_initiator_tag)
342
self.checker_initiator_tag = None
343
self.stop_checker()
344
if self.disable_hook:
345
self.disable_hook(self)
346
self.enabled = False
347
# Do not run this again if called by a gobject.timeout_add
348
return False
349
350
def __del__(self):
351
self.disable_hook = None
352
self.disable()
353
459
# Also start a new checker *right now*.
460
self.start_checker()
461
462
354
463
def checker_callback(self, pid, condition, command):
355
464
"""The checker has completed, so take appropriate actions."""
356
465
self.checker_callback_tag = None
357
466
self.checker = None
358
467
if os.WIFEXITED(condition):
359
exitstatus = os.WEXITSTATUS(condition)
360
if exitstatus == 0:
361
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",
362
471
vars(self))
363
472
self.checked_ok()
364
473
else:
365
logger.info(u"Checker for %(name)s failed",
474
logger.info("Checker for %(name)s failed",
366
475
vars(self))
367
476
else:
368
logger.warning(u"Checker for %(name)s crashed?",
477
self.last_checker_status = -1
478
logger.warning("Checker for %(name)s crashed?",
369
479
vars(self))
370
480
371
def checked_ok(self):
481
def checked_ok(self, timeout=None):
372
482
"""Bump up the timeout for this client.
373
483
374
484
This should only be called when the client has been seen,
375
485
alive and well.
376
486
"""
487
if timeout is None:
488
timeout = self.timeout
377
489
self.last_checked_ok = datetime.datetime.utcnow()
378
gobject.source_remove(self.disable_initiator_tag)
379
self.disable_initiator_tag = (gobject.timeout_add
380
(self.timeout_milliseconds(),
381
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()
382
500
383
501
def start_checker(self):
384
502
"""Start a new checker subprocess if one is not running.
391
509
# client would inevitably timeout, since no checker would get
392
510
# a chance to run to completion. If we instead leave running
393
511
# checkers alone, the checker would have to take more time
394
# than 'timeout' for the client to be declared invalid, which
395
# is as it should be.
512
# than 'timeout' for the client to be disabled, which is as it
513
# should be.
396
514
397
515
# If a checker exists, make sure it is not a zombie
398
if self.checker is not None:
516
try:
399
517
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
518
except (AttributeError, OSError) as error:
519
if (isinstance(error, OSError)
520
and error.errno != errno.ECHILD):
521
raise error
522
else:
400
523
if pid:
401
logger.warning(u"Checker was a zombie")
524
logger.warning("Checker was a zombie")
402
525
gobject.source_remove(self.checker_callback_tag)
403
526
self.checker_callback(pid, status,
404
527
self.current_checker_command)
409
532
command = self.checker_command % self.host
410
533
except TypeError:
411
534
# Escape attributes for the shell
412
escaped_attrs = dict((key,
413
re.escape(unicode(str(val),
414
errors=
415
u'replace')))
416
for key, val in
417
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
418
543
try:
419
544
command = self.checker_command % escaped_attrs
420
except TypeError, error:
421
logger.error(u'Could not format string "%s":'
422
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)
423
548
return True # Try again later
424
549
self.current_checker_command = command
425
550
try:
426
logger.info(u"Starting checker %r for %s",
551
logger.info("Starting checker %r for %s",
427
552
command, self.name)
428
553
# We don't need to redirect stdout and stderr, since
429
554
# in normal mode, that is already done by daemon(),
431
556
# always replaced by /dev/null.)
432
557
self.checker = subprocess.Popen(command,
433
558
close_fds=True,
434
shell=True, cwd=u"/")
559
shell=True, cwd="/")
435
560
self.checker_callback_tag = (gobject.child_watch_add
436
561
(self.checker.pid,
437
562
self.checker_callback,
442
567
if pid:
443
568
gobject.source_remove(self.checker_callback_tag)
444
569
self.checker_callback(pid, status, command)
445
except OSError, error:
446
logger.error(u"Failed to start subprocess: %s",
570
except OSError as error:
571
logger.error("Failed to start subprocess: %s",
447
572
error)
448
573
# Re-run this periodically if run by gobject.timeout_add
449
574
return True
453
578
if self.checker_callback_tag:
454
579
gobject.source_remove(self.checker_callback_tag)
455
580
self.checker_callback_tag = None
456
if getattr(self, u"checker", None) is None:
581
if getattr(self, "checker", None) is None:
457
582
return
458
logger.debug(u"Stopping checker for %(name)s", vars(self))
583
logger.debug("Stopping checker for %(name)s", vars(self))
459
584
try:
460
585
os.kill(self.checker.pid, signal.SIGTERM)
461
#os.sleep(0.5)
586
#time.sleep(0.5)
462
587
#if self.checker.poll() is None:
463
588
# os.kill(self.checker.pid, signal.SIGKILL)
464
except OSError, error:
589
except OSError as error:
465
590
if error.errno != errno.ESRCH: # No such process
466
591
raise
467
592
self.checker = None
468
469
def still_valid(self):
470
"""Has the timeout not yet passed for this client?"""
471
if not getattr(self, u"enabled", False):
472
return False
473
now = datetime.datetime.utcnow()
474
if self.last_checked_ok is None:
475
return now < (self.created + self.timeout)
593
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
476
636
else:
477
return now < (self.last_checked_ok + self.timeout)
478
479
480
class ClientDBus(Client, dbus.service.Object):
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):
643
"""Decorators for marking methods of a DBusObjectWithProperties to
644
become properties on the D-Bus.
645
646
The decorated method will be called with no arguments by "Get"
647
and with one argument by "Set".
648
649
The parameters, where they are supported, are the same as
650
dbus.service.method, except there is only "signature", since the
651
type from Get() and the type sent to Set() is the same.
652
"""
653
# Encoding deeply encoded byte arrays is not supported yet by the
654
# "Set" method, so we fail early here:
655
if byte_arrays and signature != "ay":
656
raise ValueError("Byte arrays not supported for non-'ay'"
657
" signature %r" % signature)
658
def decorator(func):
659
func._dbus_is_property = True
660
func._dbus_interface = dbus_interface
661
func._dbus_signature = signature
662
func._dbus_access = access
663
func._dbus_name = func.__name__
664
if func._dbus_name.endswith("_dbus_property"):
665
func._dbus_name = func._dbus_name[:-14]
666
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
667
return func
668
return decorator
669
670
671
class DBusPropertyException(dbus.exceptions.DBusException):
672
"""A base class for D-Bus property-related exceptions
673
"""
674
def __unicode__(self):
675
return unicode(str(self))
676
677
678
class DBusPropertyAccessException(DBusPropertyException):
679
"""A property's access permissions disallows an operation.
680
"""
681
pass
682
683
684
class DBusPropertyNotFound(DBusPropertyException):
685
"""An attempt was made to access a non-existing property.
686
"""
687
pass
688
689
690
class DBusObjectWithProperties(dbus.service.Object):
691
"""A D-Bus object with properties.
692
693
Classes inheriting from this can use the dbus_service_property
694
decorator to expose methods as D-Bus properties. It exposes the
695
standard Get(), Set(), and GetAll() methods on the D-Bus.
696
"""
697
698
@staticmethod
699
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
701
702
def _get_all_dbus_properties(self):
703
"""Returns a generator of (name, attribute) pairs
704
"""
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
706
for cls in self.__class__.__mro__
707
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
709
710
def _get_dbus_property(self, interface_name, property_name):
711
"""Returns a bound method if one exists which is a D-Bus
712
property with the specified name and interface.
713
"""
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
721
# No such property
722
raise DBusPropertyNotFound(self.dbus_object_path + ":"
723
+ interface_name + "."
724
+ property_name)
725
726
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
727
out_signature="v")
728
def Get(self, interface_name, property_name):
729
"""Standard D-Bus property Get() method, see D-Bus standard.
730
"""
731
prop = self._get_dbus_property(interface_name, property_name)
732
if prop._dbus_access == "write":
733
raise DBusPropertyAccessException(property_name)
734
value = prop()
735
if not hasattr(value, "variant_level"):
736
return value
737
return type(value)(value, variant_level=value.variant_level+1)
738
739
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
740
def Set(self, interface_name, property_name, value):
741
"""Standard D-Bus property Set() method, see D-Bus standard.
742
"""
743
prop = self._get_dbus_property(interface_name, property_name)
744
if prop._dbus_access == "read":
745
raise DBusPropertyAccessException(property_name)
746
if prop._dbus_get_args_options["byte_arrays"]:
747
# The byte_arrays option is not supported yet on
748
# signatures other than "ay".
749
if prop._dbus_signature != "ay":
750
raise ValueError
751
value = dbus.ByteArray(''.join(unichr(byte)
752
for byte in value))
753
prop(value)
754
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
756
out_signature="a{sv}")
757
def GetAll(self, interface_name):
758
"""Standard D-Bus property GetAll() method, see D-Bus
759
standard.
760
761
Note: Will not include properties with access="write".
762
"""
763
all = {}
764
for name, prop in self._get_all_dbus_properties():
765
if (interface_name
766
and interface_name != prop._dbus_interface):
767
# Interface non-empty but did not match
768
continue
769
# Ignore write-only properties
770
if prop._dbus_access == "write":
771
continue
772
value = prop()
773
if not hasattr(value, "variant_level"):
774
all[name] = value
775
continue
776
all[name] = type(value)(value, variant_level=
777
value.variant_level+1)
778
return dbus.Dictionary(all, signature="sv")
779
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
781
out_signature="s",
782
path_keyword='object_path',
783
connection_keyword='connection')
784
def Introspect(self, object_path, connection):
785
"""Standard D-Bus method, overloaded to insert property tags.
786
"""
787
xmlstring = dbus.service.Object.Introspect(self, object_path,
788
connection)
789
try:
790
document = xml.dom.minidom.parseString(xmlstring)
791
def make_tag(document, name, prop):
792
e = document.createElement("property")
793
e.setAttribute("name", name)
794
e.setAttribute("type", prop._dbus_signature)
795
e.setAttribute("access", prop._dbus_access)
796
return e
797
for if_tag in document.getElementsByTagName("interface"):
798
for tag in (make_tag(document, name, prop)
799
for name, prop
800
in self._get_all_dbus_properties()
801
if prop._dbus_interface
802
== if_tag.getAttribute("name")):
803
if_tag.appendChild(tag)
804
# Add the names to the return values for the
805
# "org.freedesktop.DBus.Properties" methods
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")
820
document.unlink()
821
except (AttributeError, xml.dom.DOMException,
822
xml.parsers.expat.ExpatError) as error:
823
logger.error("Failed to override Introspection method",
824
error)
825
return xmlstring
826
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
932
class ClientDBus(Client, DBusObjectWithProperties):
481
933
"""A Client class using D-Bus
482
934
483
935
Attributes:
484
936
dbus_object_path: dbus.ObjectPath
485
937
bus: dbus.SystemBus()
486
938
"""
939
940
runtime_expansions = (Client.runtime_expansions
941
+ ("dbus_object_path",))
942
487
943
# dbus.service.Object doesn't use super(), so we can't either.
488
944
489
945
def __init__(self, bus = None, *args, **kwargs):
490
946
self.bus = bus
491
947
Client.__init__(self, *args, **kwargs)
948
949
self._approvals_pending = 0
492
950
# Only now, when this client is initialized, can it show up on
493
951
# the D-Bus
952
client_object_name = unicode(self.name).translate(
953
{ord("."): ord("_"),
954
ord("-"): ord("_")})
494
955
self.dbus_object_path = (dbus.ObjectPath
495
(u"/clients/"
496
+ self.name.replace(u".", u"_")))
497
dbus.service.Object.__init__(self, self.bus,
498
self.dbus_object_path)
499
500
@staticmethod
501
def _datetime_to_dbus(dt, variant_level=0):
502
"""Convert a UTC datetime.datetime() to a D-Bus type."""
503
return dbus.String(dt.isoformat(),
504
variant_level=variant_level)
505
506
def enable(self):
507
oldstate = getattr(self, u"enabled", False)
508
r = Client.enable(self)
509
if oldstate != self.enabled:
510
# Emit D-Bus signals
511
self.PropertyChanged(dbus.String(u"enabled"),
512
dbus.Boolean(True, variant_level=1))
513
self.PropertyChanged(
514
dbus.String(u"last_enabled"),
515
self._datetime_to_dbus(self.last_enabled,
516
variant_level=1))
517
return r
518
519
def disable(self, signal = True):
520
oldstate = getattr(self, u"enabled", False)
521
r = Client.disable(self)
522
if signal and oldstate != self.enabled:
523
# Emit D-Bus signal
524
self.PropertyChanged(dbus.String(u"enabled"),
525
dbus.Boolean(False, variant_level=1))
526
return r
956
("/clients/" + client_object_name))
957
DBusObjectWithProperties.__init__(self, self.bus,
958
self.dbus_object_path)
959
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.
965
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
527
1026
528
1027
def __del__(self, *args, **kwargs):
529
1028
try:
530
1029
self.remove_from_connection()
531
1030
except LookupError:
532
1031
pass
533
if hasattr(dbus.service.Object, u"__del__"):
534
dbus.service.Object.__del__(self, *args, **kwargs)
1032
if hasattr(DBusObjectWithProperties, "__del__"):
1033
DBusObjectWithProperties.__del__(self, *args, **kwargs)
535
1034
Client.__del__(self, *args, **kwargs)
536
1035
537
1036
def checker_callback(self, pid, condition, command,
538
1037
*args, **kwargs):
539
1038
self.checker_callback_tag = None
540
1039
self.checker = None
541
# Emit D-Bus signal
542
self.PropertyChanged(dbus.String(u"checker_running"),
543
dbus.Boolean(False, variant_level=1))
544
1040
if os.WIFEXITED(condition):
545
1041
exitstatus = os.WEXITSTATUS(condition)
546
1042
# Emit D-Bus signal
556
1052
return Client.checker_callback(self, pid, condition, command,
557
1053
*args, **kwargs)
558
1054
559
def checked_ok(self, *args, **kwargs):
560
r = Client.checked_ok(self, *args, **kwargs)
561
# Emit D-Bus signal
562
self.PropertyChanged(
563
dbus.String(u"last_checked_ok"),
564
(self._datetime_to_dbus(self.last_checked_ok,
565
variant_level=1)))
566
return r
567
568
1055
def start_checker(self, *args, **kwargs):
569
1056
old_checker = self.checker
570
1057
if self.checker is not None:
577
1064
and old_checker_pid != self.checker.pid):
578
1065
# Emit D-Bus signal
579
1066
self.CheckerStarted(self.current_checker_command)
580
self.PropertyChanged(
581
dbus.String(u"checker_running"),
582
dbus.Boolean(True, variant_level=1))
583
return r
584
585
def stop_checker(self, *args, **kwargs):
586
old_checker = getattr(self, u"checker", None)
587
r = Client.stop_checker(self, *args, **kwargs)
588
if (old_checker is not None
589
and getattr(self, u"checker", None) is None):
590
self.PropertyChanged(dbus.String(u"checker_running"),
591
dbus.Boolean(False, variant_level=1))
592
return r
593
594
## D-Bus methods & signals
595
_interface = u"se.bsnet.fukt.Mandos.Client"
596
597
# CheckedOK - method
598
@dbus.service.method(_interface)
599
def CheckedOK(self):
600
return self.checked_ok()
1067
return r
1068
1069
def _reset_approved(self):
1070
self._approved = None
1071
return False
1072
1073
def approve(self, value=True):
1074
self.send_changedstate()
1075
self._approved = value
1076
gobject.timeout_add(_timedelta_to_milliseconds
1077
(self.approval_duration),
1078
self._reset_approved)
1079
1080
1081
## D-Bus methods, signals & properties
1082
_interface = "se.recompile.Mandos.Client"
1083
1084
## Signals
601
1085
602
1086
# CheckerCompleted - signal
603
@dbus.service.signal(_interface, signature=u"nxs")
1087
@dbus.service.signal(_interface, signature="nxs")
604
1088
def CheckerCompleted(self, exitcode, waitstatus, command):
605
1089
"D-Bus signal"
606
1090
pass
607
1091
608
1092
# CheckerStarted - signal
609
@dbus.service.signal(_interface, signature=u"s")
1093
@dbus.service.signal(_interface, signature="s")
610
1094
def CheckerStarted(self, command):
611
1095
"D-Bus signal"
612
1096
pass
613
1097
614
# GetAllProperties - method
615
@dbus.service.method(_interface, out_signature=u"a{sv}")
616
def GetAllProperties(self):
617
"D-Bus method"
618
return dbus.Dictionary({
619
dbus.String(u"name"):
620
dbus.String(self.name, variant_level=1),
621
dbus.String(u"fingerprint"):
622
dbus.String(self.fingerprint, variant_level=1),
623
dbus.String(u"host"):
624
dbus.String(self.host, variant_level=1),
625
dbus.String(u"created"):
626
self._datetime_to_dbus(self.created,
627
variant_level=1),
628
dbus.String(u"last_enabled"):
629
(self._datetime_to_dbus(self.last_enabled,
630
variant_level=1)
631
if self.last_enabled is not None
632
else dbus.Boolean(False, variant_level=1)),
633
dbus.String(u"enabled"):
634
dbus.Boolean(self.enabled, variant_level=1),
635
dbus.String(u"last_checked_ok"):
636
(self._datetime_to_dbus(self.last_checked_ok,
637
variant_level=1)
638
if self.last_checked_ok is not None
639
else dbus.Boolean (False, variant_level=1)),
640
dbus.String(u"timeout"):
641
dbus.UInt64(self.timeout_milliseconds(),
642
variant_level=1),
643
dbus.String(u"interval"):
644
dbus.UInt64(self.interval_milliseconds(),
645
variant_level=1),
646
dbus.String(u"checker"):
647
dbus.String(self.checker_command,
648
variant_level=1),
649
dbus.String(u"checker_running"):
650
dbus.Boolean(self.checker is not None,
651
variant_level=1),
652
dbus.String(u"object_path"):
653
dbus.ObjectPath(self.dbus_object_path,
654
variant_level=1)
655
}, signature=u"sv")
656
657
# IsStillValid - method
658
@dbus.service.method(_interface, out_signature=u"b")
659
def IsStillValid(self):
660
return self.still_valid()
661
662
1098
# PropertyChanged - signal
663
@dbus.service.signal(_interface, signature=u"sv")
1099
@dbus.service.signal(_interface, signature="sv")
664
1100
def PropertyChanged(self, property, value):
665
1101
"D-Bus signal"
666
1102
pass
667
1103
668
# ReceivedSecret - signal
1104
# GotSecret - signal
669
1105
@dbus.service.signal(_interface)
670
def ReceivedSecret(self):
671
"D-Bus signal"
1106
def GotSecret(self):
1107
"""D-Bus signal
1108
Is sent after a successful transfer of secret from the Mandos
1109
server to mandos-client
1110
"""
672
1111
pass
673
1112
674
1113
# Rejected - signal
675
@dbus.service.signal(_interface)
676
def Rejected(self):
1114
@dbus.service.signal(_interface, signature="s")
1115
def Rejected(self, reason):
677
1116
"D-Bus signal"
678
1117
pass
679
1118
680
# SetChecker - method
681
@dbus.service.method(_interface, in_signature=u"s")
682
def SetChecker(self, checker):
683
"D-Bus setter method"
684
self.checker_command = checker
685
# Emit D-Bus signal
686
self.PropertyChanged(dbus.String(u"checker"),
687
dbus.String(self.checker_command,
688
variant_level=1))
689
690
# SetHost - method
691
@dbus.service.method(_interface, in_signature=u"s")
692
def SetHost(self, host):
693
"D-Bus setter method"
694
self.host = host
695
# Emit D-Bus signal
696
self.PropertyChanged(dbus.String(u"host"),
697
dbus.String(self.host, variant_level=1))
698
699
# SetInterval - method
700
@dbus.service.method(_interface, in_signature=u"t")
701
def SetInterval(self, milliseconds):
702
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
# Emit D-Bus signal
704
self.PropertyChanged(dbus.String(u"interval"),
705
(dbus.UInt64(self.interval_milliseconds(),
706
variant_level=1)))
707
708
# SetSecret - method
709
@dbus.service.method(_interface, in_signature=u"ay",
710
byte_arrays=True)
711
def SetSecret(self, secret):
712
"D-Bus setter method"
713
self.secret = str(secret)
714
715
# SetTimeout - method
716
@dbus.service.method(_interface, in_signature=u"t")
717
def SetTimeout(self, milliseconds):
718
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
719
# Emit D-Bus signal
720
self.PropertyChanged(dbus.String(u"timeout"),
721
(dbus.UInt64(self.timeout_milliseconds(),
722
variant_level=1)))
1119
# NeedApproval - signal
1120
@dbus.service.signal(_interface, signature="tb")
1121
def NeedApproval(self, timeout, default):
1122
"D-Bus signal"
1123
return self.need_approval()
1124
1125
## Methods
1126
1127
# Approve - method
1128
@dbus.service.method(_interface, in_signature="b")
1129
def Approve(self, value):
1130
self.approve(value)
1131
1132
# CheckedOK - method
1133
@dbus.service.method(_interface)
1134
def CheckedOK(self):
1135
self.checked_ok()
723
1136
724
1137
# Enable - method
725
1138
@dbus.service.method(_interface)
744
1157
def StopChecker(self):
745
1158
self.stop_checker()
746
1159
1160
## Properties
1161
1162
# ApprovalPending - property
1163
@dbus_service_property(_interface, signature="b", access="read")
1164
def ApprovalPending_dbus_property(self):
1165
return dbus.Boolean(bool(self.approvals_pending))
1166
1167
# ApprovedByDefault - property
1168
@dbus_service_property(_interface, signature="b",
1169
access="readwrite")
1170
def ApprovedByDefault_dbus_property(self, value=None):
1171
if value is None: # get
1172
return dbus.Boolean(self.approved_by_default)
1173
self.approved_by_default = bool(value)
1174
1175
# ApprovalDelay - property
1176
@dbus_service_property(_interface, signature="t",
1177
access="readwrite")
1178
def ApprovalDelay_dbus_property(self, value=None):
1179
if value is None: # get
1180
return dbus.UInt64(self.approval_delay_milliseconds())
1181
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1182
1183
# ApprovalDuration - property
1184
@dbus_service_property(_interface, signature="t",
1185
access="readwrite")
1186
def ApprovalDuration_dbus_property(self, value=None):
1187
if value is None: # get
1188
return dbus.UInt64(_timedelta_to_milliseconds(
1189
self.approval_duration))
1190
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1191
1192
# Name - property
1193
@dbus_service_property(_interface, signature="s", access="read")
1194
def Name_dbus_property(self):
1195
return dbus.String(self.name)
1196
1197
# Fingerprint - property
1198
@dbus_service_property(_interface, signature="s", access="read")
1199
def Fingerprint_dbus_property(self):
1200
return dbus.String(self.fingerprint)
1201
1202
# Host - property
1203
@dbus_service_property(_interface, signature="s",
1204
access="readwrite")
1205
def Host_dbus_property(self, value=None):
1206
if value is None: # get
1207
return dbus.String(self.host)
1208
self.host = value
1209
1210
# Created - property
1211
@dbus_service_property(_interface, signature="s", access="read")
1212
def Created_dbus_property(self):
1213
return dbus.String(datetime_to_dbus(self.created))
1214
1215
# LastEnabled - property
1216
@dbus_service_property(_interface, signature="s", access="read")
1217
def LastEnabled_dbus_property(self):
1218
return datetime_to_dbus(self.last_enabled)
1219
1220
# Enabled - property
1221
@dbus_service_property(_interface, signature="b",
1222
access="readwrite")
1223
def Enabled_dbus_property(self, value=None):
1224
if value is None: # get
1225
return dbus.Boolean(self.enabled)
1226
if value:
1227
self.enable()
1228
else:
1229
self.disable()
1230
1231
# LastCheckedOK - property
1232
@dbus_service_property(_interface, signature="s",
1233
access="readwrite")
1234
def LastCheckedOK_dbus_property(self, value=None):
1235
if value is not None:
1236
self.checked_ok()
1237
return
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)
1249
1250
# Timeout - property
1251
@dbus_service_property(_interface, signature="t",
1252
access="readwrite")
1253
def Timeout_dbus_property(self, value=None):
1254
if value is None: # get
1255
return dbus.UInt64(self.timeout_milliseconds())
1256
self.timeout = datetime.timedelta(0, 0, 0, value)
1257
if getattr(self, "disable_initiator_tag", None) is None:
1258
return
1259
# Reschedule timeout
1260
gobject.source_remove(self.disable_initiator_tag)
1261
self.disable_initiator_tag = None
1262
self.expires = None
1263
time_to_die = _timedelta_to_milliseconds((self
1264
.last_checked_ok
1265
+ self.timeout)
1266
- datetime.datetime
1267
.utcnow())
1268
if time_to_die <= 0:
1269
# The timeout has passed
1270
self.disable()
1271
else:
1272
self.expires = (datetime.datetime.utcnow()
1273
+ datetime.timedelta(milliseconds =
1274
time_to_die))
1275
self.disable_initiator_tag = (gobject.timeout_add
1276
(time_to_die, self.disable))
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
1286
# Interval - property
1287
@dbus_service_property(_interface, signature="t",
1288
access="readwrite")
1289
def Interval_dbus_property(self, value=None):
1290
if value is None: # get
1291
return dbus.UInt64(self.interval_milliseconds())
1292
self.interval = datetime.timedelta(0, 0, 0, value)
1293
if getattr(self, "checker_initiator_tag", None) is None:
1294
return
1295
# Reschedule checker run
1296
gobject.source_remove(self.checker_initiator_tag)
1297
self.checker_initiator_tag = (gobject.timeout_add
1298
(value, self.start_checker))
1299
self.start_checker() # Start one now, too
1300
1301
# Checker - property
1302
@dbus_service_property(_interface, signature="s",
1303
access="readwrite")
1304
def Checker_dbus_property(self, value=None):
1305
if value is None: # get
1306
return dbus.String(self.checker_command)
1307
self.checker_command = value
1308
1309
# CheckerRunning - property
1310
@dbus_service_property(_interface, signature="b",
1311
access="readwrite")
1312
def CheckerRunning_dbus_property(self, value=None):
1313
if value is None: # get
1314
return dbus.Boolean(self.checker is not None)
1315
if value:
1316
self.start_checker()
1317
else:
1318
self.stop_checker()
1319
1320
# ObjectPath - property
1321
@dbus_service_property(_interface, signature="o", access="read")
1322
def ObjectPath_dbus_property(self):
1323
return self.dbus_object_path # is already a dbus.ObjectPath
1324
1325
# Secret = property
1326
@dbus_service_property(_interface, signature="ay",
1327
access="write", byte_arrays=True)
1328
def Secret_dbus_property(self, value):
1329
self.secret = str(value)
1330
747
1331
del _interface
748
1332
749
1333
1334
class ProxyClient(object):
1335
def __init__(self, child_pipe, fpr, address):
1336
self._pipe = child_pipe
1337
self._pipe.send(('init', fpr, address))
1338
if not self._pipe.recv():
1339
raise KeyError()
1340
1341
def __getattribute__(self, name):
1342
if(name == '_pipe'):
1343
return super(ProxyClient, self).__getattribute__(name)
1344
self._pipe.send(('getattr', name))
1345
data = self._pipe.recv()
1346
if data[0] == 'data':
1347
return data[1]
1348
if data[0] == 'function':
1349
def func(*args, **kwargs):
1350
self._pipe.send(('funcall', name, args, kwargs))
1351
return self._pipe.recv()[1]
1352
return func
1353
1354
def __setattr__(self, name, value):
1355
if(name == '_pipe'):
1356
return super(ProxyClient, self).__setattr__(name, value)
1357
self._pipe.send(('setattr', name, value))
1358
1359
class ClientDBusTransitional(ClientDBus):
1360
__metaclass__ = AlternateDBusNamesMetaclass
1361
750
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
751
1363
"""A class to handle client connections.
752
1364
754
1366
Note: This will run in its own forked process."""
755
1367
756
1368
def handle(self):
757
logger.info(u"TCP connection from: %s",
758
unicode(self.client_address))
759
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
# Open IPC pipe to parent process
761
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1369
with contextlib.closing(self.server.child_pipe) as child_pipe:
1370
logger.info("TCP connection from: %s",
1371
unicode(self.client_address))
1372
logger.debug("Pipe FD: %d",
1373
self.server.child_pipe.fileno())
1374
762
1375
session = (gnutls.connection
763
1376
.ClientSession(self.request,
764
1377
gnutls.connection
765
1378
.X509Credentials()))
766
1379
767
line = self.request.makefile().readline()
768
logger.debug(u"Protocol version: %r", line)
769
try:
770
if int(line.strip().split()[0]) > 1:
771
raise RuntimeError
772
except (ValueError, IndexError, RuntimeError), error:
773
logger.error(u"Unknown protocol version: %s", error)
774
return
775
776
1380
# Note: gnutls.connection.X509Credentials is really a
777
1381
# generic GnuTLS certificate credentials object so long as
778
1382
# no X.509 keys are added to it. Therefore, we can use it
779
1383
# here despite using OpenPGP certificates.
780
1384
781
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
782
# u"+AES-256-CBC", u"+SHA1",
783
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
784
# u"+DHE-DSS"))
1385
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1386
# "+AES-256-CBC", "+SHA1",
1387
# "+COMP-NULL", "+CTYPE-OPENPGP",
1388
# "+DHE-DSS"))
785
1389
# Use a fallback default, since this MUST be set.
786
1390
priority = self.server.gnutls_priority
787
1391
if priority is None:
788
priority = u"NORMAL"
1392
priority = "NORMAL"
789
1393
(gnutls.library.functions
790
1394
.gnutls_priority_set_direct(session._c_object,
791
1395
priority, None))
792
1396
1397
# Start communication using the Mandos protocol
1398
# Get protocol number
1399
line = self.request.makefile().readline()
1400
logger.debug("Protocol version: %r", line)
1401
try:
1402
if int(line.strip().split()[0]) > 1:
1403
raise RuntimeError
1404
except (ValueError, IndexError, RuntimeError) as error:
1405
logger.error("Unknown protocol version: %s", error)
1406
return
1407
1408
# Start GnuTLS connection
793
1409
try:
794
1410
session.handshake()
795
except gnutls.errors.GNUTLSError, error:
796
logger.warning(u"Handshake failed: %s", error)
1411
except gnutls.errors.GNUTLSError as error:
1412
logger.warning("Handshake failed: %s", error)
797
1413
# Do not run session.bye() here: the session is not
798
1414
# established. Just abandon the request.
799
1415
return
800
logger.debug(u"Handshake succeeded")
1416
logger.debug("Handshake succeeded")
1417
1418
approval_required = False
801
1419
try:
802
fpr = self.fingerprint(self.peer_certificate(session))
803
except (TypeError, gnutls.errors.GNUTLSError), error:
804
logger.warning(u"Bad certificate: %s", error)
805
session.bye()
806
return
807
logger.debug(u"Fingerprint: %s", fpr)
1420
try:
1421
fpr = self.fingerprint(self.peer_certificate
1422
(session))
1423
except (TypeError,
1424
gnutls.errors.GNUTLSError) as error:
1425
logger.warning("Bad certificate: %s", error)
1426
return
1427
logger.debug("Fingerprint: %s", fpr)
1428
1429
try:
1430
client = ProxyClient(child_pipe, fpr,
1431
self.client_address)
1432
except KeyError:
1433
return
1434
1435
if client.approval_delay:
1436
delay = client.approval_delay
1437
client.approvals_pending += 1
1438
approval_required = True
1439
1440
while True:
1441
if not client.enabled:
1442
logger.info("Client %s is disabled",
1443
client.name)
1444
if self.server.use_dbus:
1445
# Emit D-Bus signal
1446
client.Rejected("Disabled")
1447
return
1448
1449
if client._approved or not client.approval_delay:
1450
#We are approved or approval is disabled
1451
break
1452
elif client._approved is None:
1453
logger.info("Client %s needs approval",
1454
client.name)
1455
if self.server.use_dbus:
1456
# Emit D-Bus signal
1457
client.NeedApproval(
1458
client.approval_delay_milliseconds(),
1459
client.approved_by_default)
1460
else:
1461
logger.warning("Client %s was not approved",
1462
client.name)
1463
if self.server.use_dbus:
1464
# Emit D-Bus signal
1465
client.Rejected("Denied")
1466
return
1467
1468
#wait until timeout or approved
1469
time = datetime.datetime.now()
1470
client.changedstate.acquire()
1471
(client.changedstate.wait
1472
(float(client._timedelta_to_milliseconds(delay)
1473
/ 1000)))
1474
client.changedstate.release()
1475
time2 = datetime.datetime.now()
1476
if (time2 - time) >= delay:
1477
if not client.approved_by_default:
1478
logger.warning("Client %s timed out while"
1479
" waiting for approval",
1480
client.name)
1481
if self.server.use_dbus:
1482
# Emit D-Bus signal
1483
client.Rejected("Approval timed out")
1484
return
1485
else:
1486
break
1487
else:
1488
delay -= time2 - time
1489
1490
sent_size = 0
1491
while sent_size < len(client.secret):
1492
try:
1493
sent = session.send(client.secret[sent_size:])
1494
except gnutls.errors.GNUTLSError as error:
1495
logger.warning("gnutls send failed")
1496
return
1497
logger.debug("Sent: %d, remaining: %d",
1498
sent, len(client.secret)
1499
- (sent_size + sent))
1500
sent_size += sent
1501
1502
logger.info("Sending secret to %s", client.name)
1503
# bump the timeout using extended_timeout
1504
client.checked_ok(client.extended_timeout)
1505
if self.server.use_dbus:
1506
# Emit D-Bus signal
1507
client.GotSecret()
808
1508
809
for c in self.server.clients:
810
if c.fingerprint == fpr:
811
client = c
812
break
813
else:
814
ipc.write(u"NOTFOUND %s %s\n"
815
% (fpr, unicode(self.client_address)))
816
session.bye()
817
return
818
# Have to check if client.still_valid(), since it is
819
# possible that the client timed out while establishing
820
# the GnuTLS session.
821
if not client.still_valid():
822
ipc.write(u"INVALID %s\n" % client.name)
823
session.bye()
824
return
825
ipc.write(u"SENDING %s\n" % client.name)
826
sent_size = 0
827
while sent_size < len(client.secret):
828
sent = session.send(client.secret[sent_size:])
829
logger.debug(u"Sent: %d, remaining: %d",
830
sent, len(client.secret)
831
- (sent_size + sent))
832
sent_size += sent
833
session.bye()
1509
finally:
1510
if approval_required:
1511
client.approvals_pending -= 1
1512
try:
1513
session.bye()
1514
except gnutls.errors.GNUTLSError as error:
1515
logger.warning("GnuTLS bye failed")
834
1516
835
1517
@staticmethod
836
1518
def peer_certificate(session):
846
1528
.gnutls_certificate_get_peers
847
1529
(session._c_object, ctypes.byref(list_size)))
848
1530
if not bool(cert_list) and list_size.value != 0:
849
raise gnutls.errors.GNUTLSError(u"error getting peer"
850
u" certificate")
1531
raise gnutls.errors.GNUTLSError("error getting peer"
1532
" certificate")
851
1533
if list_size.value == 0:
852
1534
return None
853
1535
cert = cert_list[0]
879
1561
if crtverify.value != 0:
880
1562
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
881
1563
raise (gnutls.errors.CertificateSecurityError
882
(u"Verify failed"))
1564
("Verify failed"))
883
1565
# New buffer for the fingerprint
884
1566
buf = ctypes.create_string_buffer(20)
885
1567
buf_len = ctypes.c_size_t()
892
1574
# Convert the buffer to a Python bytestring
893
1575
fpr = ctypes.string_at(buf, buf_len.value)
894
1576
# Convert the bytestring to hexadecimal notation
895
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1577
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
896
1578
return hex_fpr
897
1579
898
1580
899
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
900
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1581
class MultiprocessingMixIn(object):
1582
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1583
def sub_process_main(self, request, address):
1584
try:
1585
self.finish_request(request, address)
1586
except:
1587
self.handle_error(request, address)
1588
self.close_request(request)
1589
1590
def process_request(self, request, address):
1591
"""Start a new process to process the request."""
1592
proc = multiprocessing.Process(target = self.sub_process_main,
1593
args = (request,
1594
address))
1595
proc.start()
1596
return proc
1597
1598
1599
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1600
""" adds a pipe to the MixIn """
901
1601
def process_request(self, request, client_address):
902
1602
"""Overrides and wraps the original process_request().
903
1603
904
1604
This function creates a new pipe in self.pipe
905
1605
"""
906
self.pipe = os.pipe()
907
super(ForkingMixInWithPipe,
908
self).process_request(request, client_address)
909
os.close(self.pipe[1]) # close write end
910
self.add_pipe(self.pipe[0])
911
def add_pipe(self, pipe):
1606
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1607
1608
proc = MultiprocessingMixIn.process_request(self, request,
1609
client_address)
1610
self.child_pipe.close()
1611
self.add_pipe(parent_pipe, proc)
1612
1613
def add_pipe(self, parent_pipe, proc):
912
1614
"""Dummy function; override as necessary"""
913
os.close(pipe)
914
915
916
class IPv6_TCPServer(ForkingMixInWithPipe,
1615
raise NotImplementedError
1616
1617
1618
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
917
1619
socketserver.TCPServer, object):
918
1620
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
919
1621
935
1637
bind to an address or port if they were not specified."""
936
1638
if self.interface is not None:
937
1639
if SO_BINDTODEVICE is None:
938
logger.error(u"SO_BINDTODEVICE does not exist;"
939
u" cannot bind to interface %s",
1640
logger.error("SO_BINDTODEVICE does not exist;"
1641
" cannot bind to interface %s",
940
1642
self.interface)
941
1643
else:
942
1644
try:
943
1645
self.socket.setsockopt(socket.SOL_SOCKET,
944
1646
SO_BINDTODEVICE,
945
1647
str(self.interface
946
+ u'\0'))
947
except socket.error, error:
1648
+ '\0'))
1649
except socket.error as error:
948
1650
if error[0] == errno.EPERM:
949
logger.error(u"No permission to"
950
u" bind to interface %s",
1651
logger.error("No permission to"
1652
" bind to interface %s",
951
1653
self.interface)
952
1654
elif error[0] == errno.ENOPROTOOPT:
953
logger.error(u"SO_BINDTODEVICE not available;"
954
u" cannot bind to interface %s",
1655
logger.error("SO_BINDTODEVICE not available;"
1656
" cannot bind to interface %s",
955
1657
self.interface)
956
1658
else:
957
1659
raise
959
1661
if self.server_address[0] or self.server_address[1]:
960
1662
if not self.server_address[0]:
961
1663
if self.address_family == socket.AF_INET6:
962
any_address = u"::" # in6addr_any
1664
any_address = "::" # in6addr_any
963
1665
else:
964
1666
any_address = socket.INADDR_ANY
965
1667
self.server_address = (any_address,
992
1694
self.enabled = False
993
1695
self.clients = clients
994
1696
if self.clients is None:
995
self.clients = set()
1697
self.clients = {}
996
1698
self.use_dbus = use_dbus
997
1699
self.gnutls_priority = gnutls_priority
998
1700
IPv6_TCPServer.__init__(self, server_address,
1002
1704
def server_activate(self):
1003
1705
if self.enabled:
1004
1706
return socketserver.TCPServer.server_activate(self)
1707
1005
1708
def enable(self):
1006
1709
self.enabled = True
1007
def add_pipe(self, pipe):
1710
1711
def add_pipe(self, parent_pipe, proc):
1008
1712
# Call "handle_ipc" for both data and EOF events
1009
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1010
self.handle_ipc)
1011
def handle_ipc(self, source, condition, file_objects={}):
1713
gobject.io_add_watch(parent_pipe.fileno(),
1714
gobject.IO_IN | gobject.IO_HUP,
1715
functools.partial(self.handle_ipc,
1716
parent_pipe =
1717
parent_pipe,
1718
proc = proc))
1719
1720
def handle_ipc(self, source, condition, parent_pipe=None,
1721
proc = None, client_object=None):
1012
1722
condition_names = {
1013
gobject.IO_IN: u"IN", # There is data to read.
1014
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
1015
1725
# blocking).
1016
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1017
gobject.IO_ERR: u"ERR", # Error condition.
1018
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
1019
1729
# broken, usually for pipes and
1020
1730
# sockets).
1021
1731
}
1023
1733
for cond, name in
1024
1734
condition_names.iteritems()
1025
1735
if cond & condition)
1026
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1027
conditions_string)
1028
1029
# Turn the pipe file descriptor into a Python file object
1030
if source not in file_objects:
1031
file_objects[source] = os.fdopen(source, u"r", 1)
1032
1033
# Read a line from the file object
1034
cmdline = file_objects[source].readline()
1035
if not cmdline: # Empty line means end of file
1036
# close the IPC pipe
1037
file_objects[source].close()
1038
del file_objects[source]
1039
1040
# Stop calling this function
1041
return False
1042
1043
logger.debug(u"IPC command: %r", cmdline)
1044
1045
# Parse and act on command
1046
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1047
1048
if cmd == u"NOTFOUND":
1049
logger.warning(u"Client not found for fingerprint: %s",
1050
args)
1051
if self.use_dbus:
1052
# Emit D-Bus signal
1053
mandos_dbus_service.ClientNotFound(args)
1054
elif cmd == u"INVALID":
1055
for client in self.clients:
1056
if client.name == args:
1057
logger.warning(u"Client %s is invalid", args)
1058
if self.use_dbus:
1059
# Emit D-Bus signal
1060
client.Rejected()
1061
break
1062
else:
1063
logger.error(u"Unknown client %s is invalid", args)
1064
elif cmd == u"SENDING":
1065
for client in self.clients:
1066
if client.name == args:
1067
logger.info(u"Sending secret to %s", client.name)
1068
client.checked_ok()
1069
if self.use_dbus:
1070
# Emit D-Bus signal
1071
client.ReceivedSecret()
1072
break
1073
else:
1074
logger.error(u"Sending secret to unknown client %s",
1075
args)
1076
else:
1077
logger.error(u"Unknown IPC command: %r", cmdline)
1078
1079
# Keep calling this function
1736
# error, or the other end of multiprocessing.Pipe has closed
1737
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1738
# Wait for other process to exit
1739
proc.join()
1740
return False
1741
1742
# Read a request from the child
1743
request = parent_pipe.recv()
1744
command = request[0]
1745
1746
if command == 'init':
1747
fpr = request[1]
1748
address = request[2]
1749
1750
for c in self.clients.itervalues():
1751
if c.fingerprint == fpr:
1752
client = c
1753
break
1754
else:
1755
logger.info("Client not found for fingerprint: %s, ad"
1756
"dress: %s", fpr, address)
1757
if self.use_dbus:
1758
# Emit D-Bus signal
1759
mandos_dbus_service.ClientNotFound(fpr,
1760
address[0])
1761
parent_pipe.send(False)
1762
return False
1763
1764
gobject.io_add_watch(parent_pipe.fileno(),
1765
gobject.IO_IN | gobject.IO_HUP,
1766
functools.partial(self.handle_ipc,
1767
parent_pipe =
1768
parent_pipe,
1769
proc = proc,
1770
client_object =
1771
client))
1772
parent_pipe.send(True)
1773
# remove the old hook in favor of the new above hook on
1774
# same fileno
1775
return False
1776
if command == 'funcall':
1777
funcname = request[1]
1778
args = request[2]
1779
kwargs = request[3]
1780
1781
parent_pipe.send(('data', getattr(client_object,
1782
funcname)(*args,
1783
**kwargs)))
1784
1785
if command == 'getattr':
1786
attrname = request[1]
1787
if callable(client_object.__getattribute__(attrname)):
1788
parent_pipe.send(('function',))
1789
else:
1790
parent_pipe.send(('data', client_object
1791
.__getattribute__(attrname)))
1792
1793
if command == 'setattr':
1794
attrname = request[1]
1795
value = request[2]
1796
setattr(client_object, attrname, value)
1797
1080
1798
return True
1081
1799
1082
1800
1083
1801
def string_to_delta(interval):
1084
1802
"""Parse a string and return a datetime.timedelta
1085
1803
1086
>>> string_to_delta(u'7d')
1804
>>> string_to_delta('7d')
1087
1805
datetime.timedelta(7)
1088
>>> string_to_delta(u'60s')
1806
>>> string_to_delta('60s')
1089
1807
datetime.timedelta(0, 60)
1090
>>> string_to_delta(u'60m')
1808
>>> string_to_delta('60m')
1091
1809
datetime.timedelta(0, 3600)
1092
>>> string_to_delta(u'24h')
1810
>>> string_to_delta('24h')
1093
1811
datetime.timedelta(1)
1094
>>> string_to_delta(u'1w')
1812
>>> string_to_delta('1w')
1095
1813
datetime.timedelta(7)
1096
>>> string_to_delta(u'5m 30s')
1814
>>> string_to_delta('5m 30s')
1097
1815
datetime.timedelta(0, 330)
1098
1816
"""
1099
1817
timevalue = datetime.timedelta(0)
1101
1819
try:
1102
1820
suffix = unicode(s[-1])
1103
1821
value = int(s[:-1])
1104
if suffix == u"d":
1822
if suffix == "d":
1105
1823
delta = datetime.timedelta(value)
1106
elif suffix == u"s":
1824
elif suffix == "s":
1107
1825
delta = datetime.timedelta(0, value)
1108
elif suffix == u"m":
1826
elif suffix == "m":
1109
1827
delta = datetime.timedelta(0, 0, 0, 0, value)
1110
elif suffix == u"h":
1828
elif suffix == "h":
1111
1829
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1112
elif suffix == u"w":
1830
elif suffix == "w":
1113
1831
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1114
1832
else:
1115
raise ValueError
1116
except (ValueError, IndexError):
1117
raise ValueError
1833
raise ValueError("Unknown suffix %r" % suffix)
1834
except (ValueError, IndexError) as e:
1835
raise ValueError(*(e.args))
1118
1836
timevalue += delta
1119
1837
return timevalue
1120
1838
1126
1844
global if_nametoindex
1127
1845
try:
1128
1846
if_nametoindex = (ctypes.cdll.LoadLibrary
1129
(ctypes.util.find_library(u"c"))
1847
(ctypes.util.find_library("c"))
1130
1848
.if_nametoindex)
1131
1849
except (OSError, AttributeError):
1132
logger.warning(u"Doing if_nametoindex the hard way")
1850
logger.warning("Doing if_nametoindex the hard way")
1133
1851
def if_nametoindex(interface):
1134
1852
"Get an interface index the hard way, i.e. using fcntl()"
1135
1853
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1136
with closing(socket.socket()) as s:
1854
with contextlib.closing(socket.socket()) as s:
1137
1855
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1138
struct.pack(str(u"16s16x"),
1856
struct.pack(str("16s16x"),
1139
1857
interface))
1140
interface_index = struct.unpack(str(u"I"),
1858
interface_index = struct.unpack(str("I"),
1141
1859
ifreq[16:20])[0]
1142
1860
return interface_index
1143
1861
return if_nametoindex(interface)
1151
1869
sys.exit()
1152
1870
os.setsid()
1153
1871
if not nochdir:
1154
os.chdir(u"/")
1872
os.chdir("/")
1155
1873
if os.fork():
1156
1874
sys.exit()
1157
1875
if not noclose:
1159
1877
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1160
1878
if not stat.S_ISCHR(os.fstat(null).st_mode):
1161
1879
raise OSError(errno.ENODEV,
1162
u"/dev/null not a character device")
1880
"%s not a character device"
1881
% os.path.devnull)
1163
1882
os.dup2(null, sys.stdin.fileno())
1164
1883
os.dup2(null, sys.stdout.fileno())
1165
1884
os.dup2(null, sys.stderr.fileno())
1169
1888
1170
1889
def main():
1171
1890
1172
######################################################################
1891
##################################################################
1173
1892
# Parsing of options, both command line and config file
1174
1893
1175
parser = optparse.OptionParser(version = "%%prog %s" % version)
1176
parser.add_option("-i", u"--interface", type=u"string",
1177
metavar="IF", help=u"Bind to interface IF")
1178
parser.add_option("-a", u"--address", type=u"string",
1179
help=u"Address to listen for requests on")
1180
parser.add_option("-p", u"--port", type=u"int",
1181
help=u"Port number to receive requests on")
1182
parser.add_option("--check", action=u"store_true",
1183
help=u"Run self-test")
1184
parser.add_option("--debug", action=u"store_true",
1185
help=u"Debug mode; run in foreground and log to"
1186
u" terminal")
1187
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1188
u" priority string (see GnuTLS documentation)")
1189
parser.add_option("--servicename", type=u"string",
1190
metavar=u"NAME", help=u"Zeroconf service name")
1191
parser.add_option("--configdir", type=u"string",
1192
default=u"/etc/mandos", metavar=u"DIR",
1193
help=u"Directory to search for configuration"
1194
u" files")
1195
parser.add_option("--no-dbus", action=u"store_false",
1196
dest=u"use_dbus", help=u"Do not provide D-Bus"
1197
u" system bus interface")
1198
parser.add_option("--no-ipv6", action=u"store_false",
1199
dest=u"use_ipv6", help=u"Do not use IPv6")
1200
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()
1201
1929
1202
1930
if options.check:
1203
1931
import doctest
1205
1933
sys.exit()
1206
1934
1207
1935
# Default values for config file for server-global settings
1208
server_defaults = { u"interface": u"",
1209
u"address": u"",
1210
u"port": u"",
1211
u"debug": u"False",
1212
u"priority":
1213
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1214
u"servicename": u"Mandos",
1215
u"use_dbus": u"True",
1216
u"use_ipv6": u"True",
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": "",
1217
1946
}
1218
1947
1219
1948
# Parse config file for server-global settings
1220
1949
server_config = configparser.SafeConfigParser(server_defaults)
1221
1950
del server_defaults
1222
1951
server_config.read(os.path.join(options.configdir,
1223
u"mandos.conf"))
1952
"mandos.conf"))
1224
1953
# Convert the SafeConfigParser object to a dict
1225
1954
server_settings = server_config.defaults()
1226
1955
# Use the appropriate methods on the non-string config options
1227
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1228
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",
1229
1958
option)
1230
1959
if server_settings["port"]:
1231
server_settings["port"] = server_config.getint(u"DEFAULT",
1232
u"port")
1960
server_settings["port"] = server_config.getint("DEFAULT",
1961
"port")
1233
1962
del server_config
1234
1963
1235
1964
# Override the settings from the config file with command line
1236
1965
# options, if set.
1237
for option in (u"interface", u"address", u"port", u"debug",
1238
u"priority", u"servicename", u"configdir",
1239
u"use_dbus", u"use_ipv6"):
1966
for option in ("interface", "address", "port", "debug",
1967
"priority", "servicename", "configdir",
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
1240
1969
value = getattr(options, option)
1241
1970
if value is not None:
1242
1971
server_settings[option] = value
1250
1979
##################################################################
1251
1980
1252
1981
# For convenience
1253
debug = server_settings[u"debug"]
1254
use_dbus = server_settings[u"use_dbus"]
1255
use_ipv6 = server_settings[u"use_ipv6"]
1256
1257
if not debug:
1258
syslogger.setLevel(logging.WARNING)
1259
console.setLevel(logging.WARNING)
1260
1261
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":
1262
1988
syslogger.setFormatter(logging.Formatter
1263
(u'Mandos (%s) [%%(process)d]:'
1264
u' %%(levelname)s: %%(message)s'
1265
% server_settings[u"servicename"]))
1989
('Mandos (%s) [%%(process)d]:'
1990
' %%(levelname)s: %%(message)s'
1991
% server_settings["servicename"]))
1266
1992
1267
1993
# Parse config file with clients
1268
client_defaults = { u"timeout": u"1h",
1269
u"interval": u"5m",
1270
u"checker": u"fping -q -- %%(host)s",
1271
u"host": u"",
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",
1272
2001
}
1273
2002
client_config = configparser.SafeConfigParser(client_defaults)
1274
client_config.read(os.path.join(server_settings[u"configdir"],
1275
u"clients.conf"))
2003
client_config.read(os.path.join(server_settings["configdir"],
2004
"clients.conf"))
1276
2005
1277
2006
global mandos_dbus_service
1278
2007
mandos_dbus_service = None
1279
2008
1280
tcp_server = MandosServer((server_settings[u"address"],
1281
server_settings[u"port"]),
2009
tcp_server = MandosServer((server_settings["address"],
2010
server_settings["port"]),
1282
2011
ClientHandler,
1283
interface=server_settings[u"interface"],
2012
interface=(server_settings["interface"]
2013
or None),
1284
2014
use_ipv6=use_ipv6,
1285
2015
gnutls_priority=
1286
server_settings[u"priority"],
2016
server_settings["priority"],
1287
2017
use_dbus=use_dbus)
1288
pidfilename = u"/var/run/mandos.pid"
1289
try:
1290
pidfile = open(pidfilename, u"w")
1291
except IOError:
1292
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)
1293
2024
1294
2025
try:
1295
uid = pwd.getpwnam(u"_mandos").pw_uid
1296
gid = pwd.getpwnam(u"_mandos").pw_gid
2026
uid = pwd.getpwnam("_mandos").pw_uid
2027
gid = pwd.getpwnam("_mandos").pw_gid
1297
2028
except KeyError:
1298
2029
try:
1299
uid = pwd.getpwnam(u"mandos").pw_uid
1300
gid = pwd.getpwnam(u"mandos").pw_gid
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
1301
2032
except KeyError:
1302
2033
try:
1303
uid = pwd.getpwnam(u"nobody").pw_uid
1304
gid = pwd.getpwnam(u"nobody").pw_gid
2034
uid = pwd.getpwnam("nobody").pw_uid
2035
gid = pwd.getpwnam("nobody").pw_gid
1305
2036
except KeyError:
1306
2037
uid = 65534
1307
2038
gid = 65534
1308
2039
try:
1309
2040
os.setgid(gid)
1310
2041
os.setuid(uid)
1311
except OSError, error:
2042
except OSError as error:
1312
2043
if error[0] != errno.EPERM:
1313
2044
raise error
1314
2045
1315
# Enable all possible GnuTLS debugging
2046
if not debug and not debuglevel:
2047
logger.setLevel(logging.WARNING)
2048
if debuglevel:
2049
level = getattr(logging, debuglevel.upper())
2050
logger.setLevel(level)
2051
1316
2052
if debug:
2053
logger.setLevel(logging.DEBUG)
2054
# Enable all possible GnuTLS debugging
2055
1317
2056
# "Use a log level over 10 to enable all debugging options."
1318
2057
# - GnuTLS manual
1319
2058
gnutls.library.functions.gnutls_global_set_log_level(11)
1320
2059
1321
2060
@gnutls.library.types.gnutls_log_func
1322
2061
def debug_gnutls(level, string):
1323
logger.debug(u"GnuTLS: %s", string[:-1])
2062
logger.debug("GnuTLS: %s", string[:-1])
1324
2063
1325
2064
(gnutls.library.functions
1326
2065
.gnutls_global_set_log_function(debug_gnutls))
2066
2067
# Redirect stdin so all checkers get /dev/null
2068
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2069
os.dup2(null, sys.stdin.fileno())
2070
if null > 2:
2071
os.close(null)
2072
else:
2073
# No console logging
2074
logger.removeHandler(console)
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()
1327
2080
1328
2081
global main_loop
1329
2082
# From the Avahi example code
1332
2085
bus = dbus.SystemBus()
1333
2086
# End of Avahi example code
1334
2087
if use_dbus:
1335
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
2088
try:
2089
bus_name = dbus.service.BusName("se.recompile.Mandos",
2090
bus, do_not_queue=True)
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")
2096
use_dbus = False
2097
server_settings["use_dbus"] = False
2098
tcp_server.use_dbus = False
1336
2099
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1337
service = AvahiService(name = server_settings[u"servicename"],
1338
servicetype = u"_mandos._tcp",
1339
protocol = protocol, bus = bus)
2100
service = AvahiServiceToSyslog(name =
2101
server_settings["servicename"],
2102
servicetype = "_mandos._tcp",
2103
protocol = protocol, bus = bus)
1340
2104
if server_settings["interface"]:
1341
2105
service.interface = (if_nametoindex
1342
(str(server_settings[u"interface"])))
2106
(str(server_settings["interface"])))
2107
2108
global multiprocessing_manager
2109
multiprocessing_manager = multiprocessing.Manager()
1343
2110
1344
2111
client_class = Client
1345
2112
if use_dbus:
1346
client_class = functools.partial(ClientDBus, bus = bus)
1347
tcp_server.clients.update(set(
1348
client_class(name = section,
1349
config= dict(client_config.items(section)))
1350
for section in client_config.sections()))
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():
2156
try:
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)
2162
except KeyError:
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]))
2209
2210
1351
2211
if not tcp_server.clients:
1352
logger.warning(u"No clients defined")
1353
1354
if debug:
1355
# Redirect stdin so all checkers get /dev/null
1356
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1357
os.dup2(null, sys.stdin.fileno())
1358
if null > 2:
1359
os.close(null)
1360
else:
1361
# No console logging
1362
logger.removeHandler(console)
1363
# Close all input and output, do double fork, etc.
1364
daemon()
1365
1366
try:
1367
with closing(pidfile):
1368
pid = os.getpid()
1369
pidfile.write(str(pid) + "\n")
1370
del pidfile
1371
except IOError:
1372
logger.error(u"Could not write to file %r with PID %d",
1373
pidfilename, pid)
1374
except NameError:
1375
# "pidfile" was never created
1376
pass
1377
del pidfilename
1378
1379
def cleanup():
1380
"Cleanup function; run on exit"
1381
service.cleanup()
2212
logger.warning("No clients defined")
1382
2213
1383
while tcp_server.clients:
1384
client = tcp_server.clients.pop()
1385
client.disable_hook = None
1386
client.disable()
1387
1388
atexit.register(cleanup)
1389
1390
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
1391
2228
signal.signal(signal.SIGINT, signal.SIG_IGN)
2229
1392
2230
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1393
2231
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1394
2232
1396
2234
class MandosDBusService(dbus.service.Object):
1397
2235
"""A D-Bus proxy object"""
1398
2236
def __init__(self):
1399
dbus.service.Object.__init__(self, bus, u"/")
1400
_interface = u"se.bsnet.fukt.Mandos"
1401
1402
@dbus.service.signal(_interface, signature=u"oa{sv}")
1403
def ClientAdded(self, objpath, properties):
1404
"D-Bus signal"
1405
pass
1406
1407
@dbus.service.signal(_interface, signature=u"s")
1408
def ClientNotFound(self, fingerprint):
1409
"D-Bus signal"
1410
pass
1411
1412
@dbus.service.signal(_interface, signature=u"os")
2237
dbus.service.Object.__init__(self, bus, "/")
2238
_interface = "se.recompile.Mandos"
2239
2240
@dbus.service.signal(_interface, signature="o")
2241
def ClientAdded(self, objpath):
2242
"D-Bus signal"
2243
pass
2244
2245
@dbus.service.signal(_interface, signature="ss")
2246
def ClientNotFound(self, fingerprint, address):
2247
"D-Bus signal"
2248
pass
2249
2250
@dbus.service.signal(_interface, signature="os")
1413
2251
def ClientRemoved(self, objpath, name):
1414
2252
"D-Bus signal"
1415
2253
pass
1416
2254
1417
@dbus.service.method(_interface, out_signature=u"ao")
2255
@dbus.service.method(_interface, out_signature="ao")
1418
2256
def GetAllClients(self):
1419
2257
"D-Bus method"
1420
2258
return dbus.Array(c.dbus_object_path
1421
for c in tcp_server.clients)
2259
for c in
2260
tcp_server.clients.itervalues())
1422
2261
1423
2262
@dbus.service.method(_interface,
1424
out_signature=u"a{oa{sv}}")
2263
out_signature="a{oa{sv}}")
1425
2264
def GetAllClientsWithProperties(self):
1426
2265
"D-Bus method"
1427
2266
return dbus.Dictionary(
1428
((c.dbus_object_path, c.GetAllProperties())
1429
for c in tcp_server.clients),
1430
signature=u"oa{sv}")
2267
((c.dbus_object_path, c.GetAll(""))
2268
for c in tcp_server.clients.itervalues()),
2269
signature="oa{sv}")
1431
2270
1432
@dbus.service.method(_interface, in_signature=u"o")
2271
@dbus.service.method(_interface, in_signature="o")
1433
2272
def RemoveClient(self, object_path):
1434
2273
"D-Bus method"
1435
for c in tcp_server.clients:
2274
for c in tcp_server.clients.itervalues():
1436
2275
if c.dbus_object_path == object_path:
1437
tcp_server.clients.remove(c)
2276
del tcp_server.clients[c.name]
1438
2277
c.remove_from_connection()
1439
2278
# Don't signal anything except ClientRemoved
1440
c.disable(signal=False)
2279
c.disable(quiet=True)
1441
2280
# Emit D-Bus signal
1442
2281
self.ClientRemoved(object_path, c.name)
1443
2282
return
1444
raise KeyError
2283
raise KeyError(object_path)
1445
2284
1446
2285
del _interface
1447
2286
1448
mandos_dbus_service = MandosDBusService()
1449
1450
for client in tcp_server.clients:
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
2290
2291
def cleanup():
2292
"Cleanup function; run on exit"
2293
service.cleanup()
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
2330
while tcp_server.clients:
2331
name, client = tcp_server.clients.popitem()
2332
if use_dbus:
2333
client.remove_from_connection()
2334
# Don't signal anything except ClientRemoved
2335
client.disable(quiet=True)
2336
if use_dbus:
2337
# Emit D-Bus signal
2338
mandos_dbus_service.ClientRemoved(client
2339
.dbus_object_path,
2340
client.name)
2341
client_settings.clear()
2342
2343
atexit.register(cleanup)
2344
2345
for client in tcp_server.clients.itervalues():
1451
2346
if use_dbus:
1452
2347
# Emit D-Bus signal
1453
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1454
client.GetAllProperties())
1455
client.enable()
2348
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2349
# Need to initiate checking of clients
2350
if client.enabled:
2351
client.init_checker()
2352
1456
2353
1457
2354
tcp_server.enable()
1458
2355
tcp_server.server_activate()
1460
2357
# Find out what port we got
1461
2358
service.port = tcp_server.socket.getsockname()[1]
1462
2359
if use_ipv6:
1463
logger.info(u"Now listening on address %r, port %d,"
2360
logger.info("Now listening on address %r, port %d,"
1464
2361
" flowinfo %d, scope_id %d"
1465
2362
% tcp_server.socket.getsockname())
1466
2363
else: # IPv4
1467
logger.info(u"Now listening on address %r, port %d"
2364
logger.info("Now listening on address %r, port %d"
1468
2365
% tcp_server.socket.getsockname())
1469
2366
1470
2367
#service.interface = tcp_server.socket.getsockname()[3]
1473
2370
# From the Avahi example code
1474
2371
try:
1475
2372
service.activate()
1476
except dbus.exceptions.DBusException, error:
1477
logger.critical(u"DBusException: %s", error)
2373
except dbus.exceptions.DBusException as error:
2374
logger.critical("DBusException: %s", error)
2375
cleanup()
1478
2376
sys.exit(1)
1479
2377
# End of Avahi example code
1480
2378
1483
2381
(tcp_server.handle_request
1484
2382
(*args[2:], **kwargs) or True))
1485
2383
1486
logger.debug(u"Starting main loop")
2384
logger.debug("Starting main loop")
1487
2385
main_loop.run()
1488
except AvahiError, error:
1489
logger.critical(u"AvahiError: %s", error)
2386
except AvahiError as error:
2387
logger.critical("AvahiError: %s", error)
2388
cleanup()
1490
2389
sys.exit(1)
1491
2390
except KeyboardInterrupt:
1492
2391
if debug:
1493
print >> sys.stderr
1494
logger.debug(u"Server received KeyboardInterrupt")
1495
logger.debug(u"Server exiting")
2392
print("", file=sys.stderr)
2393
logger.debug("Server received KeyboardInterrupt")
2394
logger.debug("Server exiting")
2395
# Must run before the D-Bus bus name gets deregistered
2396
cleanup()
2397
1496
2398
1497
2399
if __name__ == '__main__':
1498
2400
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0