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 482
- compare with another revision
- download diff
- download tarball
- view history from revision 482
- Committer: Teddy Hogeborn
- Date: 2011-04-02 06:37:18 UTC
- Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers. Also Changed to new
"except x as y" exception syntax.
(AvahiService.entry_group_state_changed_match): New; contains the
SignalMatch object.
(AvahiService.remove): Really remove the group and the signal
connection, if any.
(AvahiService.add): Always create a new group and signal connection.
(AvahiService.cleanup): Changed to simply call remove().
(AvahiService.server_state_changed): Handle and log more bad states.
(AvahiService.activate): Set "follow_name_owner_changes=True" on the
Avahi Server proxy object.
(ClientDBus.checked_ok): Do not return anything.
(ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.
"except x as y" exception syntax.
(AvahiService.entry_group_state_changed_match): New; contains the
SignalMatch object.
(AvahiService.remove): Really remove the group and the signal
connection, if any.
(AvahiService.add): Always create a new group and signal connection.
(AvahiService.cleanup): Changed to simply call remove().
(AvahiService.server_state_changed): Handle and log more bad states.
(AvahiService.activate): Set "follow_name_owner_changes=True" on the
Avahi Server proxy object.
(ClientDBus.checked_ok): Do not return anything.
(ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.
- files added:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
31
31
# Contact the authors at <mandos@fukt.bsnet.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
60
61
import fcntl
61
62
import functools
62
63
import cPickle as pickle
64
import multiprocessing
63
65
64
66
import dbus
65
67
import dbus.service
80
82
SO_BINDTODEVICE = None
81
83
82
84
83
version = "1.0.14"
85
version = "1.3.0"
84
86
85
logger = logging.Logger(u'mandos')
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
86
89
syslogger = (logging.handlers.SysLogHandler
87
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
88
address = "/dev/log"))
91
address = str("/dev/log")))
89
92
syslogger.setFormatter(logging.Formatter
90
(u'Mandos [%(process)d]: %(levelname)s:'
91
u' %(message)s'))
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
92
95
logger.addHandler(syslogger)
93
96
94
97
console = logging.StreamHandler()
95
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
96
u' %(levelname)s:'
97
u' %(message)s'))
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
98
101
logger.addHandler(console)
99
102
100
103
class AvahiError(Exception):
117
120
Attributes:
118
121
interface: integer; avahi.IF_UNSPEC or an interface index.
119
122
Used to optionally bind to the specified interface.
120
name: string; Example: u'Mandos'
121
type: string; Example: u'_mandos._tcp'.
123
name: string; Example: 'Mandos'
124
type: string; Example: '_mandos._tcp'.
122
125
See <http://www.dns-sd.org/ServiceTypes.html>
123
126
port: integer; what port to announce
124
127
TXT: list of strings; TXT record for the service
133
136
"""
134
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
135
138
servicetype = None, port = None, TXT = None,
136
domain = u"", host = u"", max_renames = 32768,
139
domain = "", host = "", max_renames = 32768,
137
140
protocol = avahi.PROTO_UNSPEC, bus = None):
138
141
self.interface = interface
139
142
self.name = name
148
151
self.group = None # our entry group
149
152
self.server = None
150
153
self.bus = bus
154
self.entry_group_state_changed_match = None
151
155
def rename(self):
152
156
"""Derived from the Avahi example code"""
153
157
if self.rename_count >= self.max_renames:
154
logger.critical(u"No suitable Zeroconf service name found"
155
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
156
160
self.rename_count)
157
raise AvahiServiceError(u"Too many renames")
158
self.name = self.server.GetAlternativeServiceName(self.name)
159
logger.info(u"Changing Zeroconf service name to %r ...",
160
unicode(self.name))
161
raise AvahiServiceError("Too many renames")
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
164
self.name)
161
165
syslogger.setFormatter(logging.Formatter
162
(u'Mandos (%s) [%%(process)d]:'
163
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
164
168
% self.name))
165
169
self.remove()
166
self.add()
170
try:
171
self.add()
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
174
self.cleanup()
175
os._exit(1)
167
176
self.rename_count += 1
168
177
def remove(self):
169
178
"""Derived from the Avahi example code"""
170
179
if self.group is not None:
171
self.group.Reset()
180
try:
181
self.group.Free()
182
except (dbus.exceptions.UnknownMethodException,
183
dbus.exceptions.DBusException) as e:
184
pass
185
self.group = None
186
if self.entry_group_state_changed_match is not None:
187
self.entry_group_state_changed_match.remove()
188
self.entry_group_state_changed_match = None
172
189
def add(self):
173
190
"""Derived from the Avahi example code"""
174
if self.group is None:
175
self.group = dbus.Interface(
176
self.bus.get_object(avahi.DBUS_NAME,
177
self.server.EntryGroupNew()),
178
avahi.DBUS_INTERFACE_ENTRY_GROUP)
179
self.group.connect_to_signal('StateChanged',
180
self
181
.entry_group_state_changed)
182
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
191
self.remove()
192
self.group = dbus.Interface(
193
self.bus.get_object(avahi.DBUS_NAME,
194
self.server.EntryGroupNew(),
195
follow_name_owner_changes=True),
196
avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
self.entry_group_state_changed_match = (
198
self.group.connect_to_signal(
199
'StateChanged', self .entry_group_state_changed))
200
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
183
201
self.name, self.type)
184
202
self.group.AddService(
185
203
self.interface,
192
210
self.group.Commit()
193
211
def entry_group_state_changed(self, state, error):
194
212
"""Derived from the Avahi example code"""
195
logger.debug(u"Avahi state change: %i", state)
213
logger.debug("Avahi entry group state change: %i", state)
196
214
197
215
if state == avahi.ENTRY_GROUP_ESTABLISHED:
198
logger.debug(u"Zeroconf service established.")
216
logger.debug("Zeroconf service established.")
199
217
elif state == avahi.ENTRY_GROUP_COLLISION:
200
logger.warning(u"Zeroconf service name collision.")
218
logger.info("Zeroconf service name collision.")
201
219
self.rename()
202
220
elif state == avahi.ENTRY_GROUP_FAILURE:
203
logger.critical(u"Avahi: Error in group state changed %s",
221
logger.critical("Avahi: Error in group state changed %s",
204
222
unicode(error))
205
raise AvahiGroupError(u"State changed: %s"
223
raise AvahiGroupError("State changed: %s"
206
224
% unicode(error))
207
225
def cleanup(self):
208
226
"""Derived from the Avahi example code"""
209
if self.group is not None:
210
self.group.Free()
211
self.group = None
212
def server_state_changed(self, state):
227
self.remove()
228
def server_state_changed(self, state, error=None):
213
229
"""Derived from the Avahi example code"""
214
if state == avahi.SERVER_COLLISION:
215
logger.error(u"Zeroconf server name collision")
230
logger.debug("Avahi server state change: %i", state)
231
bad_states = { avahi.SERVER_INVALID:
232
"Zeroconf server invalid",
233
avahi.SERVER_REGISTERING: None,
234
avahi.SERVER_COLLISION:
235
"Zeroconf server name collision",
236
avahi.SERVER_FAILURE:
237
"Zeroconf server failure" }
238
if state in bad_states:
239
if bad_states[state]:
240
logger.error(bad_states[state])
216
241
self.remove()
217
242
elif state == avahi.SERVER_RUNNING:
218
243
self.add()
244
else:
245
logger.debug("Unknown state: %r", state)
219
246
def activate(self):
220
247
"""Derived from the Avahi example code"""
221
248
if self.server is None:
222
249
self.server = dbus.Interface(
223
250
self.bus.get_object(avahi.DBUS_NAME,
224
avahi.DBUS_PATH_SERVER),
251
avahi.DBUS_PATH_SERVER,
252
follow_name_owner_changes=True),
225
253
avahi.DBUS_INTERFACE_SERVER)
226
self.server.connect_to_signal(u"StateChanged",
254
self.server.connect_to_signal("StateChanged",
227
255
self.server_state_changed)
228
256
self.server_state_changed(self.server.GetState())
229
257
232
260
"""A representation of a client host served by this server.
233
261
234
262
Attributes:
235
name: string; from the config file, used in log messages and
236
D-Bus identifiers
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approval_delay: datetime.timedelta(); Time to wait for approval
265
approval_duration: datetime.timedelta(); Duration of one approval
266
checker: subprocess.Popen(); a running checker process used
267
to see if the client lives.
268
'None' if no process is running.
269
checker_callback_tag: a gobject event source tag, or None
270
checker_command: string; External command which is run to check
271
if client lives. %() expansions are done at
272
runtime with vars(self) as dict, so that for
273
instance %(name)s can be used in the command.
274
checker_initiator_tag: a gobject event source tag, or None
275
created: datetime.datetime(); (UTC) object creation
276
current_checker_command: string; current running checker_command
277
disable_hook: If set, called by disable() as disable_hook(self)
278
disable_initiator_tag: a gobject event source tag, or None
279
enabled: bool()
237
280
fingerprint: string (40 or 32 hexadecimal digits); used to
238
281
uniquely identify the client
239
secret: bytestring; sent verbatim (over TLS) to client
240
282
host: string; available for use by the checker command
241
created: datetime.datetime(); (UTC) object creation
283
interval: datetime.timedelta(); How often to start a new checker
284
last_approval_request: datetime.datetime(); (UTC) or None
285
last_checked_ok: datetime.datetime(); (UTC) or None
242
286
last_enabled: datetime.datetime(); (UTC)
243
enabled: bool()
244
last_checked_ok: datetime.datetime(); (UTC) or None
287
name: string; from the config file, used in log messages and
288
D-Bus identifiers
289
secret: bytestring; sent verbatim (over TLS) to client
245
290
timeout: datetime.timedelta(); How long from last_checked_ok
246
291
until this client is disabled
247
interval: datetime.timedelta(); How often to start a new checker
248
disable_hook: If set, called by disable() as disable_hook(self)
249
checker: subprocess.Popen(); a running checker process used
250
to see if the client lives.
251
'None' if no process is running.
252
checker_initiator_tag: a gobject event source tag, or None
253
disable_initiator_tag: - '' -
254
checker_callback_tag: - '' -
255
checker_command: string; External command which is run to check if
256
client lives. %() expansions are done at
257
runtime with vars(self) as dict, so that for
258
instance %(name)s can be used in the command.
259
current_checker_command: string; current running checker_command
292
runtime_expansions: Allowed attributes for runtime expansion.
260
293
"""
261
294
295
runtime_expansions = ("approval_delay", "approval_duration",
296
"created", "enabled", "fingerprint",
297
"host", "interval", "last_checked_ok",
298
"last_enabled", "name", "timeout")
299
262
300
@staticmethod
263
301
def _timedelta_to_milliseconds(td):
264
302
"Convert a datetime.timedelta() to milliseconds"
273
311
def interval_milliseconds(self):
274
312
"Return the 'interval' attribute in milliseconds"
275
313
return self._timedelta_to_milliseconds(self.interval)
314
315
def approval_delay_milliseconds(self):
316
return self._timedelta_to_milliseconds(self.approval_delay)
276
317
277
318
def __init__(self, name = None, disable_hook=None, config=None):
278
319
"""Note: the 'checker' key in 'config' sets the
281
322
self.name = name
282
323
if config is None:
283
324
config = {}
284
logger.debug(u"Creating client %r", self.name)
325
logger.debug("Creating client %r", self.name)
285
326
# Uppercase and remove spaces from fingerprint for later
286
327
# comparison purposes with return value from the fingerprint()
287
328
# function
288
self.fingerprint = (config[u"fingerprint"].upper()
289
.replace(u" ", u""))
290
logger.debug(u" Fingerprint: %s", self.fingerprint)
291
if u"secret" in config:
292
self.secret = config[u"secret"].decode(u"base64")
293
elif u"secfile" in config:
329
self.fingerprint = (config["fingerprint"].upper()
330
.replace(" ", ""))
331
logger.debug(" Fingerprint: %s", self.fingerprint)
332
if "secret" in config:
333
self.secret = config["secret"].decode("base64")
334
elif "secfile" in config:
294
335
with open(os.path.expanduser(os.path.expandvars
295
(config[u"secfile"])),
336
(config["secfile"])),
296
337
"rb") as secfile:
297
338
self.secret = secfile.read()
298
339
else:
299
raise TypeError(u"No secret or secfile for client %s"
340
raise TypeError("No secret or secfile for client %s"
300
341
% self.name)
301
self.host = config.get(u"host", u"")
342
self.host = config.get("host", "")
302
343
self.created = datetime.datetime.utcnow()
303
344
self.enabled = False
345
self.last_approval_request = None
304
346
self.last_enabled = None
305
347
self.last_checked_ok = None
306
self.timeout = string_to_delta(config[u"timeout"])
307
self.interval = string_to_delta(config[u"interval"])
348
self.timeout = string_to_delta(config["timeout"])
349
self.interval = string_to_delta(config["interval"])
308
350
self.disable_hook = disable_hook
309
351
self.checker = None
310
352
self.checker_initiator_tag = None
311
353
self.disable_initiator_tag = None
312
354
self.checker_callback_tag = None
313
self.checker_command = config[u"checker"]
355
self.checker_command = config["checker"]
314
356
self.current_checker_command = None
315
357
self.last_connect = None
358
self._approved = None
359
self.approved_by_default = config.get("approved_by_default",
360
True)
361
self.approvals_pending = 0
362
self.approval_delay = string_to_delta(
363
config["approval_delay"])
364
self.approval_duration = string_to_delta(
365
config["approval_duration"])
366
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
316
367
368
def send_changedstate(self):
369
self.changedstate.acquire()
370
self.changedstate.notify_all()
371
self.changedstate.release()
372
317
373
def enable(self):
318
374
"""Start this client's checker and timeout hooks"""
319
if getattr(self, u"enabled", False):
375
if getattr(self, "enabled", False):
320
376
# Already enabled
321
377
return
378
self.send_changedstate()
322
379
self.last_enabled = datetime.datetime.utcnow()
323
380
# Schedule a new checker to be started an 'interval' from now,
324
381
# and every interval from then on.
338
395
if not getattr(self, "enabled", False):
339
396
return False
340
397
if not quiet:
341
logger.info(u"Disabling client %s", self.name)
342
if getattr(self, u"disable_initiator_tag", False):
398
self.send_changedstate()
399
if not quiet:
400
logger.info("Disabling client %s", self.name)
401
if getattr(self, "disable_initiator_tag", False):
343
402
gobject.source_remove(self.disable_initiator_tag)
344
403
self.disable_initiator_tag = None
345
if getattr(self, u"checker_initiator_tag", False):
404
if getattr(self, "checker_initiator_tag", False):
346
405
gobject.source_remove(self.checker_initiator_tag)
347
406
self.checker_initiator_tag = None
348
407
self.stop_checker()
363
422
if os.WIFEXITED(condition):
364
423
exitstatus = os.WEXITSTATUS(condition)
365
424
if exitstatus == 0:
366
logger.info(u"Checker for %(name)s succeeded",
425
logger.info("Checker for %(name)s succeeded",
367
426
vars(self))
368
427
self.checked_ok()
369
428
else:
370
logger.info(u"Checker for %(name)s failed",
429
logger.info("Checker for %(name)s failed",
371
430
vars(self))
372
431
else:
373
logger.warning(u"Checker for %(name)s crashed?",
432
logger.warning("Checker for %(name)s crashed?",
374
433
vars(self))
375
434
376
435
def checked_ok(self):
385
444
(self.timeout_milliseconds(),
386
445
self.disable))
387
446
447
def need_approval(self):
448
self.last_approval_request = datetime.datetime.utcnow()
449
388
450
def start_checker(self):
389
451
"""Start a new checker subprocess if one is not running.
390
452
402
464
# If a checker exists, make sure it is not a zombie
403
465
try:
404
466
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
405
except (AttributeError, OSError), error:
467
except (AttributeError, OSError) as error:
406
468
if (isinstance(error, OSError)
407
469
and error.errno != errno.ECHILD):
408
470
raise error
409
471
else:
410
472
if pid:
411
logger.warning(u"Checker was a zombie")
473
logger.warning("Checker was a zombie")
412
474
gobject.source_remove(self.checker_callback_tag)
413
475
self.checker_callback(pid, status,
414
476
self.current_checker_command)
419
481
command = self.checker_command % self.host
420
482
except TypeError:
421
483
# Escape attributes for the shell
422
escaped_attrs = dict((key,
423
re.escape(unicode(str(val),
424
errors=
425
u'replace')))
426
for key, val in
427
vars(self).iteritems())
484
escaped_attrs = dict(
485
(attr,
486
re.escape(unicode(str(getattr(self, attr, "")),
487
errors=
488
'replace')))
489
for attr in
490
self.runtime_expansions)
491
428
492
try:
429
493
command = self.checker_command % escaped_attrs
430
except TypeError, error:
431
logger.error(u'Could not format string "%s":'
432
u' %s', self.checker_command, error)
494
except TypeError as error:
495
logger.error('Could not format string "%s":'
496
' %s', self.checker_command, error)
433
497
return True # Try again later
434
498
self.current_checker_command = command
435
499
try:
436
logger.info(u"Starting checker %r for %s",
500
logger.info("Starting checker %r for %s",
437
501
command, self.name)
438
502
# We don't need to redirect stdout and stderr, since
439
503
# in normal mode, that is already done by daemon(),
441
505
# always replaced by /dev/null.)
442
506
self.checker = subprocess.Popen(command,
443
507
close_fds=True,
444
shell=True, cwd=u"/")
508
shell=True, cwd="/")
445
509
self.checker_callback_tag = (gobject.child_watch_add
446
510
(self.checker.pid,
447
511
self.checker_callback,
452
516
if pid:
453
517
gobject.source_remove(self.checker_callback_tag)
454
518
self.checker_callback(pid, status, command)
455
except OSError, error:
456
logger.error(u"Failed to start subprocess: %s",
519
except OSError as error:
520
logger.error("Failed to start subprocess: %s",
457
521
error)
458
522
# Re-run this periodically if run by gobject.timeout_add
459
523
return True
463
527
if self.checker_callback_tag:
464
528
gobject.source_remove(self.checker_callback_tag)
465
529
self.checker_callback_tag = None
466
if getattr(self, u"checker", None) is None:
530
if getattr(self, "checker", None) is None:
467
531
return
468
logger.debug(u"Stopping checker for %(name)s", vars(self))
532
logger.debug("Stopping checker for %(name)s", vars(self))
469
533
try:
470
534
os.kill(self.checker.pid, signal.SIGTERM)
471
535
#time.sleep(0.5)
472
536
#if self.checker.poll() is None:
473
537
# os.kill(self.checker.pid, signal.SIGKILL)
474
except OSError, error:
538
except OSError as error:
475
539
if error.errno != errno.ESRCH: # No such process
476
540
raise
477
541
self.checker = None
478
542
479
480
def dbus_service_property(dbus_interface, signature=u"v",
481
access=u"readwrite", byte_arrays=False):
543
def dbus_service_property(dbus_interface, signature="v",
544
access="readwrite", byte_arrays=False):
482
545
"""Decorators for marking methods of a DBusObjectWithProperties to
483
546
become properties on the D-Bus.
484
547
491
554
"""
492
555
# Encoding deeply encoded byte arrays is not supported yet by the
493
556
# "Set" method, so we fail early here:
494
if byte_arrays and signature != u"ay":
495
raise ValueError(u"Byte arrays not supported for non-'ay'"
496
u" signature %r" % signature)
557
if byte_arrays and signature != "ay":
558
raise ValueError("Byte arrays not supported for non-'ay'"
559
" signature %r" % signature)
497
560
def decorator(func):
498
561
func._dbus_is_property = True
499
562
func._dbus_interface = dbus_interface
500
563
func._dbus_signature = signature
501
564
func._dbus_access = access
502
565
func._dbus_name = func.__name__
503
if func._dbus_name.endswith(u"_dbus_property"):
566
if func._dbus_name.endswith("_dbus_property"):
504
567
func._dbus_name = func._dbus_name[:-14]
505
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
568
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
506
569
return func
507
570
return decorator
508
571
536
599
537
600
@staticmethod
538
601
def _is_dbus_property(obj):
539
return getattr(obj, u"_dbus_is_property", False)
602
return getattr(obj, "_dbus_is_property", False)
540
603
541
604
def _get_all_dbus_properties(self):
542
605
"""Returns a generator of (name, attribute) pairs
550
613
property with the specified name and interface.
551
614
"""
552
615
for name in (property_name,
553
property_name + u"_dbus_property"):
616
property_name + "_dbus_property"):
554
617
prop = getattr(self, name, None)
555
618
if (prop is None
556
619
or not self._is_dbus_property(prop)
560
623
continue
561
624
return prop
562
625
# No such property
563
raise DBusPropertyNotFound(self.dbus_object_path + u":"
564
+ interface_name + u"."
626
raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
+ interface_name + "."
565
628
+ property_name)
566
629
567
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
568
out_signature=u"v")
630
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
631
out_signature="v")
569
632
def Get(self, interface_name, property_name):
570
633
"""Standard D-Bus property Get() method, see D-Bus standard.
571
634
"""
572
635
prop = self._get_dbus_property(interface_name, property_name)
573
if prop._dbus_access == u"write":
636
if prop._dbus_access == "write":
574
637
raise DBusPropertyAccessException(property_name)
575
638
value = prop()
576
if not hasattr(value, u"variant_level"):
639
if not hasattr(value, "variant_level"):
577
640
return value
578
641
return type(value)(value, variant_level=value.variant_level+1)
579
642
580
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
643
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
581
644
def Set(self, interface_name, property_name, value):
582
645
"""Standard D-Bus property Set() method, see D-Bus standard.
583
646
"""
584
647
prop = self._get_dbus_property(interface_name, property_name)
585
if prop._dbus_access == u"read":
648
if prop._dbus_access == "read":
586
649
raise DBusPropertyAccessException(property_name)
587
if prop._dbus_get_args_options[u"byte_arrays"]:
650
if prop._dbus_get_args_options["byte_arrays"]:
588
651
# The byte_arrays option is not supported yet on
589
652
# signatures other than "ay".
590
if prop._dbus_signature != u"ay":
653
if prop._dbus_signature != "ay":
591
654
raise ValueError
592
655
value = dbus.ByteArray(''.join(unichr(byte)
593
656
for byte in value))
594
657
prop(value)
595
658
596
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
out_signature=u"a{sv}")
659
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
660
out_signature="a{sv}")
598
661
def GetAll(self, interface_name):
599
662
"""Standard D-Bus property GetAll() method, see D-Bus
600
663
standard.
608
671
# Interface non-empty but did not match
609
672
continue
610
673
# Ignore write-only properties
611
if prop._dbus_access == u"write":
674
if prop._dbus_access == "write":
612
675
continue
613
676
value = prop()
614
if not hasattr(value, u"variant_level"):
677
if not hasattr(value, "variant_level"):
615
678
all[name] = value
616
679
continue
617
680
all[name] = type(value)(value, variant_level=
618
681
value.variant_level+1)
619
return dbus.Dictionary(all, signature=u"sv")
682
return dbus.Dictionary(all, signature="sv")
620
683
621
684
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
622
out_signature=u"s",
685
out_signature="s",
623
686
path_keyword='object_path',
624
687
connection_keyword='connection')
625
688
def Introspect(self, object_path, connection):
630
693
try:
631
694
document = xml.dom.minidom.parseString(xmlstring)
632
695
def make_tag(document, name, prop):
633
e = document.createElement(u"property")
634
e.setAttribute(u"name", name)
635
e.setAttribute(u"type", prop._dbus_signature)
636
e.setAttribute(u"access", prop._dbus_access)
696
e = document.createElement("property")
697
e.setAttribute("name", name)
698
e.setAttribute("type", prop._dbus_signature)
699
e.setAttribute("access", prop._dbus_access)
637
700
return e
638
for if_tag in document.getElementsByTagName(u"interface"):
701
for if_tag in document.getElementsByTagName("interface"):
639
702
for tag in (make_tag(document, name, prop)
640
703
for name, prop
641
704
in self._get_all_dbus_properties()
642
705
if prop._dbus_interface
643
== if_tag.getAttribute(u"name")):
706
== if_tag.getAttribute("name")):
644
707
if_tag.appendChild(tag)
645
708
# Add the names to the return values for the
646
709
# "org.freedesktop.DBus.Properties" methods
647
if (if_tag.getAttribute(u"name")
648
== u"org.freedesktop.DBus.Properties"):
649
for cn in if_tag.getElementsByTagName(u"method"):
650
if cn.getAttribute(u"name") == u"Get":
651
for arg in cn.getElementsByTagName(u"arg"):
652
if (arg.getAttribute(u"direction")
653
== u"out"):
654
arg.setAttribute(u"name", u"value")
655
elif cn.getAttribute(u"name") == u"GetAll":
656
for arg in cn.getElementsByTagName(u"arg"):
657
if (arg.getAttribute(u"direction")
658
== u"out"):
659
arg.setAttribute(u"name", u"props")
660
xmlstring = document.toxml(u"utf-8")
710
if (if_tag.getAttribute("name")
711
== "org.freedesktop.DBus.Properties"):
712
for cn in if_tag.getElementsByTagName("method"):
713
if cn.getAttribute("name") == "Get":
714
for arg in cn.getElementsByTagName("arg"):
715
if (arg.getAttribute("direction")
716
== "out"):
717
arg.setAttribute("name", "value")
718
elif cn.getAttribute("name") == "GetAll":
719
for arg in cn.getElementsByTagName("arg"):
720
if (arg.getAttribute("direction")
721
== "out"):
722
arg.setAttribute("name", "props")
723
xmlstring = document.toxml("utf-8")
661
724
document.unlink()
662
725
except (AttributeError, xml.dom.DOMException,
663
xml.parsers.expat.ExpatError), error:
664
logger.error(u"Failed to override Introspection method",
726
xml.parsers.expat.ExpatError) as error:
727
logger.error("Failed to override Introspection method",
665
728
error)
666
729
return xmlstring
667
730
673
736
dbus_object_path: dbus.ObjectPath
674
737
bus: dbus.SystemBus()
675
738
"""
739
740
runtime_expansions = (Client.runtime_expansions
741
+ ("dbus_object_path",))
742
676
743
# dbus.service.Object doesn't use super(), so we can't either.
677
744
678
745
def __init__(self, bus = None, *args, **kwargs):
746
self._approvals_pending = 0
679
747
self.bus = bus
680
748
Client.__init__(self, *args, **kwargs)
681
749
# Only now, when this client is initialized, can it show up on
682
750
# the D-Bus
751
client_object_name = unicode(self.name).translate(
752
{ord("."): ord("_"),
753
ord("-"): ord("_")})
683
754
self.dbus_object_path = (dbus.ObjectPath
684
(u"/clients/"
685
+ self.name.replace(u".", u"_")))
755
("/clients/" + client_object_name))
686
756
DBusObjectWithProperties.__init__(self, self.bus,
687
757
self.dbus_object_path)
758
759
def _get_approvals_pending(self):
760
return self._approvals_pending
761
def _set_approvals_pending(self, value):
762
old_value = self._approvals_pending
763
self._approvals_pending = value
764
bval = bool(value)
765
if (hasattr(self, "dbus_object_path")
766
and bval is not bool(old_value)):
767
dbus_bool = dbus.Boolean(bval, variant_level=1)
768
self.PropertyChanged(dbus.String("ApprovalPending"),
769
dbus_bool)
770
771
approvals_pending = property(_get_approvals_pending,
772
_set_approvals_pending)
773
del _get_approvals_pending, _set_approvals_pending
688
774
689
775
@staticmethod
690
776
def _datetime_to_dbus(dt, variant_level=0):
693
779
variant_level=variant_level)
694
780
695
781
def enable(self):
696
oldstate = getattr(self, u"enabled", False)
782
oldstate = getattr(self, "enabled", False)
697
783
r = Client.enable(self)
698
784
if oldstate != self.enabled:
699
785
# Emit D-Bus signals
700
self.PropertyChanged(dbus.String(u"enabled"),
786
self.PropertyChanged(dbus.String("Enabled"),
701
787
dbus.Boolean(True, variant_level=1))
702
788
self.PropertyChanged(
703
dbus.String(u"last_enabled"),
789
dbus.String("LastEnabled"),
704
790
self._datetime_to_dbus(self.last_enabled,
705
791
variant_level=1))
706
792
return r
707
793
708
794
def disable(self, quiet = False):
709
oldstate = getattr(self, u"enabled", False)
795
oldstate = getattr(self, "enabled", False)
710
796
r = Client.disable(self, quiet=quiet)
711
797
if not quiet and oldstate != self.enabled:
712
798
# Emit D-Bus signal
713
self.PropertyChanged(dbus.String(u"enabled"),
799
self.PropertyChanged(dbus.String("Enabled"),
714
800
dbus.Boolean(False, variant_level=1))
715
801
return r
716
802
719
805
self.remove_from_connection()
720
806
except LookupError:
721
807
pass
722
if hasattr(DBusObjectWithProperties, u"__del__"):
808
if hasattr(DBusObjectWithProperties, "__del__"):
723
809
DBusObjectWithProperties.__del__(self, *args, **kwargs)
724
810
Client.__del__(self, *args, **kwargs)
725
811
728
814
self.checker_callback_tag = None
729
815
self.checker = None
730
816
# Emit D-Bus signal
731
self.PropertyChanged(dbus.String(u"checker_running"),
817
self.PropertyChanged(dbus.String("CheckerRunning"),
732
818
dbus.Boolean(False, variant_level=1))
733
819
if os.WIFEXITED(condition):
734
820
exitstatus = os.WEXITSTATUS(condition)
746
832
*args, **kwargs)
747
833
748
834
def checked_ok(self, *args, **kwargs):
749
r = Client.checked_ok(self, *args, **kwargs)
835
Client.checked_ok(self, *args, **kwargs)
750
836
# Emit D-Bus signal
751
837
self.PropertyChanged(
752
dbus.String(u"last_checked_ok"),
838
dbus.String("LastCheckedOK"),
753
839
(self._datetime_to_dbus(self.last_checked_ok,
754
840
variant_level=1)))
841
842
def need_approval(self, *args, **kwargs):
843
r = Client.need_approval(self, *args, **kwargs)
844
# Emit D-Bus signal
845
self.PropertyChanged(
846
dbus.String("LastApprovalRequest"),
847
(self._datetime_to_dbus(self.last_approval_request,
848
variant_level=1)))
755
849
return r
756
850
757
851
def start_checker(self, *args, **kwargs):
767
861
# Emit D-Bus signal
768
862
self.CheckerStarted(self.current_checker_command)
769
863
self.PropertyChanged(
770
dbus.String(u"checker_running"),
864
dbus.String("CheckerRunning"),
771
865
dbus.Boolean(True, variant_level=1))
772
866
return r
773
867
774
868
def stop_checker(self, *args, **kwargs):
775
old_checker = getattr(self, u"checker", None)
869
old_checker = getattr(self, "checker", None)
776
870
r = Client.stop_checker(self, *args, **kwargs)
777
871
if (old_checker is not None
778
and getattr(self, u"checker", None) is None):
779
self.PropertyChanged(dbus.String(u"checker_running"),
872
and getattr(self, "checker", None) is None):
873
self.PropertyChanged(dbus.String("CheckerRunning"),
780
874
dbus.Boolean(False, variant_level=1))
781
875
return r
782
783
## D-Bus methods & signals
784
_interface = u"se.bsnet.fukt.Mandos.Client"
785
786
# CheckedOK - method
787
@dbus.service.method(_interface)
788
def CheckedOK(self):
789
return self.checked_ok()
876
877
def _reset_approved(self):
878
self._approved = None
879
return False
880
881
def approve(self, value=True):
882
self.send_changedstate()
883
self._approved = value
884
gobject.timeout_add(self._timedelta_to_milliseconds
885
(self.approval_duration),
886
self._reset_approved)
887
888
889
## D-Bus methods, signals & properties
890
_interface = "se.bsnet.fukt.Mandos.Client"
891
892
## Signals
790
893
791
894
# CheckerCompleted - signal
792
@dbus.service.signal(_interface, signature=u"nxs")
895
@dbus.service.signal(_interface, signature="nxs")
793
896
def CheckerCompleted(self, exitcode, waitstatus, command):
794
897
"D-Bus signal"
795
898
pass
796
899
797
900
# CheckerStarted - signal
798
@dbus.service.signal(_interface, signature=u"s")
901
@dbus.service.signal(_interface, signature="s")
799
902
def CheckerStarted(self, command):
800
903
"D-Bus signal"
801
904
pass
802
905
803
906
# PropertyChanged - signal
804
@dbus.service.signal(_interface, signature=u"sv")
907
@dbus.service.signal(_interface, signature="sv")
805
908
def PropertyChanged(self, property, value):
806
909
"D-Bus signal"
807
910
pass
809
912
# GotSecret - signal
810
913
@dbus.service.signal(_interface)
811
914
def GotSecret(self):
812
"D-Bus signal"
915
"""D-Bus signal
916
Is sent after a successful transfer of secret from the Mandos
917
server to mandos-client
918
"""
813
919
pass
814
920
815
921
# Rejected - signal
816
@dbus.service.signal(_interface)
817
def Rejected(self):
922
@dbus.service.signal(_interface, signature="s")
923
def Rejected(self, reason):
818
924
"D-Bus signal"
819
925
pass
820
926
927
# NeedApproval - signal
928
@dbus.service.signal(_interface, signature="tb")
929
def NeedApproval(self, timeout, default):
930
"D-Bus signal"
931
return self.need_approval()
932
933
## Methods
934
935
# Approve - method
936
@dbus.service.method(_interface, in_signature="b")
937
def Approve(self, value):
938
self.approve(value)
939
940
# CheckedOK - method
941
@dbus.service.method(_interface)
942
def CheckedOK(self):
943
self.checked_ok()
944
821
945
# Enable - method
822
946
@dbus.service.method(_interface)
823
947
def Enable(self):
841
965
def StopChecker(self):
842
966
self.stop_checker()
843
967
844
# name - property
845
@dbus_service_property(_interface, signature=u"s", access=u"read")
846
def name_dbus_property(self):
968
## Properties
969
970
# ApprovalPending - property
971
@dbus_service_property(_interface, signature="b", access="read")
972
def ApprovalPending_dbus_property(self):
973
return dbus.Boolean(bool(self.approvals_pending))
974
975
# ApprovedByDefault - property
976
@dbus_service_property(_interface, signature="b",
977
access="readwrite")
978
def ApprovedByDefault_dbus_property(self, value=None):
979
if value is None: # get
980
return dbus.Boolean(self.approved_by_default)
981
self.approved_by_default = bool(value)
982
# Emit D-Bus signal
983
self.PropertyChanged(dbus.String("ApprovedByDefault"),
984
dbus.Boolean(value, variant_level=1))
985
986
# ApprovalDelay - property
987
@dbus_service_property(_interface, signature="t",
988
access="readwrite")
989
def ApprovalDelay_dbus_property(self, value=None):
990
if value is None: # get
991
return dbus.UInt64(self.approval_delay_milliseconds())
992
self.approval_delay = datetime.timedelta(0, 0, 0, value)
993
# Emit D-Bus signal
994
self.PropertyChanged(dbus.String("ApprovalDelay"),
995
dbus.UInt64(value, variant_level=1))
996
997
# ApprovalDuration - property
998
@dbus_service_property(_interface, signature="t",
999
access="readwrite")
1000
def ApprovalDuration_dbus_property(self, value=None):
1001
if value is None: # get
1002
return dbus.UInt64(self._timedelta_to_milliseconds(
1003
self.approval_duration))
1004
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1005
# Emit D-Bus signal
1006
self.PropertyChanged(dbus.String("ApprovalDuration"),
1007
dbus.UInt64(value, variant_level=1))
1008
1009
# Name - property
1010
@dbus_service_property(_interface, signature="s", access="read")
1011
def Name_dbus_property(self):
847
1012
return dbus.String(self.name)
848
1013
849
# fingerprint - property
850
@dbus_service_property(_interface, signature=u"s", access=u"read")
851
def fingerprint_dbus_property(self):
1014
# Fingerprint - property
1015
@dbus_service_property(_interface, signature="s", access="read")
1016
def Fingerprint_dbus_property(self):
852
1017
return dbus.String(self.fingerprint)
853
1018
854
# host - property
855
@dbus_service_property(_interface, signature=u"s",
856
access=u"readwrite")
857
def host_dbus_property(self, value=None):
1019
# Host - property
1020
@dbus_service_property(_interface, signature="s",
1021
access="readwrite")
1022
def Host_dbus_property(self, value=None):
858
1023
if value is None: # get
859
1024
return dbus.String(self.host)
860
1025
self.host = value
861
1026
# Emit D-Bus signal
862
self.PropertyChanged(dbus.String(u"host"),
1027
self.PropertyChanged(dbus.String("Host"),
863
1028
dbus.String(value, variant_level=1))
864
1029
865
# created - property
866
@dbus_service_property(_interface, signature=u"s", access=u"read")
867
def created_dbus_property(self):
1030
# Created - property
1031
@dbus_service_property(_interface, signature="s", access="read")
1032
def Created_dbus_property(self):
868
1033
return dbus.String(self._datetime_to_dbus(self.created))
869
1034
870
# last_enabled - property
871
@dbus_service_property(_interface, signature=u"s", access=u"read")
872
def last_enabled_dbus_property(self):
1035
# LastEnabled - property
1036
@dbus_service_property(_interface, signature="s", access="read")
1037
def LastEnabled_dbus_property(self):
873
1038
if self.last_enabled is None:
874
return dbus.String(u"")
1039
return dbus.String("")
875
1040
return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
1041
877
# enabled - property
878
@dbus_service_property(_interface, signature=u"b",
879
access=u"readwrite")
880
def enabled_dbus_property(self, value=None):
1042
# Enabled - property
1043
@dbus_service_property(_interface, signature="b",
1044
access="readwrite")
1045
def Enabled_dbus_property(self, value=None):
881
1046
if value is None: # get
882
1047
return dbus.Boolean(self.enabled)
883
1048
if value:
885
1050
else:
886
1051
self.disable()
887
1052
888
# last_checked_ok - property
889
@dbus_service_property(_interface, signature=u"s",
890
access=u"readwrite")
891
def last_checked_ok_dbus_property(self, value=None):
1053
# LastCheckedOK - property
1054
@dbus_service_property(_interface, signature="s",
1055
access="readwrite")
1056
def LastCheckedOK_dbus_property(self, value=None):
892
1057
if value is not None:
893
1058
self.checked_ok()
894
1059
return
895
1060
if self.last_checked_ok is None:
896
return dbus.String(u"")
1061
return dbus.String("")
897
1062
return dbus.String(self._datetime_to_dbus(self
898
1063
.last_checked_ok))
899
1064
900
# timeout - property
901
@dbus_service_property(_interface, signature=u"t",
902
access=u"readwrite")
903
def timeout_dbus_property(self, value=None):
1065
# LastApprovalRequest - property
1066
@dbus_service_property(_interface, signature="s", access="read")
1067
def LastApprovalRequest_dbus_property(self):
1068
if self.last_approval_request is None:
1069
return dbus.String("")
1070
return dbus.String(self.
1071
_datetime_to_dbus(self
1072
.last_approval_request))
1073
1074
# Timeout - property
1075
@dbus_service_property(_interface, signature="t",
1076
access="readwrite")
1077
def Timeout_dbus_property(self, value=None):
904
1078
if value is None: # get
905
1079
return dbus.UInt64(self.timeout_milliseconds())
906
1080
self.timeout = datetime.timedelta(0, 0, 0, value)
907
1081
# Emit D-Bus signal
908
self.PropertyChanged(dbus.String(u"timeout"),
1082
self.PropertyChanged(dbus.String("Timeout"),
909
1083
dbus.UInt64(value, variant_level=1))
910
if getattr(self, u"disable_initiator_tag", None) is None:
1084
if getattr(self, "disable_initiator_tag", None) is None:
911
1085
return
912
1086
# Reschedule timeout
913
1087
gobject.source_remove(self.disable_initiator_tag)
925
1099
self.disable_initiator_tag = (gobject.timeout_add
926
1100
(time_to_die, self.disable))
927
1101
928
# interval - property
929
@dbus_service_property(_interface, signature=u"t",
930
access=u"readwrite")
931
def interval_dbus_property(self, value=None):
1102
# Interval - property
1103
@dbus_service_property(_interface, signature="t",
1104
access="readwrite")
1105
def Interval_dbus_property(self, value=None):
932
1106
if value is None: # get
933
1107
return dbus.UInt64(self.interval_milliseconds())
934
1108
self.interval = datetime.timedelta(0, 0, 0, value)
935
1109
# Emit D-Bus signal
936
self.PropertyChanged(dbus.String(u"interval"),
1110
self.PropertyChanged(dbus.String("Interval"),
937
1111
dbus.UInt64(value, variant_level=1))
938
if getattr(self, u"checker_initiator_tag", None) is None:
1112
if getattr(self, "checker_initiator_tag", None) is None:
939
1113
return
940
1114
# Reschedule checker run
941
1115
gobject.source_remove(self.checker_initiator_tag)
943
1117
(value, self.start_checker))
944
1118
self.start_checker() # Start one now, too
945
1119
946
# checker - property
947
@dbus_service_property(_interface, signature=u"s",
948
access=u"readwrite")
949
def checker_dbus_property(self, value=None):
1120
# Checker - property
1121
@dbus_service_property(_interface, signature="s",
1122
access="readwrite")
1123
def Checker_dbus_property(self, value=None):
950
1124
if value is None: # get
951
1125
return dbus.String(self.checker_command)
952
1126
self.checker_command = value
953
1127
# Emit D-Bus signal
954
self.PropertyChanged(dbus.String(u"checker"),
1128
self.PropertyChanged(dbus.String("Checker"),
955
1129
dbus.String(self.checker_command,
956
1130
variant_level=1))
957
1131
958
# checker_running - property
959
@dbus_service_property(_interface, signature=u"b",
960
access=u"readwrite")
961
def checker_running_dbus_property(self, value=None):
1132
# CheckerRunning - property
1133
@dbus_service_property(_interface, signature="b",
1134
access="readwrite")
1135
def CheckerRunning_dbus_property(self, value=None):
962
1136
if value is None: # get
963
1137
return dbus.Boolean(self.checker is not None)
964
1138
if value:
966
1140
else:
967
1141
self.stop_checker()
968
1142
969
# object_path - property
970
@dbus_service_property(_interface, signature=u"o", access=u"read")
971
def object_path_dbus_property(self):
1143
# ObjectPath - property
1144
@dbus_service_property(_interface, signature="o", access="read")
1145
def ObjectPath_dbus_property(self):
972
1146
return self.dbus_object_path # is already a dbus.ObjectPath
973
1147
974
# secret = property
975
@dbus_service_property(_interface, signature=u"ay",
976
access=u"write", byte_arrays=True)
977
def secret_dbus_property(self, value):
1148
# Secret = property
1149
@dbus_service_property(_interface, signature="ay",
1150
access="write", byte_arrays=True)
1151
def Secret_dbus_property(self, value):
978
1152
self.secret = str(value)
979
1153
980
1154
del _interface
981
1155
982
1156
1157
class ProxyClient(object):
1158
def __init__(self, child_pipe, fpr, address):
1159
self._pipe = child_pipe
1160
self._pipe.send(('init', fpr, address))
1161
if not self._pipe.recv():
1162
raise KeyError()
1163
1164
def __getattribute__(self, name):
1165
if(name == '_pipe'):
1166
return super(ProxyClient, self).__getattribute__(name)
1167
self._pipe.send(('getattr', name))
1168
data = self._pipe.recv()
1169
if data[0] == 'data':
1170
return data[1]
1171
if data[0] == 'function':
1172
def func(*args, **kwargs):
1173
self._pipe.send(('funcall', name, args, kwargs))
1174
return self._pipe.recv()[1]
1175
return func
1176
1177
def __setattr__(self, name, value):
1178
if(name == '_pipe'):
1179
return super(ProxyClient, self).__setattr__(name, value)
1180
self._pipe.send(('setattr', name, value))
1181
1182
983
1183
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1184
"""A class to handle client connections.
985
1185
987
1187
Note: This will run in its own forked process."""
988
1188
989
1189
def handle(self):
990
logger.info(u"TCP connection from: %s",
991
unicode(self.client_address))
992
logger.debug(u"IPC Pipe FD: %d", self.server.child_pipe[1])
993
# Open IPC pipe to parent process
994
with contextlib.nested(os.fdopen(self.server.child_pipe[1],
995
u"w", 1),
996
os.fdopen(self.server.parent_pipe[0],
997
u"r", 0)) as (ipc,
998
ipc_return):
1190
with contextlib.closing(self.server.child_pipe) as child_pipe:
1191
logger.info("TCP connection from: %s",
1192
unicode(self.client_address))
1193
logger.debug("Pipe FD: %d",
1194
self.server.child_pipe.fileno())
1195
999
1196
session = (gnutls.connection
1000
1197
.ClientSession(self.request,
1001
1198
gnutls.connection
1002
1199
.X509Credentials()))
1003
1004
line = self.request.makefile().readline()
1005
logger.debug(u"Protocol version: %r", line)
1006
try:
1007
if int(line.strip().split()[0]) > 1:
1008
raise RuntimeError
1009
except (ValueError, IndexError, RuntimeError), error:
1010
logger.error(u"Unknown protocol version: %s", error)
1011
return
1012
1200
1013
1201
# Note: gnutls.connection.X509Credentials is really a
1014
1202
# generic GnuTLS certificate credentials object so long as
1015
1203
# no X.509 keys are added to it. Therefore, we can use it
1016
1204
# here despite using OpenPGP certificates.
1017
1018
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1019
# u"+AES-256-CBC", u"+SHA1",
1020
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1021
# u"+DHE-DSS"))
1205
1206
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
# "+AES-256-CBC", "+SHA1",
1208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1209
# "+DHE-DSS"))
1022
1210
# Use a fallback default, since this MUST be set.
1023
1211
priority = self.server.gnutls_priority
1024
1212
if priority is None:
1025
priority = u"NORMAL"
1213
priority = "NORMAL"
1026
1214
(gnutls.library.functions
1027
1215
.gnutls_priority_set_direct(session._c_object,
1028
1216
priority, None))
1029
1217
1218
# Start communication using the Mandos protocol
1219
# Get protocol number
1220
line = self.request.makefile().readline()
1221
logger.debug("Protocol version: %r", line)
1222
try:
1223
if int(line.strip().split()[0]) > 1:
1224
raise RuntimeError
1225
except (ValueError, IndexError, RuntimeError) as error:
1226
logger.error("Unknown protocol version: %s", error)
1227
return
1228
1229
# Start GnuTLS connection
1030
1230
try:
1031
1231
session.handshake()
1032
except gnutls.errors.GNUTLSError, error:
1033
logger.warning(u"Handshake failed: %s", error)
1232
except gnutls.errors.GNUTLSError as error:
1233
logger.warning("Handshake failed: %s", error)
1034
1234
# Do not run session.bye() here: the session is not
1035
1235
# established. Just abandon the request.
1036
1236
return
1037
logger.debug(u"Handshake succeeded")
1237
logger.debug("Handshake succeeded")
1238
1239
approval_required = False
1038
1240
try:
1039
1241
try:
1040
1242
fpr = self.fingerprint(self.peer_certificate
1041
1243
(session))
1042
except (TypeError, gnutls.errors.GNUTLSError), error:
1043
logger.warning(u"Bad certificate: %s", error)
1244
except (TypeError,
1245
gnutls.errors.GNUTLSError) as error:
1246
logger.warning("Bad certificate: %s", error)
1044
1247
return
1045
logger.debug(u"Fingerprint: %s", fpr)
1248
logger.debug("Fingerprint: %s", fpr)
1046
1249
1047
for c in self.server.clients:
1048
if c.fingerprint == fpr:
1049
client = c
1250
try:
1251
client = ProxyClient(child_pipe, fpr,
1252
self.client_address)
1253
except KeyError:
1254
return
1255
1256
if client.approval_delay:
1257
delay = client.approval_delay
1258
client.approvals_pending += 1
1259
approval_required = True
1260
1261
while True:
1262
if not client.enabled:
1263
logger.warning("Client %s is disabled",
1264
client.name)
1265
if self.server.use_dbus:
1266
# Emit D-Bus signal
1267
client.Rejected("Disabled")
1268
return
1269
1270
if client._approved or not client.approval_delay:
1271
#We are approved or approval is disabled
1050
1272
break
1051
else:
1052
ipc.write(u"NOTFOUND %s %s\n"
1053
% (fpr, unicode(self.client_address)))
1054
return
1055
# Have to check if client.enabled, since it is
1056
# possible that the client was disabled since the
1057
# GnuTLS session was established.
1058
ipc.write(u"GETATTR enabled %s\n" % fpr)
1059
enabled = pickle.load(ipc_return)
1060
if not enabled:
1061
ipc.write(u"DISABLED %s\n" % client.name)
1062
return
1063
ipc.write(u"SENDING %s\n" % client.name)
1273
elif client._approved is None:
1274
logger.info("Client %s needs approval",
1275
client.name)
1276
if self.server.use_dbus:
1277
# Emit D-Bus signal
1278
client.NeedApproval(
1279
client.approval_delay_milliseconds(),
1280
client.approved_by_default)
1281
else:
1282
logger.warning("Client %s was not approved",
1283
client.name)
1284
if self.server.use_dbus:
1285
# Emit D-Bus signal
1286
client.Rejected("Denied")
1287
return
1288
1289
#wait until timeout or approved
1290
#x = float(client._timedelta_to_milliseconds(delay))
1291
time = datetime.datetime.now()
1292
client.changedstate.acquire()
1293
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1294
client.changedstate.release()
1295
time2 = datetime.datetime.now()
1296
if (time2 - time) >= delay:
1297
if not client.approved_by_default:
1298
logger.warning("Client %s timed out while"
1299
" waiting for approval",
1300
client.name)
1301
if self.server.use_dbus:
1302
# Emit D-Bus signal
1303
client.Rejected("Approval timed out")
1304
return
1305
else:
1306
break
1307
else:
1308
delay -= time2 - time
1309
1064
1310
sent_size = 0
1065
1311
while sent_size < len(client.secret):
1066
sent = session.send(client.secret[sent_size:])
1067
logger.debug(u"Sent: %d, remaining: %d",
1312
try:
1313
sent = session.send(client.secret[sent_size:])
1314
except gnutls.errors.GNUTLSError as error:
1315
logger.warning("gnutls send failed")
1316
return
1317
logger.debug("Sent: %d, remaining: %d",
1068
1318
sent, len(client.secret)
1069
1319
- (sent_size + sent))
1070
1320
sent_size += sent
1321
1322
logger.info("Sending secret to %s", client.name)
1323
# bump the timeout as if seen
1324
client.checked_ok()
1325
if self.server.use_dbus:
1326
# Emit D-Bus signal
1327
client.GotSecret()
1328
1071
1329
finally:
1072
session.bye()
1330
if approval_required:
1331
client.approvals_pending -= 1
1332
try:
1333
session.bye()
1334
except gnutls.errors.GNUTLSError as error:
1335
logger.warning("GnuTLS bye failed")
1073
1336
1074
1337
@staticmethod
1075
1338
def peer_certificate(session):
1085
1348
.gnutls_certificate_get_peers
1086
1349
(session._c_object, ctypes.byref(list_size)))
1087
1350
if not bool(cert_list) and list_size.value != 0:
1088
raise gnutls.errors.GNUTLSError(u"error getting peer"
1089
u" certificate")
1351
raise gnutls.errors.GNUTLSError("error getting peer"
1352
" certificate")
1090
1353
if list_size.value == 0:
1091
1354
return None
1092
1355
cert = cert_list[0]
1118
1381
if crtverify.value != 0:
1119
1382
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1120
1383
raise (gnutls.errors.CertificateSecurityError
1121
(u"Verify failed"))
1384
("Verify failed"))
1122
1385
# New buffer for the fingerprint
1123
1386
buf = ctypes.create_string_buffer(20)
1124
1387
buf_len = ctypes.c_size_t()
1131
1394
# Convert the buffer to a Python bytestring
1132
1395
fpr = ctypes.string_at(buf, buf_len.value)
1133
1396
# Convert the bytestring to hexadecimal notation
1134
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1397
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1135
1398
return hex_fpr
1136
1399
1137
1400
1138
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1139
"""Like socketserver.ForkingMixIn, but also pass a pipe pair."""
1401
class MultiprocessingMixIn(object):
1402
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1403
def sub_process_main(self, request, address):
1404
try:
1405
self.finish_request(request, address)
1406
except:
1407
self.handle_error(request, address)
1408
self.close_request(request)
1409
1410
def process_request(self, request, address):
1411
"""Start a new process to process the request."""
1412
multiprocessing.Process(target = self.sub_process_main,
1413
args = (request, address)).start()
1414
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1416
""" adds a pipe to the MixIn """
1140
1417
def process_request(self, request, client_address):
1141
1418
"""Overrides and wraps the original process_request().
1142
1419
1143
1420
This function creates a new pipe in self.pipe
1144
1421
"""
1145
self.child_pipe = os.pipe() # Child writes here
1146
self.parent_pipe = os.pipe() # Parent writes here
1147
super(ForkingMixInWithPipes,
1422
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1423
1424
super(MultiprocessingMixInWithPipe,
1148
1425
self).process_request(request, client_address)
1149
# Close unused ends for parent
1150
os.close(self.parent_pipe[0]) # close read end
1151
os.close(self.child_pipe[1]) # close write end
1152
self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1153
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1426
self.child_pipe.close()
1427
self.add_pipe(parent_pipe)
1428
1429
def add_pipe(self, parent_pipe):
1154
1430
"""Dummy function; override as necessary"""
1155
os.close(child_pipe_fd)
1156
os.close(parent_pipe_fd)
1157
1158
1159
class IPv6_TCPServer(ForkingMixInWithPipes,
1431
raise NotImplementedError
1432
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1160
1434
socketserver.TCPServer, object):
1161
1435
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1162
1436
1178
1452
bind to an address or port if they were not specified."""
1179
1453
if self.interface is not None:
1180
1454
if SO_BINDTODEVICE is None:
1181
logger.error(u"SO_BINDTODEVICE does not exist;"
1182
u" cannot bind to interface %s",
1455
logger.error("SO_BINDTODEVICE does not exist;"
1456
" cannot bind to interface %s",
1183
1457
self.interface)
1184
1458
else:
1185
1459
try:
1186
1460
self.socket.setsockopt(socket.SOL_SOCKET,
1187
1461
SO_BINDTODEVICE,
1188
1462
str(self.interface
1189
+ u'\0'))
1190
except socket.error, error:
1463
+ '\0'))
1464
except socket.error as error:
1191
1465
if error[0] == errno.EPERM:
1192
logger.error(u"No permission to"
1193
u" bind to interface %s",
1466
logger.error("No permission to"
1467
" bind to interface %s",
1194
1468
self.interface)
1195
1469
elif error[0] == errno.ENOPROTOOPT:
1196
logger.error(u"SO_BINDTODEVICE not available;"
1197
u" cannot bind to interface %s",
1470
logger.error("SO_BINDTODEVICE not available;"
1471
" cannot bind to interface %s",
1198
1472
self.interface)
1199
1473
else:
1200
1474
raise
1202
1476
if self.server_address[0] or self.server_address[1]:
1203
1477
if not self.server_address[0]:
1204
1478
if self.address_family == socket.AF_INET6:
1205
any_address = u"::" # in6addr_any
1479
any_address = "::" # in6addr_any
1206
1480
else:
1207
1481
any_address = socket.INADDR_ANY
1208
1482
self.server_address = (any_address,
1247
1521
return socketserver.TCPServer.server_activate(self)
1248
1522
def enable(self):
1249
1523
self.enabled = True
1250
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1524
def add_pipe(self, parent_pipe):
1251
1525
# Call "handle_ipc" for both data and EOF events
1252
gobject.io_add_watch(child_pipe_fd,
1526
gobject.io_add_watch(parent_pipe.fileno(),
1253
1527
gobject.IO_IN | gobject.IO_HUP,
1254
1528
functools.partial(self.handle_ipc,
1255
reply_fd
1256
=parent_pipe_fd))
1257
def handle_ipc(self, source, condition, reply_fd=None,
1258
file_objects={}):
1529
parent_pipe = parent_pipe))
1530
1531
def handle_ipc(self, source, condition, parent_pipe=None,
1532
client_object=None):
1259
1533
condition_names = {
1260
gobject.IO_IN: u"IN", # There is data to read.
1261
gobject.IO_OUT: u"OUT", # Data can be written (without
1534
gobject.IO_IN: "IN", # There is data to read.
1535
gobject.IO_OUT: "OUT", # Data can be written (without
1262
1536
# blocking).
1263
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1264
gobject.IO_ERR: u"ERR", # Error condition.
1265
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1537
gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
gobject.IO_ERR: "ERR", # Error condition.
1539
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1266
1540
# broken, usually for pipes and
1267
1541
# sockets).
1268
1542
}
1270
1544
for cond, name in
1271
1545
condition_names.iteritems()
1272
1546
if cond & condition)
1273
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1274
conditions_string)
1275
1276
# Turn the pipe file descriptors into Python file objects
1277
if source not in file_objects:
1278
file_objects[source] = os.fdopen(source, u"r", 1)
1279
if reply_fd not in file_objects:
1280
file_objects[reply_fd] = os.fdopen(reply_fd, u"w", 0)
1281
1282
# Read a line from the file object
1283
cmdline = file_objects[source].readline()
1284
if not cmdline: # Empty line means end of file
1285
# close the IPC pipes
1286
file_objects[source].close()
1287
del file_objects[source]
1288
file_objects[reply_fd].close()
1289
del file_objects[reply_fd]
1290
1291
# Stop calling this function
1292
return False
1293
1294
logger.debug(u"IPC command: %r", cmdline)
1295
1296
# Parse and act on command
1297
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1298
1299
if cmd == u"NOTFOUND":
1300
fpr, address = args.split(None, 1)
1301
logger.warning(u"Client not found for fingerprint: %s, ad"
1302
u"dress: %s", fpr, address)
1303
if self.use_dbus:
1304
# Emit D-Bus signal
1305
mandos_dbus_service.ClientNotFound(fpr, address)
1306
elif cmd == u"DISABLED":
1307
for client in self.clients:
1308
if client.name == args:
1309
logger.warning(u"Client %s is disabled", args)
1310
if self.use_dbus:
1311
# Emit D-Bus signal
1312
client.Rejected()
1313
break
1314
else:
1315
logger.error(u"Unknown client %s is disabled", args)
1316
elif cmd == u"SENDING":
1317
for client in self.clients:
1318
if client.name == args:
1319
logger.info(u"Sending secret to %s", client.name)
1320
client.checked_ok()
1321
if self.use_dbus:
1322
# Emit D-Bus signal
1323
client.GotSecret()
1324
break
1325
else:
1326
logger.error(u"Sending secret to unknown client %s",
1327
args)
1328
elif cmd == u"GETATTR":
1329
attr_name, fpr = args.split(None, 1)
1330
for client in self.clients:
1331
if client.fingerprint == fpr:
1332
attr_value = getattr(client, attr_name, None)
1333
logger.debug("IPC reply: %r", attr_value)
1334
pickle.dump(attr_value, file_objects[reply_fd])
1335
break
1336
else:
1337
logger.error(u"Client %s on address %s requesting "
1338
u"attribute %s not found", fpr, address,
1339
attr_name)
1340
pickle.dump(None, file_objects[reply_fd])
1341
else:
1342
logger.error(u"Unknown IPC command: %r", cmdline)
1343
1344
# Keep calling this function
1547
# error or the other end of multiprocessing.Pipe has closed
1548
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1549
return False
1550
1551
# Read a request from the child
1552
request = parent_pipe.recv()
1553
command = request[0]
1554
1555
if command == 'init':
1556
fpr = request[1]
1557
address = request[2]
1558
1559
for c in self.clients:
1560
if c.fingerprint == fpr:
1561
client = c
1562
break
1563
else:
1564
logger.warning("Client not found for fingerprint: %s, ad"
1565
"dress: %s", fpr, address)
1566
if self.use_dbus:
1567
# Emit D-Bus signal
1568
mandos_dbus_service.ClientNotFound(fpr, address[0])
1569
parent_pipe.send(False)
1570
return False
1571
1572
gobject.io_add_watch(parent_pipe.fileno(),
1573
gobject.IO_IN | gobject.IO_HUP,
1574
functools.partial(self.handle_ipc,
1575
parent_pipe = parent_pipe,
1576
client_object = client))
1577
parent_pipe.send(True)
1578
# remove the old hook in favor of the new above hook on same fileno
1579
return False
1580
if command == 'funcall':
1581
funcname = request[1]
1582
args = request[2]
1583
kwargs = request[3]
1584
1585
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1586
1587
if command == 'getattr':
1588
attrname = request[1]
1589
if callable(client_object.__getattribute__(attrname)):
1590
parent_pipe.send(('function',))
1591
else:
1592
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1593
1594
if command == 'setattr':
1595
attrname = request[1]
1596
value = request[2]
1597
setattr(client_object, attrname, value)
1598
1345
1599
return True
1346
1600
1347
1601
1348
1602
def string_to_delta(interval):
1349
1603
"""Parse a string and return a datetime.timedelta
1350
1604
1351
>>> string_to_delta(u'7d')
1605
>>> string_to_delta('7d')
1352
1606
datetime.timedelta(7)
1353
>>> string_to_delta(u'60s')
1607
>>> string_to_delta('60s')
1354
1608
datetime.timedelta(0, 60)
1355
>>> string_to_delta(u'60m')
1609
>>> string_to_delta('60m')
1356
1610
datetime.timedelta(0, 3600)
1357
>>> string_to_delta(u'24h')
1611
>>> string_to_delta('24h')
1358
1612
datetime.timedelta(1)
1359
>>> string_to_delta(u'1w')
1613
>>> string_to_delta('1w')
1360
1614
datetime.timedelta(7)
1361
>>> string_to_delta(u'5m 30s')
1615
>>> string_to_delta('5m 30s')
1362
1616
datetime.timedelta(0, 330)
1363
1617
"""
1364
1618
timevalue = datetime.timedelta(0)
1366
1620
try:
1367
1621
suffix = unicode(s[-1])
1368
1622
value = int(s[:-1])
1369
if suffix == u"d":
1623
if suffix == "d":
1370
1624
delta = datetime.timedelta(value)
1371
elif suffix == u"s":
1625
elif suffix == "s":
1372
1626
delta = datetime.timedelta(0, value)
1373
elif suffix == u"m":
1627
elif suffix == "m":
1374
1628
delta = datetime.timedelta(0, 0, 0, 0, value)
1375
elif suffix == u"h":
1629
elif suffix == "h":
1376
1630
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1377
elif suffix == u"w":
1631
elif suffix == "w":
1378
1632
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1379
1633
else:
1380
raise ValueError(u"Unknown suffix %r" % suffix)
1381
except (ValueError, IndexError), e:
1382
raise ValueError(e.message)
1634
raise ValueError("Unknown suffix %r" % suffix)
1635
except (ValueError, IndexError) as e:
1636
raise ValueError(*(e.args))
1383
1637
timevalue += delta
1384
1638
return timevalue
1385
1639
1391
1645
global if_nametoindex
1392
1646
try:
1393
1647
if_nametoindex = (ctypes.cdll.LoadLibrary
1394
(ctypes.util.find_library(u"c"))
1648
(ctypes.util.find_library("c"))
1395
1649
.if_nametoindex)
1396
1650
except (OSError, AttributeError):
1397
logger.warning(u"Doing if_nametoindex the hard way")
1651
logger.warning("Doing if_nametoindex the hard way")
1398
1652
def if_nametoindex(interface):
1399
1653
"Get an interface index the hard way, i.e. using fcntl()"
1400
1654
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1401
1655
with contextlib.closing(socket.socket()) as s:
1402
1656
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1403
struct.pack(str(u"16s16x"),
1657
struct.pack(str("16s16x"),
1404
1658
interface))
1405
interface_index = struct.unpack(str(u"I"),
1659
interface_index = struct.unpack(str("I"),
1406
1660
ifreq[16:20])[0]
1407
1661
return interface_index
1408
1662
return if_nametoindex(interface)
1416
1670
sys.exit()
1417
1671
os.setsid()
1418
1672
if not nochdir:
1419
os.chdir(u"/")
1673
os.chdir("/")
1420
1674
if os.fork():
1421
1675
sys.exit()
1422
1676
if not noclose:
1424
1678
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1425
1679
if not stat.S_ISCHR(os.fstat(null).st_mode):
1426
1680
raise OSError(errno.ENODEV,
1427
u"%s not a character device"
1681
"%s not a character device"
1428
1682
% os.path.devnull)
1429
1683
os.dup2(null, sys.stdin.fileno())
1430
1684
os.dup2(null, sys.stdout.fileno())
1438
1692
##################################################################
1439
1693
# Parsing of options, both command line and config file
1440
1694
1441
parser = optparse.OptionParser(version = "%%prog %s" % version)
1442
parser.add_option("-i", u"--interface", type=u"string",
1443
metavar="IF", help=u"Bind to interface IF")
1444
parser.add_option("-a", u"--address", type=u"string",
1445
help=u"Address to listen for requests on")
1446
parser.add_option("-p", u"--port", type=u"int",
1447
help=u"Port number to receive requests on")
1448
parser.add_option("--check", action=u"store_true",
1449
help=u"Run self-test")
1450
parser.add_option("--debug", action=u"store_true",
1451
help=u"Debug mode; run in foreground and log to"
1452
u" terminal")
1453
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1454
u" priority string (see GnuTLS documentation)")
1455
parser.add_option("--servicename", type=u"string",
1456
metavar=u"NAME", help=u"Zeroconf service name")
1457
parser.add_option("--configdir", type=u"string",
1458
default=u"/etc/mandos", metavar=u"DIR",
1459
help=u"Directory to search for configuration"
1460
u" files")
1461
parser.add_option("--no-dbus", action=u"store_false",
1462
dest=u"use_dbus", help=u"Do not provide D-Bus"
1463
u" system bus interface")
1464
parser.add_option("--no-ipv6", action=u"store_false",
1465
dest=u"use_ipv6", help=u"Do not use IPv6")
1466
options = parser.parse_args()[0]
1695
parser = argparse.ArgumentParser()
1696
parser.add_argument("-v", "--version", action="version",
1697
version = "%%(prog)s %s" % version,
1698
help="show version number and exit")
1699
parser.add_argument("-i", "--interface", metavar="IF",
1700
help="Bind to interface IF")
1701
parser.add_argument("-a", "--address",
1702
help="Address to listen for requests on")
1703
parser.add_argument("-p", "--port", type=int,
1704
help="Port number to receive requests on")
1705
parser.add_argument("--check", action="store_true",
1706
help="Run self-test")
1707
parser.add_argument("--debug", action="store_true",
1708
help="Debug mode; run in foreground and log"
1709
" to terminal")
1710
parser.add_argument("--debuglevel", metavar="LEVEL",
1711
help="Debug level for stdout output")
1712
parser.add_argument("--priority", help="GnuTLS"
1713
" priority string (see GnuTLS documentation)")
1714
parser.add_argument("--servicename",
1715
metavar="NAME", help="Zeroconf service name")
1716
parser.add_argument("--configdir",
1717
default="/etc/mandos", metavar="DIR",
1718
help="Directory to search for configuration"
1719
" files")
1720
parser.add_argument("--no-dbus", action="store_false",
1721
dest="use_dbus", help="Do not provide D-Bus"
1722
" system bus interface")
1723
parser.add_argument("--no-ipv6", action="store_false",
1724
dest="use_ipv6", help="Do not use IPv6")
1725
options = parser.parse_args()
1467
1726
1468
1727
if options.check:
1469
1728
import doctest
1471
1730
sys.exit()
1472
1731
1473
1732
# Default values for config file for server-global settings
1474
server_defaults = { u"interface": u"",
1475
u"address": u"",
1476
u"port": u"",
1477
u"debug": u"False",
1478
u"priority":
1479
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1480
u"servicename": u"Mandos",
1481
u"use_dbus": u"True",
1482
u"use_ipv6": u"True",
1733
server_defaults = { "interface": "",
1734
"address": "",
1735
"port": "",
1736
"debug": "False",
1737
"priority":
1738
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1739
"servicename": "Mandos",
1740
"use_dbus": "True",
1741
"use_ipv6": "True",
1742
"debuglevel": "",
1483
1743
}
1484
1744
1485
1745
# Parse config file for server-global settings
1486
1746
server_config = configparser.SafeConfigParser(server_defaults)
1487
1747
del server_defaults
1488
1748
server_config.read(os.path.join(options.configdir,
1489
u"mandos.conf"))
1749
"mandos.conf"))
1490
1750
# Convert the SafeConfigParser object to a dict
1491
1751
server_settings = server_config.defaults()
1492
1752
# Use the appropriate methods on the non-string config options
1493
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1494
server_settings[option] = server_config.getboolean(u"DEFAULT",
1753
for option in ("debug", "use_dbus", "use_ipv6"):
1754
server_settings[option] = server_config.getboolean("DEFAULT",
1495
1755
option)
1496
1756
if server_settings["port"]:
1497
server_settings["port"] = server_config.getint(u"DEFAULT",
1498
u"port")
1757
server_settings["port"] = server_config.getint("DEFAULT",
1758
"port")
1499
1759
del server_config
1500
1760
1501
1761
# Override the settings from the config file with command line
1502
1762
# options, if set.
1503
for option in (u"interface", u"address", u"port", u"debug",
1504
u"priority", u"servicename", u"configdir",
1505
u"use_dbus", u"use_ipv6"):
1763
for option in ("interface", "address", "port", "debug",
1764
"priority", "servicename", "configdir",
1765
"use_dbus", "use_ipv6", "debuglevel"):
1506
1766
value = getattr(options, option)
1507
1767
if value is not None:
1508
1768
server_settings[option] = value
1516
1776
##################################################################
1517
1777
1518
1778
# For convenience
1519
debug = server_settings[u"debug"]
1520
use_dbus = server_settings[u"use_dbus"]
1521
use_ipv6 = server_settings[u"use_ipv6"]
1522
1523
if not debug:
1524
syslogger.setLevel(logging.WARNING)
1525
console.setLevel(logging.WARNING)
1526
1527
if server_settings[u"servicename"] != u"Mandos":
1779
debug = server_settings["debug"]
1780
debuglevel = server_settings["debuglevel"]
1781
use_dbus = server_settings["use_dbus"]
1782
use_ipv6 = server_settings["use_ipv6"]
1783
1784
if server_settings["servicename"] != "Mandos":
1528
1785
syslogger.setFormatter(logging.Formatter
1529
(u'Mandos (%s) [%%(process)d]:'
1530
u' %%(levelname)s: %%(message)s'
1531
% server_settings[u"servicename"]))
1786
('Mandos (%s) [%%(process)d]:'
1787
' %%(levelname)s: %%(message)s'
1788
% server_settings["servicename"]))
1532
1789
1533
1790
# Parse config file with clients
1534
client_defaults = { u"timeout": u"1h",
1535
u"interval": u"5m",
1536
u"checker": u"fping -q -- %%(host)s",
1537
u"host": u"",
1791
client_defaults = { "timeout": "1h",
1792
"interval": "5m",
1793
"checker": "fping -q -- %%(host)s",
1794
"host": "",
1795
"approval_delay": "0s",
1796
"approval_duration": "1s",
1538
1797
}
1539
1798
client_config = configparser.SafeConfigParser(client_defaults)
1540
client_config.read(os.path.join(server_settings[u"configdir"],
1541
u"clients.conf"))
1799
client_config.read(os.path.join(server_settings["configdir"],
1800
"clients.conf"))
1542
1801
1543
1802
global mandos_dbus_service
1544
1803
mandos_dbus_service = None
1545
1804
1546
tcp_server = MandosServer((server_settings[u"address"],
1547
server_settings[u"port"]),
1805
tcp_server = MandosServer((server_settings["address"],
1806
server_settings["port"]),
1548
1807
ClientHandler,
1549
interface=server_settings[u"interface"],
1808
interface=(server_settings["interface"]
1809
or None),
1550
1810
use_ipv6=use_ipv6,
1551
1811
gnutls_priority=
1552
server_settings[u"priority"],
1812
server_settings["priority"],
1553
1813
use_dbus=use_dbus)
1554
pidfilename = u"/var/run/mandos.pid"
1555
try:
1556
pidfile = open(pidfilename, u"w")
1557
except IOError:
1558
logger.error(u"Could not open file %r", pidfilename)
1814
if not debug:
1815
pidfilename = "/var/run/mandos.pid"
1816
try:
1817
pidfile = open(pidfilename, "w")
1818
except IOError:
1819
logger.error("Could not open file %r", pidfilename)
1559
1820
1560
1821
try:
1561
uid = pwd.getpwnam(u"_mandos").pw_uid
1562
gid = pwd.getpwnam(u"_mandos").pw_gid
1822
uid = pwd.getpwnam("_mandos").pw_uid
1823
gid = pwd.getpwnam("_mandos").pw_gid
1563
1824
except KeyError:
1564
1825
try:
1565
uid = pwd.getpwnam(u"mandos").pw_uid
1566
gid = pwd.getpwnam(u"mandos").pw_gid
1826
uid = pwd.getpwnam("mandos").pw_uid
1827
gid = pwd.getpwnam("mandos").pw_gid
1567
1828
except KeyError:
1568
1829
try:
1569
uid = pwd.getpwnam(u"nobody").pw_uid
1570
gid = pwd.getpwnam(u"nobody").pw_gid
1830
uid = pwd.getpwnam("nobody").pw_uid
1831
gid = pwd.getpwnam("nobody").pw_gid
1571
1832
except KeyError:
1572
1833
uid = 65534
1573
1834
gid = 65534
1574
1835
try:
1575
1836
os.setgid(gid)
1576
1837
os.setuid(uid)
1577
except OSError, error:
1838
except OSError as error:
1578
1839
if error[0] != errno.EPERM:
1579
1840
raise error
1580
1841
1581
# Enable all possible GnuTLS debugging
1842
if not debug and not debuglevel:
1843
syslogger.setLevel(logging.WARNING)
1844
console.setLevel(logging.WARNING)
1845
if debuglevel:
1846
level = getattr(logging, debuglevel.upper())
1847
syslogger.setLevel(level)
1848
console.setLevel(level)
1849
1582
1850
if debug:
1851
# Enable all possible GnuTLS debugging
1852
1583
1853
# "Use a log level over 10 to enable all debugging options."
1584
1854
# - GnuTLS manual
1585
1855
gnutls.library.functions.gnutls_global_set_log_level(11)
1586
1856
1587
1857
@gnutls.library.types.gnutls_log_func
1588
1858
def debug_gnutls(level, string):
1589
logger.debug(u"GnuTLS: %s", string[:-1])
1859
logger.debug("GnuTLS: %s", string[:-1])
1590
1860
1591
1861
(gnutls.library.functions
1592
1862
.gnutls_global_set_log_function(debug_gnutls))
1863
1864
# Redirect stdin so all checkers get /dev/null
1865
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1866
os.dup2(null, sys.stdin.fileno())
1867
if null > 2:
1868
os.close(null)
1869
else:
1870
# No console logging
1871
logger.removeHandler(console)
1872
1873
# Need to fork before connecting to D-Bus
1874
if not debug:
1875
# Close all input and output, do double fork, etc.
1876
daemon()
1593
1877
1594
1878
global main_loop
1595
1879
# From the Avahi example code
1599
1883
# End of Avahi example code
1600
1884
if use_dbus:
1601
1885
try:
1602
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1886
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1603
1887
bus, do_not_queue=True)
1604
except dbus.exceptions.NameExistsException, e:
1605
logger.error(unicode(e) + u", disabling D-Bus")
1888
except dbus.exceptions.NameExistsException as e:
1889
logger.error(unicode(e) + ", disabling D-Bus")
1606
1890
use_dbus = False
1607
server_settings[u"use_dbus"] = False
1891
server_settings["use_dbus"] = False
1608
1892
tcp_server.use_dbus = False
1609
1893
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1610
service = AvahiService(name = server_settings[u"servicename"],
1611
servicetype = u"_mandos._tcp",
1894
service = AvahiService(name = server_settings["servicename"],
1895
servicetype = "_mandos._tcp",
1612
1896
protocol = protocol, bus = bus)
1613
1897
if server_settings["interface"]:
1614
1898
service.interface = (if_nametoindex
1615
(str(server_settings[u"interface"])))
1899
(str(server_settings["interface"])))
1900
1901
global multiprocessing_manager
1902
multiprocessing_manager = multiprocessing.Manager()
1616
1903
1617
1904
client_class = Client
1618
1905
if use_dbus:
1619
1906
client_class = functools.partial(ClientDBus, bus = bus)
1907
def client_config_items(config, section):
1908
special_settings = {
1909
"approved_by_default":
1910
lambda: config.getboolean(section,
1911
"approved_by_default"),
1912
}
1913
for name, value in config.items(section):
1914
try:
1915
yield (name, special_settings[name]())
1916
except KeyError:
1917
yield (name, value)
1918
1620
1919
tcp_server.clients.update(set(
1621
1920
client_class(name = section,
1622
config= dict(client_config.items(section)))
1921
config= dict(client_config_items(
1922
client_config, section)))
1623
1923
for section in client_config.sections()))
1624
1924
if not tcp_server.clients:
1625
logger.warning(u"No clients defined")
1626
1627
if debug:
1628
# Redirect stdin so all checkers get /dev/null
1629
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1630
os.dup2(null, sys.stdin.fileno())
1631
if null > 2:
1632
os.close(null)
1633
else:
1634
# No console logging
1635
logger.removeHandler(console)
1636
# Close all input and output, do double fork, etc.
1637
daemon()
1638
1639
try:
1640
with pidfile:
1641
pid = os.getpid()
1642
pidfile.write(str(pid) + "\n")
1643
del pidfile
1644
except IOError:
1645
logger.error(u"Could not write to file %r with PID %d",
1646
pidfilename, pid)
1647
except NameError:
1648
# "pidfile" was never created
1649
pass
1650
del pidfilename
1651
1925
logger.warning("No clients defined")
1926
1652
1927
if not debug:
1928
try:
1929
with pidfile:
1930
pid = os.getpid()
1931
pidfile.write(str(pid) + "\n".encode("utf-8"))
1932
del pidfile
1933
except IOError:
1934
logger.error("Could not write to file %r with PID %d",
1935
pidfilename, pid)
1936
except NameError:
1937
# "pidfile" was never created
1938
pass
1939
del pidfilename
1940
1653
1941
signal.signal(signal.SIGINT, signal.SIG_IGN)
1942
1654
1943
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1655
1944
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1656
1945
1658
1947
class MandosDBusService(dbus.service.Object):
1659
1948
"""A D-Bus proxy object"""
1660
1949
def __init__(self):
1661
dbus.service.Object.__init__(self, bus, u"/")
1662
_interface = u"se.bsnet.fukt.Mandos"
1950
dbus.service.Object.__init__(self, bus, "/")
1951
_interface = "se.bsnet.fukt.Mandos"
1663
1952
1664
@dbus.service.signal(_interface, signature=u"o")
1953
@dbus.service.signal(_interface, signature="o")
1665
1954
def ClientAdded(self, objpath):
1666
1955
"D-Bus signal"
1667
1956
pass
1668
1957
1669
@dbus.service.signal(_interface, signature=u"ss")
1958
@dbus.service.signal(_interface, signature="ss")
1670
1959
def ClientNotFound(self, fingerprint, address):
1671
1960
"D-Bus signal"
1672
1961
pass
1673
1962
1674
@dbus.service.signal(_interface, signature=u"os")
1963
@dbus.service.signal(_interface, signature="os")
1675
1964
def ClientRemoved(self, objpath, name):
1676
1965
"D-Bus signal"
1677
1966
pass
1678
1967
1679
@dbus.service.method(_interface, out_signature=u"ao")
1968
@dbus.service.method(_interface, out_signature="ao")
1680
1969
def GetAllClients(self):
1681
1970
"D-Bus method"
1682
1971
return dbus.Array(c.dbus_object_path
1683
1972
for c in tcp_server.clients)
1684
1973
1685
1974
@dbus.service.method(_interface,
1686
out_signature=u"a{oa{sv}}")
1975
out_signature="a{oa{sv}}")
1687
1976
def GetAllClientsWithProperties(self):
1688
1977
"D-Bus method"
1689
1978
return dbus.Dictionary(
1690
((c.dbus_object_path, c.GetAll(u""))
1979
((c.dbus_object_path, c.GetAll(""))
1691
1980
for c in tcp_server.clients),
1692
signature=u"oa{sv}")
1981
signature="oa{sv}")
1693
1982
1694
@dbus.service.method(_interface, in_signature=u"o")
1983
@dbus.service.method(_interface, in_signature="o")
1695
1984
def RemoveClient(self, object_path):
1696
1985
"D-Bus method"
1697
1986
for c in tcp_server.clients:
1739
2028
# Find out what port we got
1740
2029
service.port = tcp_server.socket.getsockname()[1]
1741
2030
if use_ipv6:
1742
logger.info(u"Now listening on address %r, port %d,"
2031
logger.info("Now listening on address %r, port %d,"
1743
2032
" flowinfo %d, scope_id %d"
1744
2033
% tcp_server.socket.getsockname())
1745
2034
else: # IPv4
1746
logger.info(u"Now listening on address %r, port %d"
2035
logger.info("Now listening on address %r, port %d"
1747
2036
% tcp_server.socket.getsockname())
1748
2037
1749
2038
#service.interface = tcp_server.socket.getsockname()[3]
1752
2041
# From the Avahi example code
1753
2042
try:
1754
2043
service.activate()
1755
except dbus.exceptions.DBusException, error:
1756
logger.critical(u"DBusException: %s", error)
2044
except dbus.exceptions.DBusException as error:
2045
logger.critical("DBusException: %s", error)
1757
2046
cleanup()
1758
2047
sys.exit(1)
1759
2048
# End of Avahi example code
1763
2052
(tcp_server.handle_request
1764
2053
(*args[2:], **kwargs) or True))
1765
2054
1766
logger.debug(u"Starting main loop")
2055
logger.debug("Starting main loop")
1767
2056
main_loop.run()
1768
except AvahiError, error:
1769
logger.critical(u"AvahiError: %s", error)
2057
except AvahiError as error:
2058
logger.critical("AvahiError: %s", error)
1770
2059
cleanup()
1771
2060
sys.exit(1)
1772
2061
except KeyboardInterrupt:
1773
2062
if debug:
1774
print >> sys.stderr
1775
logger.debug(u"Server received KeyboardInterrupt")
1776
logger.debug(u"Server exiting")
2063
print("", file=sys.stderr)
2064
logger.debug("Server received KeyboardInterrupt")
2065
logger.debug("Server exiting")
1777
2066
# Must run before the D-Bus bus name gets deregistered
1778
2067
cleanup()
1779
2068
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0