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