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