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