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