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 341
- compare with another revision
- download diff
- download tarball
- view history from revision 341
- Committer: Teddy Hogeborn
- Date: 2009-04-17 01:16:37 UTC
- Revision ID: teddy@fukt.bsnet.se-20090417011637-bcqjpm7fskm4370v
Code cleanup and one bug fix.
* mandos (Client.enable): Bug fix: Do not enable if already enabled.
(MandosServer.__init__): Create empty set of clients if none passed.
(main): Do not create clients set; do not pass a clients set to
MandosServer. Use tcp_server.clients throughout.
* mandos (Client.enable): Bug fix: Do not enable if already enabled.
(MandosServer.__init__): Create empty set of clients if none passed.
(main): Do not create clients set; do not pass a clients set to
MandosServer. Use tcp_server.clients throughout.
- files removed:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
34
from __future__ import division, with_statement, absolute_import
36
35
37
36
import SocketServer as socketserver
38
37
import socket
39
import argparse
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
56
55
import logging
57
56
import logging.handlers
58
57
import pwd
59
import contextlib
58
from contextlib import closing
60
59
import struct
61
60
import fcntl
62
61
import functools
63
import cPickle as pickle
64
import multiprocessing
65
import types
66
import hashlib
67
62
68
63
import dbus
69
64
import dbus.service
72
67
from dbus.mainloop.glib import DBusGMainLoop
73
68
import ctypes
74
69
import ctypes.util
75
import xml.dom.minidom
76
import inspect
77
import Crypto.Cipher.AES
78
70
79
71
try:
80
72
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
77
SO_BINDTODEVICE = None
86
78
87
79
88
version = "1.4.1"
89
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
80
version = "1.0.8"
81
82
logger = logging.Logger(u'mandos')
93
83
syslogger = (logging.handlers.SysLogHandler
94
84
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
85
address = "/dev/log"))
96
86
syslogger.setFormatter(logging.Formatter
97
('Mandos [%(process)d]: %(levelname)s:'
98
' %(message)s'))
87
(u'Mandos [%(process)d]: %(levelname)s:'
88
u' %(message)s'))
99
89
logger.addHandler(syslogger)
100
90
101
91
console = logging.StreamHandler()
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
' [%(process)d]:'
104
' %(levelname)s:'
105
' %(message)s'))
92
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
93
u' %(levelname)s:'
94
u' %(message)s'))
106
95
logger.addHandler(console)
107
96
108
109
97
class AvahiError(Exception):
110
98
def __init__(self, value, *args, **kwargs):
111
99
self.value = value
126
114
Attributes:
127
115
interface: integer; avahi.IF_UNSPEC or an interface index.
128
116
Used to optionally bind to the specified interface.
129
name: string; Example: 'Mandos'
130
type: string; Example: '_mandos._tcp'.
117
name: string; Example: u'Mandos'
118
type: string; Example: u'_mandos._tcp'.
131
119
See <http://www.dns-sd.org/ServiceTypes.html>
132
120
port: integer; what port to announce
133
121
TXT: list of strings; TXT record for the service
142
130
"""
143
131
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
144
132
servicetype = None, port = None, TXT = None,
145
domain = "", host = "", max_renames = 32768,
133
domain = u"", host = u"", max_renames = 32768,
146
134
protocol = avahi.PROTO_UNSPEC, bus = None):
147
135
self.interface = interface
148
136
self.name = name
157
145
self.group = None # our entry group
158
146
self.server = None
159
147
self.bus = bus
160
self.entry_group_state_changed_match = None
161
148
def rename(self):
162
149
"""Derived from the Avahi example code"""
163
150
if self.rename_count >= self.max_renames:
164
logger.critical("No suitable Zeroconf service name found"
165
" after %i retries, exiting.",
151
logger.critical(u"No suitable Zeroconf service name found"
152
u" after %i retries, exiting.",
166
153
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)
154
raise AvahiServiceError(u"Too many renames")
155
self.name = self.server.GetAlternativeServiceName(self.name)
156
logger.info(u"Changing Zeroconf service name to %r ...",
157
unicode(self.name))
158
syslogger.setFormatter(logging.Formatter
159
(u'Mandos (%s) [%%(process)d]:'
160
u' %%(levelname)s: %%(message)s'
161
% self.name))
172
162
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)
163
self.add()
179
164
self.rename_count += 1
180
165
def remove(self):
181
166
"""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
167
if self.group is not None:
186
168
self.group.Reset()
187
169
def add(self):
188
170
"""Derived from the Avahi example code"""
189
self.remove()
190
171
if self.group is None:
191
172
self.group = dbus.Interface(
192
173
self.bus.get_object(avahi.DBUS_NAME,
193
174
self.server.EntryGroupNew()),
194
175
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' ...",
176
self.group.connect_to_signal('StateChanged',
177
self.entry_group_state_changed)
178
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
199
179
self.name, self.type)
200
180
self.group.AddService(
201
181
self.interface,
208
188
self.group.Commit()
209
189
def entry_group_state_changed(self, state, error):
210
190
"""Derived from the Avahi example code"""
211
logger.debug("Avahi entry group state change: %i", state)
191
logger.debug(u"Avahi state change: %i", state)
212
192
213
193
if state == avahi.ENTRY_GROUP_ESTABLISHED:
214
logger.debug("Zeroconf service established.")
194
logger.debug(u"Zeroconf service established.")
215
195
elif state == avahi.ENTRY_GROUP_COLLISION:
216
logger.info("Zeroconf service name collision.")
196
logger.warning(u"Zeroconf service name collision.")
217
197
self.rename()
218
198
elif state == avahi.ENTRY_GROUP_FAILURE:
219
logger.critical("Avahi: Error in group state changed %s",
199
logger.critical(u"Avahi: Error in group state changed %s",
220
200
unicode(error))
221
raise AvahiGroupError("State changed: %s"
201
raise AvahiGroupError(u"State changed: %s"
222
202
% unicode(error))
223
203
def cleanup(self):
224
204
"""Derived from the Avahi example code"""
225
205
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
206
self.group.Free()
231
207
self.group = None
232
self.remove()
233
def server_state_changed(self, state, error=None):
208
def server_state_changed(self, state):
234
209
"""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()
210
if state == avahi.SERVER_COLLISION:
211
logger.error(u"Zeroconf server name collision")
212
self.remove()
250
213
elif state == avahi.SERVER_RUNNING:
251
214
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
215
def activate(self):
258
216
"""Derived from the Avahi example code"""
259
217
if self.server is None:
260
218
self.server = dbus.Interface(
261
219
self.bus.get_object(avahi.DBUS_NAME,
262
avahi.DBUS_PATH_SERVER,
263
follow_name_owner_changes=True),
220
avahi.DBUS_PATH_SERVER),
264
221
avahi.DBUS_INTERFACE_SERVER)
265
self.server.connect_to_signal("StateChanged",
222
self.server.connect_to_signal(u"StateChanged",
266
223
self.server_state_changed)
267
224
self.server_state_changed(self.server.GetState())
268
225
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
226
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
227
class Client(object):
286
228
"""A representation of a client host served by this server.
287
229
288
230
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
231
name: string; from the config file, used in log messages and
232
D-Bus identifiers
233
fingerprint: string (40 or 32 hexadecimal digits); used to
234
uniquely identify the client
235
secret: bytestring; sent verbatim (over TLS) to client
236
host: string; available for use by the checker command
237
created: datetime.datetime(); (UTC) object creation
238
last_enabled: datetime.datetime(); (UTC)
239
enabled: bool()
240
last_checked_ok: datetime.datetime(); (UTC) or None
241
timeout: datetime.timedelta(); How long from last_checked_ok
242
until this client is invalid
243
interval: datetime.timedelta(); How often to start a new checker
244
disable_hook: If set, called by disable() as disable_hook(self)
292
245
checker: subprocess.Popen(); a running checker process used
293
246
to see if the client lives.
294
247
'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
248
checker_initiator_tag: a gobject event source tag, or None
249
disable_initiator_tag: - '' -
250
checker_callback_tag: - '' -
251
checker_command: string; External command which is run to check if
252
client lives. %() expansions are done at
298
253
runtime with vars(self) as dict, so that for
299
254
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
255
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
256
"""
327
257
328
runtime_expansions = ("approval_delay", "approval_duration",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
331
"last_enabled", "name", "timeout")
258
@staticmethod
259
def _datetime_to_milliseconds(dt):
260
"Convert a datetime.datetime() to milliseconds"
261
return ((dt.days * 24 * 60 * 60 * 1000)
262
+ (dt.seconds * 1000)
263
+ (dt.microseconds // 1000))
332
264
333
265
def timeout_milliseconds(self):
334
266
"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)
267
return self._datetime_to_milliseconds(self.timeout)
340
268
341
269
def interval_milliseconds(self):
342
270
"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):
271
return self._datetime_to_milliseconds(self.interval)
272
273
def __init__(self, name = None, disable_hook=None, config=None):
349
274
"""Note: the 'checker' key in 'config' sets the
350
275
'checker_command' attribute and *not* the 'checker'
351
276
attribute."""
352
277
self.name = name
353
278
if config is None:
354
279
config = {}
355
logger.debug("Creating client %r", self.name)
280
logger.debug(u"Creating client %r", self.name)
356
281
# Uppercase and remove spaces from fingerprint for later
357
282
# comparison purposes with return value from the fingerprint()
358
283
# 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:
284
self.fingerprint = (config[u"fingerprint"].upper()
285
.replace(u" ", u""))
286
logger.debug(u" Fingerprint: %s", self.fingerprint)
287
if u"secret" in config:
288
self.secret = config[u"secret"].decode(u"base64")
289
elif u"secfile" in config:
290
with closing(open(os.path.expanduser
291
(os.path.expandvars
292
(config[u"secfile"])))) as secfile:
368
293
self.secret = secfile.read()
369
294
else:
370
raise TypeError("No secret or secfile for client %s"
295
raise TypeError(u"No secret or secfile for client %s"
371
296
% self.name)
372
self.host = config.get("host", "")
297
self.host = config.get(u"host", u"")
373
298
self.created = datetime.datetime.utcnow()
374
self.enabled = True
375
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
299
self.enabled = False
300
self.last_enabled = None
377
301
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"])
302
self.timeout = string_to_delta(config[u"timeout"])
303
self.interval = string_to_delta(config[u"interval"])
304
self.disable_hook = disable_hook
383
305
self.checker = None
384
306
self.checker_initiator_tag = None
385
307
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
387
308
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
309
self.checker_command = config[u"checker"]
389
310
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()
311
self.last_connect = None
418
312
419
313
def enable(self):
420
314
"""Start this client's checker and timeout hooks"""
421
if getattr(self, "enabled", False):
315
if getattr(self, u"enabled", False):
422
316
# Already enabled
423
317
return
424
self.send_changedstate()
425
self.expires = datetime.datetime.utcnow() + self.timeout
318
self.last_enabled = datetime.datetime.utcnow()
319
# Schedule a new checker to be started an 'interval' from now,
320
# and every interval from then on.
321
self.checker_initiator_tag = (gobject.timeout_add
322
(self.interval_milliseconds(),
323
self.start_checker))
324
# Also start a new checker *right now*.
325
self.start_checker()
326
# Schedule a disable() when 'timeout' has passed
327
self.disable_initiator_tag = (gobject.timeout_add
328
(self.timeout_milliseconds(),
329
self.disable))
426
330
self.enabled = True
427
self.last_enabled = datetime.datetime.utcnow()
428
self.init_checker()
429
331
430
def disable(self, quiet=True):
332
def disable(self):
431
333
"""Disable this client."""
432
334
if not getattr(self, "enabled", False):
433
335
return False
434
if not quiet:
435
self.send_changedstate()
436
if not quiet:
437
logger.info("Disabling client %s", self.name)
438
if getattr(self, "disable_initiator_tag", False):
336
logger.info(u"Disabling client %s", self.name)
337
if getattr(self, u"disable_initiator_tag", False):
439
338
gobject.source_remove(self.disable_initiator_tag)
440
339
self.disable_initiator_tag = None
441
self.expires = None
442
if getattr(self, "checker_initiator_tag", False):
340
if getattr(self, u"checker_initiator_tag", False):
443
341
gobject.source_remove(self.checker_initiator_tag)
444
342
self.checker_initiator_tag = None
445
343
self.stop_checker()
344
if self.disable_hook:
345
self.disable_hook(self)
446
346
self.enabled = False
447
347
# Do not run this again if called by a gobject.timeout_add
448
348
return False
449
349
450
350
def __del__(self):
351
self.disable_hook = None
451
352
self.disable()
452
453
def init_checker(self):
454
# Schedule a new checker to be started an 'interval' from now,
455
# and every interval from then on.
456
self.checker_initiator_tag = (gobject.timeout_add
457
(self.interval_milliseconds(),
458
self.start_checker))
459
# Schedule a disable() when 'timeout' has passed
460
self.disable_initiator_tag = (gobject.timeout_add
461
(self.timeout_milliseconds(),
462
self.disable))
463
# Also start a new checker *right now*.
464
self.start_checker()
465
466
353
467
354
def checker_callback(self, pid, condition, command):
468
355
"""The checker has completed, so take appropriate actions."""
469
356
self.checker_callback_tag = None
470
357
self.checker = None
471
358
if os.WIFEXITED(condition):
472
self.last_checker_status = os.WEXITSTATUS(condition)
473
if self.last_checker_status == 0:
474
logger.info("Checker for %(name)s succeeded",
359
exitstatus = os.WEXITSTATUS(condition)
360
if exitstatus == 0:
361
logger.info(u"Checker for %(name)s succeeded",
475
362
vars(self))
476
363
self.checked_ok()
477
364
else:
478
logger.info("Checker for %(name)s failed",
365
logger.info(u"Checker for %(name)s failed",
479
366
vars(self))
480
367
else:
481
self.last_checker_status = -1
482
logger.warning("Checker for %(name)s crashed?",
368
logger.warning(u"Checker for %(name)s crashed?",
483
369
vars(self))
484
370
485
def checked_ok(self, timeout=None):
371
def checked_ok(self):
486
372
"""Bump up the timeout for this client.
487
373
488
374
This should only be called when the client has been seen,
489
375
alive and well.
490
376
"""
491
if timeout is None:
492
timeout = self.timeout
493
377
self.last_checked_ok = datetime.datetime.utcnow()
494
if self.disable_initiator_tag is not None:
495
gobject.source_remove(self.disable_initiator_tag)
496
if getattr(self, "enabled", False):
497
self.disable_initiator_tag = (gobject.timeout_add
498
(_timedelta_to_milliseconds
499
(timeout), self.disable))
500
self.expires = datetime.datetime.utcnow() + timeout
501
502
def need_approval(self):
503
self.last_approval_request = datetime.datetime.utcnow()
378
gobject.source_remove(self.disable_initiator_tag)
379
self.disable_initiator_tag = (gobject.timeout_add
380
(self.timeout_milliseconds(),
381
self.disable))
504
382
505
383
def start_checker(self):
506
384
"""Start a new checker subprocess if one is not running.
513
391
# client would inevitably timeout, since no checker would get
514
392
# a chance to run to completion. If we instead leave running
515
393
# checkers alone, the checker would have to take more time
516
# than 'timeout' for the client to be disabled, which is as it
517
# should be.
394
# than 'timeout' for the client to be declared invalid, which
395
# is as it should be.
518
396
519
397
# If a checker exists, make sure it is not a zombie
520
try:
398
if self.checker is not None:
521
399
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
522
except (AttributeError, OSError) as error:
523
if (isinstance(error, OSError)
524
and error.errno != errno.ECHILD):
525
raise error
526
else:
527
400
if pid:
528
logger.warning("Checker was a zombie")
401
logger.warning(u"Checker was a zombie")
529
402
gobject.source_remove(self.checker_callback_tag)
530
403
self.checker_callback(pid, status,
531
404
self.current_checker_command)
536
409
command = self.checker_command % self.host
537
410
except TypeError:
538
411
# Escape attributes for the shell
539
escaped_attrs = dict(
540
(attr,
541
re.escape(unicode(str(getattr(self, attr, "")),
542
errors=
543
'replace')))
544
for attr in
545
self.runtime_expansions)
546
412
escaped_attrs = dict((key,
413
re.escape(unicode(str(val),
414
errors=
415
u'replace')))
416
for key, val in
417
vars(self).iteritems())
547
418
try:
548
419
command = self.checker_command % escaped_attrs
549
except TypeError as error:
550
logger.error('Could not format string "%s":'
551
' %s', self.checker_command, error)
420
except TypeError, error:
421
logger.error(u'Could not format string "%s":'
422
u' %s', self.checker_command, error)
552
423
return True # Try again later
553
424
self.current_checker_command = command
554
425
try:
555
logger.info("Starting checker %r for %s",
426
logger.info(u"Starting checker %r for %s",
556
427
command, self.name)
557
428
# We don't need to redirect stdout and stderr, since
558
429
# in normal mode, that is already done by daemon(),
560
431
# always replaced by /dev/null.)
561
432
self.checker = subprocess.Popen(command,
562
433
close_fds=True,
563
shell=True, cwd="/")
434
shell=True, cwd=u"/")
564
435
self.checker_callback_tag = (gobject.child_watch_add
565
436
(self.checker.pid,
566
437
self.checker_callback,
571
442
if pid:
572
443
gobject.source_remove(self.checker_callback_tag)
573
444
self.checker_callback(pid, status, command)
574
except OSError as error:
575
logger.error("Failed to start subprocess: %s",
445
except OSError, error:
446
logger.error(u"Failed to start subprocess: %s",
576
447
error)
577
448
# Re-run this periodically if run by gobject.timeout_add
578
449
return True
582
453
if self.checker_callback_tag:
583
454
gobject.source_remove(self.checker_callback_tag)
584
455
self.checker_callback_tag = None
585
if getattr(self, "checker", None) is None:
456
if getattr(self, u"checker", None) is None:
586
457
return
587
logger.debug("Stopping checker for %(name)s", vars(self))
458
logger.debug(u"Stopping checker for %(name)s", vars(self))
588
459
try:
589
460
os.kill(self.checker.pid, signal.SIGTERM)
590
#time.sleep(0.5)
461
#os.sleep(0.5)
591
462
#if self.checker.poll() is None:
592
463
# os.kill(self.checker.pid, signal.SIGKILL)
593
except OSError as error:
464
except OSError, error:
594
465
if error.errno != errno.ESRCH: # No such process
595
466
raise
596
467
self.checker = None
597
598
# Encrypts a client secret and stores it in a varible
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
468
469
def still_valid(self):
470
"""Has the timeout not yet passed for this client?"""
471
if not getattr(self, u"enabled", False):
472
return False
473
now = datetime.datetime.utcnow()
474
if self.last_checked_ok is None:
475
return now < (self.created + self.timeout)
644
476
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):
651
"""Decorators for marking methods of a DBusObjectWithProperties to
652
become properties on the D-Bus.
653
654
The decorated method will be called with no arguments by "Get"
655
and with one argument by "Set".
656
657
The parameters, where they are supported, are the same as
658
dbus.service.method, except there is only "signature", since the
659
type from Get() and the type sent to Set() is the same.
660
"""
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
def decorator(func):
667
func._dbus_is_property = True
668
func._dbus_interface = dbus_interface
669
func._dbus_signature = signature
670
func._dbus_access = access
671
func._dbus_name = func.__name__
672
if func._dbus_name.endswith("_dbus_property"):
673
func._dbus_name = func._dbus_name[:-14]
674
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
675
return func
676
return decorator
677
678
679
class DBusPropertyException(dbus.exceptions.DBusException):
680
"""A base class for D-Bus property-related exceptions
681
"""
682
def __unicode__(self):
683
return unicode(str(self))
684
685
686
class DBusPropertyAccessException(DBusPropertyException):
687
"""A property's access permissions disallows an operation.
688
"""
689
pass
690
691
692
class DBusPropertyNotFound(DBusPropertyException):
693
"""An attempt was made to access a non-existing property.
694
"""
695
pass
696
697
698
class DBusObjectWithProperties(dbus.service.Object):
699
"""A D-Bus object with properties.
700
701
Classes inheriting from this can use the dbus_service_property
702
decorator to expose methods as D-Bus properties. It exposes the
703
standard Get(), Set(), and GetAll() methods on the D-Bus.
704
"""
705
706
@staticmethod
707
def _is_dbus_property(obj):
708
return getattr(obj, "_dbus_is_property", False)
709
710
def _get_all_dbus_properties(self):
711
"""Returns a generator of (name, attribute) pairs
712
"""
713
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
714
for cls in self.__class__.__mro__
715
for name, prop in
716
inspect.getmembers(cls, self._is_dbus_property))
717
718
def _get_dbus_property(self, interface_name, property_name):
719
"""Returns a bound method if one exists which is a D-Bus
720
property with the specified name and interface.
721
"""
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
729
# No such property
730
raise DBusPropertyNotFound(self.dbus_object_path + ":"
731
+ interface_name + "."
732
+ property_name)
733
734
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
735
out_signature="v")
736
def Get(self, interface_name, property_name):
737
"""Standard D-Bus property Get() method, see D-Bus standard.
738
"""
739
prop = self._get_dbus_property(interface_name, property_name)
740
if prop._dbus_access == "write":
741
raise DBusPropertyAccessException(property_name)
742
value = prop()
743
if not hasattr(value, "variant_level"):
744
return value
745
return type(value)(value, variant_level=value.variant_level+1)
746
747
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
748
def Set(self, interface_name, property_name, value):
749
"""Standard D-Bus property Set() method, see D-Bus standard.
750
"""
751
prop = self._get_dbus_property(interface_name, property_name)
752
if prop._dbus_access == "read":
753
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
759
value = dbus.ByteArray(''.join(unichr(byte)
760
for byte in value))
761
prop(value)
762
763
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
764
out_signature="a{sv}")
765
def GetAll(self, interface_name):
766
"""Standard D-Bus property GetAll() method, see D-Bus
767
standard.
768
769
Note: Will not include properties with access="write".
770
"""
771
all = {}
772
for name, prop in self._get_all_dbus_properties():
773
if (interface_name
774
and interface_name != prop._dbus_interface):
775
# Interface non-empty but did not match
776
continue
777
# Ignore write-only properties
778
if prop._dbus_access == "write":
779
continue
780
value = prop()
781
if not hasattr(value, "variant_level"):
782
all[name] = value
783
continue
784
all[name] = type(value)(value, variant_level=
785
value.variant_level+1)
786
return dbus.Dictionary(all, signature="sv")
787
788
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
789
out_signature="s",
790
path_keyword='object_path',
791
connection_keyword='connection')
792
def Introspect(self, object_path, connection):
793
"""Standard D-Bus method, overloaded to insert property tags.
794
"""
795
xmlstring = dbus.service.Object.Introspect(self, object_path,
796
connection)
797
try:
798
document = xml.dom.minidom.parseString(xmlstring)
799
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)
804
return e
805
for if_tag in document.getElementsByTagName("interface"):
806
for tag in (make_tag(document, name, prop)
807
for name, prop
808
in self._get_all_dbus_properties()
809
if prop._dbus_interface
810
== if_tag.getAttribute("name")):
811
if_tag.appendChild(tag)
812
# Add the names to the return values for the
813
# "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")
828
document.unlink()
829
except (AttributeError, xml.dom.DOMException,
830
xml.parsers.expat.ExpatError) as error:
831
logger.error("Failed to override Introspection method",
832
error)
833
return xmlstring
834
835
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
class ClientDBus(Client, DBusObjectWithProperties):
477
return now < (self.last_checked_ok + self.timeout)
478
479
480
class ClientDBus(Client, dbus.service.Object):
941
481
"""A Client class using D-Bus
942
482
943
483
Attributes:
944
484
dbus_object_path: dbus.ObjectPath
945
485
bus: dbus.SystemBus()
946
486
"""
947
948
runtime_expansions = (Client.runtime_expansions
949
+ ("dbus_object_path",))
950
951
487
# dbus.service.Object doesn't use super(), so we can't either.
952
488
953
489
def __init__(self, bus = None, *args, **kwargs):
954
490
self.bus = bus
955
self._approvals_pending = 0
956
491
Client.__init__(self, *args, **kwargs)
957
self.add_to_dbus()
958
959
def add_to_dbus(self):
960
492
# Only now, when this client is initialized, can it show up on
961
493
# the D-Bus
962
client_object_name = unicode(self.name).translate(
963
{ord("."): ord("_"),
964
ord("-"): ord("_")})
965
494
self.dbus_object_path = (dbus.ObjectPath
966
("/clients/" + client_object_name))
967
DBusObjectWithProperties.__init__(self, self.bus,
968
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
495
(u"/clients/"
496
+ self.name.replace(u".", u"_")))
497
dbus.service.Object.__init__(self, self.bus,
498
self.dbus_object_path)
499
500
@staticmethod
501
def _datetime_to_dbus(dt, variant_level=0):
502
"""Convert a UTC datetime.datetime() to a D-Bus type."""
503
return dbus.String(dt.isoformat(),
504
variant_level=variant_level)
505
506
def enable(self):
507
oldstate = getattr(self, u"enabled", False)
508
r = Client.enable(self)
509
if oldstate != self.enabled:
510
# Emit D-Bus signals
511
self.PropertyChanged(dbus.String(u"enabled"),
512
dbus.Boolean(True, variant_level=1))
513
self.PropertyChanged(
514
dbus.String(u"last_enabled"),
515
self._datetime_to_dbus(self.last_enabled,
516
variant_level=1))
517
return r
518
519
def disable(self, signal = True):
520
oldstate = getattr(self, u"enabled", False)
521
r = Client.disable(self)
522
if signal and oldstate != self.enabled:
523
# Emit D-Bus signal
524
self.PropertyChanged(dbus.String(u"enabled"),
525
dbus.Boolean(False, variant_level=1))
526
return r
1036
527
1037
528
def __del__(self, *args, **kwargs):
1038
529
try:
1039
530
self.remove_from_connection()
1040
531
except LookupError:
1041
532
pass
1042
if hasattr(DBusObjectWithProperties, "__del__"):
1043
DBusObjectWithProperties.__del__(self, *args, **kwargs)
533
if hasattr(dbus.service.Object, u"__del__"):
534
dbus.service.Object.__del__(self, *args, **kwargs)
1044
535
Client.__del__(self, *args, **kwargs)
1045
536
1046
537
def checker_callback(self, pid, condition, command,
1047
538
*args, **kwargs):
1048
539
self.checker_callback_tag = None
1049
540
self.checker = None
541
# Emit D-Bus signal
542
self.PropertyChanged(dbus.String(u"checker_running"),
543
dbus.Boolean(False, variant_level=1))
1050
544
if os.WIFEXITED(condition):
1051
545
exitstatus = os.WEXITSTATUS(condition)
1052
546
# Emit D-Bus signal
1062
556
return Client.checker_callback(self, pid, condition, command,
1063
557
*args, **kwargs)
1064
558
559
def checked_ok(self, *args, **kwargs):
560
r = Client.checked_ok(self, *args, **kwargs)
561
# Emit D-Bus signal
562
self.PropertyChanged(
563
dbus.String(u"last_checked_ok"),
564
(self._datetime_to_dbus(self.last_checked_ok,
565
variant_level=1)))
566
return r
567
1065
568
def start_checker(self, *args, **kwargs):
1066
569
old_checker = self.checker
1067
570
if self.checker is not None:
1074
577
and old_checker_pid != self.checker.pid):
1075
578
# Emit D-Bus signal
1076
579
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
580
self.PropertyChanged(
581
dbus.String(u"checker_running"),
582
dbus.Boolean(True, variant_level=1))
583
return r
584
585
def stop_checker(self, *args, **kwargs):
586
old_checker = getattr(self, u"checker", None)
587
r = Client.stop_checker(self, *args, **kwargs)
588
if (old_checker is not None
589
and getattr(self, u"checker", None) is None):
590
self.PropertyChanged(dbus.String(u"checker_running"),
591
dbus.Boolean(False, variant_level=1))
592
return r
593
594
## D-Bus methods & signals
595
_interface = u"se.bsnet.fukt.Mandos.Client"
596
597
# CheckedOK - method
598
@dbus.service.method(_interface)
599
def CheckedOK(self):
600
return self.checked_ok()
1095
601
1096
602
# CheckerCompleted - signal
1097
@dbus.service.signal(_interface, signature="nxs")
603
@dbus.service.signal(_interface, signature=u"nxs")
1098
604
def CheckerCompleted(self, exitcode, waitstatus, command):
1099
605
"D-Bus signal"
1100
606
pass
1101
607
1102
608
# CheckerStarted - signal
1103
@dbus.service.signal(_interface, signature="s")
609
@dbus.service.signal(_interface, signature=u"s")
1104
610
def CheckerStarted(self, command):
1105
611
"D-Bus signal"
1106
612
pass
1107
613
614
# GetAllProperties - method
615
@dbus.service.method(_interface, out_signature=u"a{sv}")
616
def GetAllProperties(self):
617
"D-Bus method"
618
return dbus.Dictionary({
619
dbus.String(u"name"):
620
dbus.String(self.name, variant_level=1),
621
dbus.String(u"fingerprint"):
622
dbus.String(self.fingerprint, variant_level=1),
623
dbus.String(u"host"):
624
dbus.String(self.host, variant_level=1),
625
dbus.String(u"created"):
626
self._datetime_to_dbus(self.created,
627
variant_level=1),
628
dbus.String(u"last_enabled"):
629
(self._datetime_to_dbus(self.last_enabled,
630
variant_level=1)
631
if self.last_enabled is not None
632
else dbus.Boolean(False, variant_level=1)),
633
dbus.String(u"enabled"):
634
dbus.Boolean(self.enabled, variant_level=1),
635
dbus.String(u"last_checked_ok"):
636
(self._datetime_to_dbus(self.last_checked_ok,
637
variant_level=1)
638
if self.last_checked_ok is not None
639
else dbus.Boolean (False, variant_level=1)),
640
dbus.String(u"timeout"):
641
dbus.UInt64(self.timeout_milliseconds(),
642
variant_level=1),
643
dbus.String(u"interval"):
644
dbus.UInt64(self.interval_milliseconds(),
645
variant_level=1),
646
dbus.String(u"checker"):
647
dbus.String(self.checker_command,
648
variant_level=1),
649
dbus.String(u"checker_running"):
650
dbus.Boolean(self.checker is not None,
651
variant_level=1),
652
dbus.String(u"object_path"):
653
dbus.ObjectPath(self.dbus_object_path,
654
variant_level=1)
655
}, signature=u"sv")
656
657
# IsStillValid - method
658
@dbus.service.method(_interface, out_signature=u"b")
659
def IsStillValid(self):
660
return self.still_valid()
661
1108
662
# PropertyChanged - signal
1109
@dbus.service.signal(_interface, signature="sv")
663
@dbus.service.signal(_interface, signature=u"sv")
1110
664
def PropertyChanged(self, property, value):
1111
665
"D-Bus signal"
1112
666
pass
1113
667
1114
# GotSecret - signal
668
# ReceivedSecret - signal
1115
669
@dbus.service.signal(_interface)
1116
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
"""
670
def ReceivedSecret(self):
671
"D-Bus signal"
1121
672
pass
1122
673
1123
674
# Rejected - signal
1124
@dbus.service.signal(_interface, signature="s")
1125
def Rejected(self, reason):
675
@dbus.service.signal(_interface)
676
def Rejected(self):
1126
677
"D-Bus signal"
1127
678
pass
1128
679
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()
680
# SetChecker - method
681
@dbus.service.method(_interface, in_signature=u"s")
682
def SetChecker(self, checker):
683
"D-Bus setter method"
684
self.checker_command = checker
685
# Emit D-Bus signal
686
self.PropertyChanged(dbus.String(u"checker"),
687
dbus.String(self.checker_command,
688
variant_level=1))
689
690
# SetHost - method
691
@dbus.service.method(_interface, in_signature=u"s")
692
def SetHost(self, host):
693
"D-Bus setter method"
694
self.host = host
695
# Emit D-Bus signal
696
self.PropertyChanged(dbus.String(u"host"),
697
dbus.String(self.host, variant_level=1))
698
699
# SetInterval - method
700
@dbus.service.method(_interface, in_signature=u"t")
701
def SetInterval(self, milliseconds):
702
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
# Emit D-Bus signal
704
self.PropertyChanged(dbus.String(u"interval"),
705
(dbus.UInt64(self.interval_milliseconds(),
706
variant_level=1)))
707
708
# SetSecret - method
709
@dbus.service.method(_interface, in_signature=u"ay",
710
byte_arrays=True)
711
def SetSecret(self, secret):
712
"D-Bus setter method"
713
self.secret = str(secret)
714
715
# SetTimeout - method
716
@dbus.service.method(_interface, in_signature=u"t")
717
def SetTimeout(self, milliseconds):
718
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
719
# Emit D-Bus signal
720
self.PropertyChanged(dbus.String(u"timeout"),
721
(dbus.UInt64(self.timeout_milliseconds(),
722
variant_level=1)))
1146
723
1147
724
# Enable - method
1148
725
@dbus.service.method(_interface)
1167
744
def StopChecker(self):
1168
745
self.stop_checker()
1169
746
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):
1205
return dbus.String(self.name)
1206
1207
# Fingerprint - property
1208
@dbus_service_property(_interface, signature="s", access="read")
1209
def Fingerprint_dbus_property(self):
1210
return dbus.String(self.fingerprint)
1211
1212
# Host - property
1213
@dbus_service_property(_interface, signature="s",
1214
access="readwrite")
1215
def Host_dbus_property(self, value=None):
1216
if value is None: # get
1217
return dbus.String(self.host)
1218
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):
1234
if value is None: # get
1235
return dbus.Boolean(self.enabled)
1236
if value:
1237
self.enable()
1238
else:
1239
self.disable()
1240
1241
# LastCheckedOK - property
1242
@dbus_service_property(_interface, signature="s",
1243
access="readwrite")
1244
def LastCheckedOK_dbus_property(self, value=None):
1245
if value is not None:
1246
self.checked_ok()
1247
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):
1264
if value is None: # get
1265
return dbus.UInt64(self.timeout_milliseconds())
1266
self.timeout = datetime.timedelta(0, 0, 0, value)
1267
if getattr(self, "disable_initiator_tag", None) is None:
1268
return
1269
# Reschedule timeout
1270
gobject.source_remove(self.disable_initiator_tag)
1271
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())
1278
if time_to_die <= 0:
1279
# The timeout has passed
1280
self.disable()
1281
else:
1282
self.expires = (datetime.datetime.utcnow()
1283
+ datetime.timedelta(milliseconds =
1284
time_to_die))
1285
self.disable_initiator_tag = (gobject.timeout_add
1286
(time_to_die, self.disable))
1287
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):
1300
if value is None: # get
1301
return dbus.UInt64(self.interval_milliseconds())
1302
self.interval = datetime.timedelta(0, 0, 0, value)
1303
if getattr(self, "checker_initiator_tag", None) is None:
1304
return
1305
# Reschedule checker run
1306
gobject.source_remove(self.checker_initiator_tag)
1307
self.checker_initiator_tag = (gobject.timeout_add
1308
(value, self.start_checker))
1309
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):
1315
if value is None: # get
1316
return dbus.String(self.checker_command)
1317
self.checker_command = value
1318
1319
# CheckerRunning - property
1320
@dbus_service_property(_interface, signature="b",
1321
access="readwrite")
1322
def CheckerRunning_dbus_property(self, value=None):
1323
if value is None: # get
1324
return dbus.Boolean(self.checker is not None)
1325
if value:
1326
self.start_checker()
1327
else:
1328
self.stop_checker()
1329
1330
# ObjectPath - property
1331
@dbus_service_property(_interface, signature="o", access="read")
1332
def ObjectPath_dbus_property(self):
1333
return self.dbus_object_path # is already a dbus.ObjectPath
1334
1335
# Secret = property
1336
@dbus_service_property(_interface, signature="ay",
1337
access="write", byte_arrays=True)
1338
def Secret_dbus_property(self, value):
1339
self.secret = str(value)
1340
1341
747
del _interface
1342
748
1343
749
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
750
class ClientHandler(socketserver.BaseRequestHandler, object):
1373
751
"""A class to handle client connections.
1374
752
1376
754
Note: This will run in its own forked process."""
1377
755
1378
756
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
757
logger.info(u"TCP connection from: %s",
758
unicode(self.client_address))
759
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
# Open IPC pipe to parent process
761
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1385
762
session = (gnutls.connection
1386
763
.ClientSession(self.request,
1387
764
gnutls.connection
1388
765
.X509Credentials()))
1389
766
767
line = self.request.makefile().readline()
768
logger.debug(u"Protocol version: %r", line)
769
try:
770
if int(line.strip().split()[0]) > 1:
771
raise RuntimeError
772
except (ValueError, IndexError, RuntimeError), error:
773
logger.error(u"Unknown protocol version: %s", error)
774
return
775
1390
776
# Note: gnutls.connection.X509Credentials is really a
1391
777
# generic GnuTLS certificate credentials object so long as
1392
778
# no X.509 keys are added to it. Therefore, we can use it
1393
779
# here despite using OpenPGP certificates.
1394
780
1395
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1396
# "+AES-256-CBC", "+SHA1",
1397
# "+COMP-NULL", "+CTYPE-OPENPGP",
1398
# "+DHE-DSS"))
781
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
782
# u"+AES-256-CBC", u"+SHA1",
783
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
784
# u"+DHE-DSS"))
1399
785
# Use a fallback default, since this MUST be set.
1400
786
priority = self.server.gnutls_priority
1401
787
if priority is None:
1402
priority = "NORMAL"
788
priority = u"NORMAL"
1403
789
(gnutls.library.functions
1404
790
.gnutls_priority_set_direct(session._c_object,
1405
791
priority, None))
1406
792
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
793
try:
1420
794
session.handshake()
1421
except gnutls.errors.GNUTLSError as error:
1422
logger.warning("Handshake failed: %s", error)
795
except gnutls.errors.GNUTLSError, error:
796
logger.warning(u"Handshake failed: %s", error)
1423
797
# Do not run session.bye() here: the session is not
1424
798
# established. Just abandon the request.
1425
799
return
1426
logger.debug("Handshake succeeded")
1427
1428
approval_required = False
800
logger.debug(u"Handshake succeeded")
1429
801
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()
802
fpr = self.fingerprint(self.peer_certificate(session))
803
except (TypeError, gnutls.errors.GNUTLSError), error:
804
logger.warning(u"Bad certificate: %s", error)
805
session.bye()
806
return
807
logger.debug(u"Fingerprint: %s", fpr)
1518
808
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")
809
for c in self.server.clients:
810
if c.fingerprint == fpr:
811
client = c
812
break
813
else:
814
ipc.write(u"NOTFOUND %s\n" % fpr)
815
session.bye()
816
return
817
# Have to check if client.still_valid(), since it is
818
# possible that the client timed out while establishing
819
# the GnuTLS session.
820
if not client.still_valid():
821
ipc.write(u"INVALID %s\n" % client.name)
822
session.bye()
823
return
824
ipc.write(u"SENDING %s\n" % client.name)
825
sent_size = 0
826
while sent_size < len(client.secret):
827
sent = session.send(client.secret[sent_size:])
828
logger.debug(u"Sent: %d, remaining: %d",
829
sent, len(client.secret)
830
- (sent_size + sent))
831
sent_size += sent
832
session.bye()
1526
833
1527
834
@staticmethod
1528
835
def peer_certificate(session):
1538
845
.gnutls_certificate_get_peers
1539
846
(session._c_object, ctypes.byref(list_size)))
1540
847
if not bool(cert_list) and list_size.value != 0:
1541
raise gnutls.errors.GNUTLSError("error getting peer"
1542
" certificate")
848
raise gnutls.errors.GNUTLSError(u"error getting peer"
849
u" certificate")
1543
850
if list_size.value == 0:
1544
851
return None
1545
852
cert = cert_list[0]
1571
878
if crtverify.value != 0:
1572
879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1573
880
raise (gnutls.errors.CertificateSecurityError
1574
("Verify failed"))
881
(u"Verify failed"))
1575
882
# New buffer for the fingerprint
1576
883
buf = ctypes.create_string_buffer(20)
1577
884
buf_len = ctypes.c_size_t()
1584
891
# Convert the buffer to a Python bytestring
1585
892
fpr = ctypes.string_at(buf, buf_len.value)
1586
893
# Convert the bytestring to hexadecimal notation
1587
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
894
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1588
895
return hex_fpr
1589
896
1590
897
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 """
898
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
899
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1611
900
def process_request(self, request, client_address):
1612
901
"""Overrides and wraps the original process_request().
1613
902
1614
This function creates a new pipe in self.pipe
903
This function creates a new pipe in self.pipe
1615
904
"""
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):
905
self.pipe = os.pipe()
906
super(ForkingMixInWithPipe,
907
self).process_request(request, client_address)
908
os.close(self.pipe[1]) # close write end
909
self.add_pipe(self.pipe[0])
910
def add_pipe(self, pipe):
1624
911
"""Dummy function; override as necessary"""
1625
raise NotImplementedError
1626
1627
1628
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
912
os.close(pipe)
913
914
915
class IPv6_TCPServer(ForkingMixInWithPipe,
1629
916
socketserver.TCPServer, object):
1630
917
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1631
918
1647
934
bind to an address or port if they were not specified."""
1648
935
if self.interface is not None:
1649
936
if SO_BINDTODEVICE is None:
1650
logger.error("SO_BINDTODEVICE does not exist;"
1651
" cannot bind to interface %s",
937
logger.error(u"SO_BINDTODEVICE does not exist;"
938
u" cannot bind to interface %s",
1652
939
self.interface)
1653
940
else:
1654
941
try:
1655
942
self.socket.setsockopt(socket.SOL_SOCKET,
1656
943
SO_BINDTODEVICE,
1657
944
str(self.interface
1658
+ '\0'))
1659
except socket.error as error:
945
+ u'\0'))
946
except socket.error, error:
1660
947
if error[0] == errno.EPERM:
1661
logger.error("No permission to"
1662
" bind to interface %s",
948
logger.error(u"No permission to"
949
u" bind to interface %s",
1663
950
self.interface)
1664
951
elif error[0] == errno.ENOPROTOOPT:
1665
logger.error("SO_BINDTODEVICE not available;"
1666
" cannot bind to interface %s",
952
logger.error(u"SO_BINDTODEVICE not available;"
953
u" cannot bind to interface %s",
1667
954
self.interface)
1668
955
else:
1669
956
raise
1671
958
if self.server_address[0] or self.server_address[1]:
1672
959
if not self.server_address[0]:
1673
960
if self.address_family == socket.AF_INET6:
1674
any_address = "::" # in6addr_any
961
any_address = u"::" # in6addr_any
1675
962
else:
1676
963
any_address = socket.INADDR_ANY
1677
964
self.server_address = (any_address,
1695
982
clients: set of Client objects
1696
983
gnutls_priority GnuTLS priority string
1697
984
use_dbus: Boolean; to emit D-Bus signals or not
985
clients: set of Client objects
986
gnutls_priority GnuTLS priority string
987
use_dbus: Boolean; to emit D-Bus signals or not
1698
988
1699
989
Assumes a gobject.MainLoop event loop.
1700
990
"""
1704
994
self.enabled = False
1705
995
self.clients = clients
1706
996
if self.clients is None:
1707
self.clients = {}
997
self.clients = set()
1708
998
self.use_dbus = use_dbus
1709
999
self.gnutls_priority = gnutls_priority
1710
1000
IPv6_TCPServer.__init__(self, server_address,
1714
1004
def server_activate(self):
1715
1005
if self.enabled:
1716
1006
return socketserver.TCPServer.server_activate(self)
1717
1718
1007
def enable(self):
1719
1008
self.enabled = True
1720
1721
def add_pipe(self, parent_pipe, proc):
1009
def add_pipe(self, pipe):
1722
1010
# 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):
1011
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1012
self.handle_ipc)
1013
def handle_ipc(self, source, condition, file_objects={}):
1732
1014
condition_names = {
1733
gobject.IO_IN: "IN", # There is data to read.
1734
gobject.IO_OUT: "OUT", # Data can be written (without
1015
gobject.IO_IN: u"IN", # There is data to read.
1016
gobject.IO_OUT: u"OUT", # Data can be written (without
1735
1017
# 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
1018
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1019
gobject.IO_ERR: u"ERR", # Error condition.
1020
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1739
1021
# broken, usually for pipes and
1740
1022
# sockets).
1741
1023
}
1743
1025
for cond, name in
1744
1026
condition_names.iteritems()
1745
1027
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
1028
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1029
conditions_string)
1030
1031
# Turn the pipe file descriptor into a Python file object
1032
if source not in file_objects:
1033
file_objects[source] = os.fdopen(source, u"r", 1)
1034
1035
# Read a line from the file object
1036
cmdline = file_objects[source].readline()
1037
if not cmdline: # Empty line means end of file
1038
# close the IPC pipe
1039
file_objects[source].close()
1040
del file_objects[source]
1041
1042
# Stop calling this function
1043
return False
1044
1045
logger.debug(u"IPC command: %r", cmdline)
1046
1047
# Parse and act on command
1048
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1049
1050
if cmd == u"NOTFOUND":
1051
logger.warning(u"Client not found for fingerprint: %s",
1052
args)
1053
if self.use_dbus:
1054
# Emit D-Bus signal
1055
mandos_dbus_service.ClientNotFound(args)
1056
elif cmd == u"INVALID":
1057
for client in self.clients:
1058
if client.name == args:
1059
logger.warning(u"Client %s is invalid", args)
1060
if self.use_dbus:
1061
# Emit D-Bus signal
1062
client.Rejected()
1063
break
1064
else:
1065
logger.error(u"Unknown client %s is invalid", args)
1066
elif cmd == u"SENDING":
1067
for client in self.clients:
1068
if client.name == args:
1069
logger.info(u"Sending secret to %s", client.name)
1070
client.checked_ok()
1071
if self.use_dbus:
1072
# Emit D-Bus signal
1073
client.ReceivedSecret()
1074
break
1075
else:
1076
logger.error(u"Sending secret to unknown client %s",
1077
args)
1078
else:
1079
logger.error(u"Unknown IPC command: %r", cmdline)
1080
1081
# Keep calling this function
1808
1082
return True
1809
1083
1810
1084
1811
1085
def string_to_delta(interval):
1812
1086
"""Parse a string and return a datetime.timedelta
1813
1087
1814
>>> string_to_delta('7d')
1088
>>> string_to_delta(u'7d')
1815
1089
datetime.timedelta(7)
1816
>>> string_to_delta('60s')
1090
>>> string_to_delta(u'60s')
1817
1091
datetime.timedelta(0, 60)
1818
>>> string_to_delta('60m')
1092
>>> string_to_delta(u'60m')
1819
1093
datetime.timedelta(0, 3600)
1820
>>> string_to_delta('24h')
1094
>>> string_to_delta(u'24h')
1821
1095
datetime.timedelta(1)
1822
>>> string_to_delta('1w')
1096
>>> string_to_delta(u'1w')
1823
1097
datetime.timedelta(7)
1824
>>> string_to_delta('5m 30s')
1098
>>> string_to_delta(u'5m 30s')
1825
1099
datetime.timedelta(0, 330)
1826
1100
"""
1827
1101
timevalue = datetime.timedelta(0)
1829
1103
try:
1830
1104
suffix = unicode(s[-1])
1831
1105
value = int(s[:-1])
1832
if suffix == "d":
1106
if suffix == u"d":
1833
1107
delta = datetime.timedelta(value)
1834
elif suffix == "s":
1108
elif suffix == u"s":
1835
1109
delta = datetime.timedelta(0, value)
1836
elif suffix == "m":
1110
elif suffix == u"m":
1837
1111
delta = datetime.timedelta(0, 0, 0, 0, value)
1838
elif suffix == "h":
1112
elif suffix == u"h":
1839
1113
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1840
elif suffix == "w":
1114
elif suffix == u"w":
1841
1115
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1842
1116
else:
1843
raise ValueError("Unknown suffix %r" % suffix)
1844
except (ValueError, IndexError) as e:
1845
raise ValueError(*(e.args))
1117
raise ValueError
1118
except (ValueError, IndexError):
1119
raise ValueError
1846
1120
timevalue += delta
1847
1121
return timevalue
1848
1122
1854
1128
global if_nametoindex
1855
1129
try:
1856
1130
if_nametoindex = (ctypes.cdll.LoadLibrary
1857
(ctypes.util.find_library("c"))
1131
(ctypes.util.find_library(u"c"))
1858
1132
.if_nametoindex)
1859
1133
except (OSError, AttributeError):
1860
logger.warning("Doing if_nametoindex the hard way")
1134
logger.warning(u"Doing if_nametoindex the hard way")
1861
1135
def if_nametoindex(interface):
1862
1136
"Get an interface index the hard way, i.e. using fcntl()"
1863
1137
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1864
with contextlib.closing(socket.socket()) as s:
1138
with closing(socket.socket()) as s:
1865
1139
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1866
struct.pack(str("16s16x"),
1140
struct.pack(str(u"16s16x"),
1867
1141
interface))
1868
interface_index = struct.unpack(str("I"),
1142
interface_index = struct.unpack(str(u"I"),
1869
1143
ifreq[16:20])[0]
1870
1144
return interface_index
1871
1145
return if_nametoindex(interface)
1879
1153
sys.exit()
1880
1154
os.setsid()
1881
1155
if not nochdir:
1882
os.chdir("/")
1156
os.chdir(u"/")
1883
1157
if os.fork():
1884
1158
sys.exit()
1885
1159
if not noclose:
1887
1161
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1888
1162
if not stat.S_ISCHR(os.fstat(null).st_mode):
1889
1163
raise OSError(errno.ENODEV,
1890
"%s not a character device"
1891
% os.path.devnull)
1164
u"/dev/null not a character device")
1892
1165
os.dup2(null, sys.stdin.fileno())
1893
1166
os.dup2(null, sys.stdout.fileno())
1894
1167
os.dup2(null, sys.stderr.fileno())
1898
1171
1899
1172
def main():
1900
1173
1901
##################################################################
1174
######################################################################
1902
1175
# Parsing of options, both command line and config file
1903
1176
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()
1177
parser = optparse.OptionParser(version = "%%prog %s" % version)
1178
parser.add_option("-i", u"--interface", type=u"string",
1179
metavar="IF", help=u"Bind to interface IF")
1180
parser.add_option("-a", u"--address", type=u"string",
1181
help=u"Address to listen for requests on")
1182
parser.add_option("-p", u"--port", type=u"int",
1183
help=u"Port number to receive requests on")
1184
parser.add_option("--check", action=u"store_true",
1185
help=u"Run self-test")
1186
parser.add_option("--debug", action=u"store_true",
1187
help=u"Debug mode; run in foreground and log to"
1188
u" terminal")
1189
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1190
u" priority string (see GnuTLS documentation)")
1191
parser.add_option("--servicename", type=u"string",
1192
metavar=u"NAME", help=u"Zeroconf service name")
1193
parser.add_option("--configdir", type=u"string",
1194
default=u"/etc/mandos", metavar=u"DIR",
1195
help=u"Directory to search for configuration"
1196
u" files")
1197
parser.add_option("--no-dbus", action=u"store_false",
1198
dest=u"use_dbus", help=u"Do not provide D-Bus"
1199
u" system bus interface")
1200
parser.add_option("--no-ipv6", action=u"store_false",
1201
dest=u"use_ipv6", help=u"Do not use IPv6")
1202
options = parser.parse_args()[0]
1940
1203
1941
1204
if options.check:
1942
1205
import doctest
1944
1207
sys.exit()
1945
1208
1946
1209
# 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": "",
1210
server_defaults = { u"interface": u"",
1211
u"address": u"",
1212
u"port": u"",
1213
u"debug": u"False",
1214
u"priority":
1215
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1216
u"servicename": u"Mandos",
1217
u"use_dbus": u"True",
1218
u"use_ipv6": u"True",
1957
1219
}
1958
1220
1959
1221
# Parse config file for server-global settings
1960
1222
server_config = configparser.SafeConfigParser(server_defaults)
1961
1223
del server_defaults
1962
1224
server_config.read(os.path.join(options.configdir,
1963
"mandos.conf"))
1225
u"mandos.conf"))
1964
1226
# Convert the SafeConfigParser object to a dict
1965
1227
server_settings = server_config.defaults()
1966
1228
# 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",
1229
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1230
server_settings[option] = server_config.getboolean(u"DEFAULT",
1969
1231
option)
1970
1232
if server_settings["port"]:
1971
server_settings["port"] = server_config.getint("DEFAULT",
1972
"port")
1233
server_settings["port"] = server_config.getint(u"DEFAULT",
1234
u"port")
1973
1235
del server_config
1974
1236
1975
1237
# Override the settings from the config file with command line
1976
1238
# options, if set.
1977
for option in ("interface", "address", "port", "debug",
1978
"priority", "servicename", "configdir",
1979
"use_dbus", "use_ipv6", "debuglevel", "restore"):
1239
for option in (u"interface", u"address", u"port", u"debug",
1240
u"priority", u"servicename", u"configdir",
1241
u"use_dbus", u"use_ipv6"):
1980
1242
value = getattr(options, option)
1981
1243
if value is not None:
1982
1244
server_settings[option] = value
1990
1252
##################################################################
1991
1253
1992
1254
# 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":
1255
debug = server_settings[u"debug"]
1256
use_dbus = server_settings[u"use_dbus"]
1257
use_ipv6 = server_settings[u"use_ipv6"]
1258
1259
if not debug:
1260
syslogger.setLevel(logging.WARNING)
1261
console.setLevel(logging.WARNING)
1262
1263
if server_settings[u"servicename"] != u"Mandos":
1999
1264
syslogger.setFormatter(logging.Formatter
2000
('Mandos (%s) [%%(process)d]:'
2001
' %%(levelname)s: %%(message)s'
2002
% server_settings["servicename"]))
1265
(u'Mandos (%s) [%%(process)d]:'
1266
u' %%(levelname)s: %%(message)s'
1267
% server_settings[u"servicename"]))
2003
1268
2004
1269
# 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",
1270
client_defaults = { u"timeout": u"1h",
1271
u"interval": u"5m",
1272
u"checker": u"fping -q -- %%(host)s",
1273
u"host": u"",
2012
1274
}
2013
1275
client_config = configparser.SafeConfigParser(client_defaults)
2014
client_config.read(os.path.join(server_settings["configdir"],
2015
"clients.conf"))
1276
client_config.read(os.path.join(server_settings[u"configdir"],
1277
u"clients.conf"))
2016
1278
2017
1279
global mandos_dbus_service
2018
1280
mandos_dbus_service = None
2019
1281
2020
tcp_server = MandosServer((server_settings["address"],
2021
server_settings["port"]),
1282
tcp_server = MandosServer((server_settings[u"address"],
1283
server_settings[u"port"]),
2022
1284
ClientHandler,
2023
interface=(server_settings["interface"]
2024
or None),
1285
interface=server_settings[u"interface"],
2025
1286
use_ipv6=use_ipv6,
2026
1287
gnutls_priority=
2027
server_settings["priority"],
1288
server_settings[u"priority"],
2028
1289
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)
1290
pidfilename = u"/var/run/mandos.pid"
1291
try:
1292
pidfile = open(pidfilename, u"w")
1293
except IOError:
1294
logger.error(u"Could not open file %r", pidfilename)
2035
1295
2036
1296
try:
2037
uid = pwd.getpwnam("_mandos").pw_uid
2038
gid = pwd.getpwnam("_mandos").pw_gid
1297
uid = pwd.getpwnam(u"_mandos").pw_uid
1298
gid = pwd.getpwnam(u"_mandos").pw_gid
2039
1299
except KeyError:
2040
1300
try:
2041
uid = pwd.getpwnam("mandos").pw_uid
2042
gid = pwd.getpwnam("mandos").pw_gid
1301
uid = pwd.getpwnam(u"mandos").pw_uid
1302
gid = pwd.getpwnam(u"mandos").pw_gid
2043
1303
except KeyError:
2044
1304
try:
2045
uid = pwd.getpwnam("nobody").pw_uid
2046
gid = pwd.getpwnam("nobody").pw_gid
1305
uid = pwd.getpwnam(u"nobody").pw_uid
1306
gid = pwd.getpwnam(u"nobody").pw_gid
2047
1307
except KeyError:
2048
1308
uid = 65534
2049
1309
gid = 65534
2050
1310
try:
2051
1311
os.setgid(gid)
2052
1312
os.setuid(uid)
2053
except OSError as error:
1313
except OSError, error:
2054
1314
if error[0] != errno.EPERM:
2055
1315
raise error
2056
1316
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
1317
# Enable all possible GnuTLS debugging
2063
1318
if debug:
2064
logger.setLevel(logging.DEBUG)
2065
# Enable all possible GnuTLS debugging
2066
2067
1319
# "Use a log level over 10 to enable all debugging options."
2068
1320
# - GnuTLS manual
2069
1321
gnutls.library.functions.gnutls_global_set_log_level(11)
2070
1322
2071
1323
@gnutls.library.types.gnutls_log_func
2072
1324
def debug_gnutls(level, string):
2073
logger.debug("GnuTLS: %s", string[:-1])
1325
logger.debug(u"GnuTLS: %s", string[:-1])
2074
1326
2075
1327
(gnutls.library.functions
2076
1328
.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
1329
2092
1330
global main_loop
2093
1331
# From the Avahi example code
2096
1334
bus = dbus.SystemBus()
2097
1335
# End of Avahi example code
2098
1336
if use_dbus:
2099
try:
2100
bus_name = dbus.service.BusName("se.recompile.Mandos",
2101
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")
2107
use_dbus = False
2108
server_settings["use_dbus"] = False
2109
tcp_server.use_dbus = False
1337
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
2110
1338
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)
1339
service = AvahiService(name = server_settings[u"servicename"],
1340
servicetype = u"_mandos._tcp",
1341
protocol = protocol, bus = bus)
2115
1342
if server_settings["interface"]:
2116
1343
service.interface = (if_nametoindex
2117
(str(server_settings["interface"])))
2118
2119
global multiprocessing_manager
2120
multiprocessing_manager = multiprocessing.Manager()
1344
(str(server_settings[u"interface"])))
2121
1345
2122
1346
client_class = Client
2123
1347
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
1348
client_class = functools.partial(ClientDBus, bus = bus)
1349
tcp_server.clients.update(set(
1350
client_class(name = section,
1351
config= dict(client_config.items(section)))
1352
for section in client_config.sections()))
2225
1353
if not tcp_server.clients:
2226
logger.warning("No clients defined")
1354
logger.warning(u"No clients defined")
1355
1356
if debug:
1357
# Redirect stdin so all checkers get /dev/null
1358
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1359
os.dup2(null, sys.stdin.fileno())
1360
if null > 2:
1361
os.close(null)
1362
else:
1363
# No console logging
1364
logger.removeHandler(console)
1365
# Close all input and output, do double fork, etc.
1366
daemon()
1367
1368
try:
1369
with closing(pidfile):
1370
pid = os.getpid()
1371
pidfile.write(str(pid) + "\n")
1372
del pidfile
1373
except IOError:
1374
logger.error(u"Could not write to file %r with PID %d",
1375
pidfilename, pid)
1376
except NameError:
1377
# "pidfile" was never created
1378
pass
1379
del pidfilename
1380
1381
def cleanup():
1382
"Cleanup function; run on exit"
1383
service.cleanup()
2227
1384
1385
while tcp_server.clients:
1386
client = tcp_server.clients.pop()
1387
client.disable_hook = None
1388
client.disable()
1389
1390
atexit.register(cleanup)
1391
2228
1392
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
1393
signal.signal(signal.SIGINT, signal.SIG_IGN)
2243
2244
1394
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2245
1395
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2246
1396
2248
1398
class MandosDBusService(dbus.service.Object):
2249
1399
"""A D-Bus proxy object"""
2250
1400
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")
1401
dbus.service.Object.__init__(self, bus, u"/")
1402
_interface = u"se.bsnet.fukt.Mandos"
1403
1404
@dbus.service.signal(_interface, signature=u"oa{sv}")
1405
def ClientAdded(self, objpath, properties):
1406
"D-Bus signal"
1407
pass
1408
1409
@dbus.service.signal(_interface, signature=u"s")
1410
def ClientNotFound(self, fingerprint):
1411
"D-Bus signal"
1412
pass
1413
1414
@dbus.service.signal(_interface, signature=u"os")
2265
1415
def ClientRemoved(self, objpath, name):
2266
1416
"D-Bus signal"
2267
1417
pass
2268
1418
2269
@dbus.service.method(_interface, out_signature="ao")
1419
@dbus.service.method(_interface, out_signature=u"ao")
2270
1420
def GetAllClients(self):
2271
1421
"D-Bus method"
2272
1422
return dbus.Array(c.dbus_object_path
2273
for c in
2274
tcp_server.clients.itervalues())
1423
for c in tcp_server.clients)
2275
1424
2276
1425
@dbus.service.method(_interface,
2277
out_signature="a{oa{sv}}")
1426
out_signature=u"a{oa{sv}}")
2278
1427
def GetAllClientsWithProperties(self):
2279
1428
"D-Bus method"
2280
1429
return dbus.Dictionary(
2281
((c.dbus_object_path, c.GetAll(""))
2282
for c in tcp_server.clients.itervalues()),
2283
signature="oa{sv}")
1430
((c.dbus_object_path, c.GetAllProperties())
1431
for c in tcp_server.clients),
1432
signature=u"oa{sv}")
2284
1433
2285
@dbus.service.method(_interface, in_signature="o")
1434
@dbus.service.method(_interface, in_signature=u"o")
2286
1435
def RemoveClient(self, object_path):
2287
1436
"D-Bus method"
2288
for c in tcp_server.clients.itervalues():
1437
for c in tcp_server.clients:
2289
1438
if c.dbus_object_path == object_path:
2290
del tcp_server.clients[c.name]
1439
tcp_server.clients.remove(c)
2291
1440
c.remove_from_connection()
2292
1441
# Don't signal anything except ClientRemoved
2293
c.disable(quiet=True)
1442
c.disable(signal=False)
2294
1443
# Emit D-Bus signal
2295
1444
self.ClientRemoved(object_path, c.name)
2296
1445
return
2297
raise KeyError(object_path)
1446
raise KeyError
2298
1447
2299
1448
del _interface
2300
1449
2301
class MandosDBusServiceTransitional(MandosDBusService):
2302
__metaclass__ = AlternateDBusNamesMetaclass
2303
mandos_dbus_service = MandosDBusServiceTransitional()
2304
2305
def cleanup():
2306
"Cleanup function; run on exit"
2307
service.cleanup()
2308
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
while tcp_server.clients:
2351
name, client = tcp_server.clients.popitem()
2352
if use_dbus:
2353
client.remove_from_connection()
2354
# Don't signal anything except ClientRemoved
2355
client.disable(quiet=True)
2356
if use_dbus:
2357
# Emit D-Bus signal
2358
mandos_dbus_service.ClientRemoved(client
2359
.dbus_object_path,
2360
client.name)
2361
client_settings.clear()
2362
2363
atexit.register(cleanup)
2364
2365
for client in tcp_server.clients.itervalues():
1450
mandos_dbus_service = MandosDBusService()
1451
1452
for client in tcp_server.clients:
2366
1453
if use_dbus:
2367
1454
# 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
1455
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1456
client.GetAllProperties())
1457
client.enable()
2373
1458
2374
1459
tcp_server.enable()
2375
1460
tcp_server.server_activate()
2377
1462
# Find out what port we got
2378
1463
service.port = tcp_server.socket.getsockname()[1]
2379
1464
if use_ipv6:
2380
logger.info("Now listening on address %r, port %d,"
1465
logger.info(u"Now listening on address %r, port %d,"
2381
1466
" flowinfo %d, scope_id %d"
2382
1467
% tcp_server.socket.getsockname())
2383
1468
else: # IPv4
2384
logger.info("Now listening on address %r, port %d"
1469
logger.info(u"Now listening on address %r, port %d"
2385
1470
% tcp_server.socket.getsockname())
2386
1471
2387
1472
#service.interface = tcp_server.socket.getsockname()[3]
2390
1475
# From the Avahi example code
2391
1476
try:
2392
1477
service.activate()
2393
except dbus.exceptions.DBusException as error:
2394
logger.critical("DBusException: %s", error)
2395
cleanup()
1478
except dbus.exceptions.DBusException, error:
1479
logger.critical(u"DBusException: %s", error)
2396
1480
sys.exit(1)
2397
1481
# End of Avahi example code
2398
1482
2401
1485
(tcp_server.handle_request
2402
1486
(*args[2:], **kwargs) or True))
2403
1487
2404
logger.debug("Starting main loop")
1488
logger.debug(u"Starting main loop")
2405
1489
main_loop.run()
2406
except AvahiError as error:
2407
logger.critical("AvahiError: %s", error)
2408
cleanup()
1490
except AvahiError, error:
1491
logger.critical(u"AvahiError: %s", error)
2409
1492
sys.exit(1)
2410
1493
except KeyboardInterrupt:
2411
1494
if debug:
2412
print("", file=sys.stderr)
2413
logger.debug("Server received KeyboardInterrupt")
2414
logger.debug("Server exiting")
2415
# Must run before the D-Bus bus name gets deregistered
2416
cleanup()
2417
1495
print >> sys.stderr
1496
logger.debug(u"Server received KeyboardInterrupt")
1497
logger.debug(u"Server exiting")
2418
1498
2419
1499
if __name__ == '__main__':
2420
1500
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0