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