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