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