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 341
- compare with another revision
- download diff
- download tarball
- view history from revision 341
- Committer: Teddy Hogeborn
- Date: 2009-04-17 01:16:37 UTC
- Revision ID: teddy@fukt.bsnet.se-20090417011637-bcqjpm7fskm4370v
Code cleanup and one bug fix.
* mandos (Client.enable): Bug fix: Do not enable if already enabled.
(MandosServer.__init__): Create empty set of clients if none passed.
(main): Do not create clients set; do not pass a clients set to
MandosServer. Use tcp_server.clients throughout.
* mandos (Client.enable): Bug fix: Do not enable if already enabled.
(MandosServer.__init__): Create empty set of clients if none passed.
(main): Do not create clients set; do not pass a clients set to
MandosServer. Use tcp_server.clients throughout.
- files removed:
- dbus-mandos.conf
- files modified:
- Makefile
added
removed
mandos
55
55
import logging
56
56
import logging.handlers
57
57
import pwd
58
import contextlib
58
from contextlib import closing
59
59
import struct
60
60
import fcntl
61
61
import functools
62
import cPickle as pickle
63
import multiprocessing
64
62
65
63
import dbus
66
64
import dbus.service
69
67
from dbus.mainloop.glib import DBusGMainLoop
70
68
import ctypes
71
69
import ctypes.util
72
import xml.dom.minidom
73
import inspect
74
70
75
71
try:
76
72
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
77
SO_BINDTODEVICE = None
82
78
83
79
84
version = "1.0.14"
80
version = "1.0.8"
85
81
86
#logger = logging.getLogger(u'mandos')
87
82
logger = logging.Logger(u'mandos')
88
83
syslogger = (logging.handlers.SysLogHandler
89
84
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
157
152
u" after %i retries, exiting.",
158
153
self.rename_count)
159
154
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
155
self.name = self.server.GetAlternativeServiceName(self.name)
161
156
logger.info(u"Changing Zeroconf service name to %r ...",
162
self.name)
157
unicode(self.name))
163
158
syslogger.setFormatter(logging.Formatter
164
159
(u'Mandos (%s) [%%(process)d]:'
165
160
u' %%(levelname)s: %%(message)s'
166
161
% self.name))
167
162
self.remove()
168
try:
169
self.add()
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
172
self.cleanup()
173
os._exit(1)
163
self.add()
174
164
self.rename_count += 1
175
165
def remove(self):
176
166
"""Derived from the Avahi example code"""
184
174
self.server.EntryGroupNew()),
185
175
avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
176
self.group.connect_to_signal('StateChanged',
187
self
188
.entry_group_state_changed)
177
self.entry_group_state_changed)
189
178
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
190
179
self.name, self.type)
191
180
self.group.AddService(
199
188
self.group.Commit()
200
189
def entry_group_state_changed(self, state, error):
201
190
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
191
logger.debug(u"Avahi state change: %i", state)
203
192
204
193
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
194
logger.debug(u"Zeroconf service established.")
218
207
self.group = None
219
208
def server_state_changed(self, state):
220
209
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
210
if state == avahi.SERVER_COLLISION:
223
211
logger.error(u"Zeroconf server name collision")
224
212
self.remove()
251
239
enabled: bool()
252
240
last_checked_ok: datetime.datetime(); (UTC) or None
253
241
timeout: datetime.timedelta(); How long from last_checked_ok
254
until this client is disabled
242
until this client is invalid
255
243
interval: datetime.timedelta(); How often to start a new checker
256
244
disable_hook: If set, called by disable() as disable_hook(self)
257
245
checker: subprocess.Popen(); a running checker process used
258
246
to see if the client lives.
259
247
'None' if no process is running.
260
248
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
249
disable_initiator_tag: - '' -
262
250
checker_callback_tag: - '' -
263
251
checker_command: string; External command which is run to check if
264
252
client lives. %() expansions are done at
265
253
runtime with vars(self) as dict, so that for
266
254
instance %(name)s can be used in the command.
267
255
current_checker_command: string; current running checker_command
268
approved_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approved_duration: datetime.timedelta(); Duration of one approval
271
256
"""
272
257
273
258
@staticmethod
274
def _timedelta_to_milliseconds(td):
275
"Convert a datetime.timedelta() to milliseconds"
276
return ((td.days * 24 * 60 * 60 * 1000)
277
+ (td.seconds * 1000)
278
+ (td.microseconds // 1000))
259
def _datetime_to_milliseconds(dt):
260
"Convert a datetime.datetime() to milliseconds"
261
return ((dt.days * 24 * 60 * 60 * 1000)
262
+ (dt.seconds * 1000)
263
+ (dt.microseconds // 1000))
279
264
280
265
def timeout_milliseconds(self):
281
266
"Return the 'timeout' attribute in milliseconds"
282
return self._timedelta_to_milliseconds(self.timeout)
267
return self._datetime_to_milliseconds(self.timeout)
283
268
284
269
def interval_milliseconds(self):
285
270
"Return the 'interval' attribute in milliseconds"
286
return self._timedelta_to_milliseconds(self.interval)
287
288
def approved_delay_milliseconds(self):
289
return self._timedelta_to_milliseconds(self.approved_delay)
271
return self._datetime_to_milliseconds(self.interval)
290
272
291
273
def __init__(self, name = None, disable_hook=None, config=None):
292
274
"""Note: the 'checker' key in 'config' sets the
305
287
if u"secret" in config:
306
288
self.secret = config[u"secret"].decode(u"base64")
307
289
elif u"secfile" in config:
308
with open(os.path.expanduser(os.path.expandvars
309
(config[u"secfile"])),
310
"rb") as secfile:
290
with closing(open(os.path.expanduser
291
(os.path.expandvars
292
(config[u"secfile"])))) as secfile:
311
293
self.secret = secfile.read()
312
294
else:
313
295
raise TypeError(u"No secret or secfile for client %s"
327
309
self.checker_command = config[u"checker"]
328
310
self.current_checker_command = None
329
311
self.last_connect = None
330
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
332
True)
333
self.approvals_pending = 0
334
self.approved_delay = string_to_delta(
335
config[u"approved_delay"])
336
self.approved_duration = string_to_delta(
337
config[u"approved_duration"])
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
339
312
340
def send_changedstate(self):
341
self.changedstate.acquire()
342
self.changedstate.notify_all()
343
self.changedstate.release()
344
345
313
def enable(self):
346
314
"""Start this client's checker and timeout hooks"""
347
315
if getattr(self, u"enabled", False):
348
316
# Already enabled
349
317
return
350
self.send_changedstate()
351
318
self.last_enabled = datetime.datetime.utcnow()
352
319
# Schedule a new checker to be started an 'interval' from now,
353
320
# and every interval from then on.
354
321
self.checker_initiator_tag = (gobject.timeout_add
355
322
(self.interval_milliseconds(),
356
323
self.start_checker))
324
# Also start a new checker *right now*.
325
self.start_checker()
357
326
# Schedule a disable() when 'timeout' has passed
358
327
self.disable_initiator_tag = (gobject.timeout_add
359
328
(self.timeout_milliseconds(),
360
329
self.disable))
361
330
self.enabled = True
362
# Also start a new checker *right now*.
363
self.start_checker()
364
331
365
def disable(self, quiet=True):
332
def disable(self):
366
333
"""Disable this client."""
367
334
if not getattr(self, "enabled", False):
368
335
return False
369
if not quiet:
370
self.send_changedstate()
371
if not quiet:
372
logger.info(u"Disabling client %s", self.name)
336
logger.info(u"Disabling client %s", self.name)
373
337
if getattr(self, u"disable_initiator_tag", False):
374
338
gobject.source_remove(self.disable_initiator_tag)
375
339
self.disable_initiator_tag = None
427
391
# client would inevitably timeout, since no checker would get
428
392
# a chance to run to completion. If we instead leave running
429
393
# checkers alone, the checker would have to take more time
430
# than 'timeout' for the client to be disabled, which is as it
431
# should be.
394
# than 'timeout' for the client to be declared invalid, which
395
# is as it should be.
432
396
433
397
# If a checker exists, make sure it is not a zombie
434
try:
398
if self.checker is not None:
435
399
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
436
except (AttributeError, OSError), error:
437
if (isinstance(error, OSError)
438
and error.errno != errno.ECHILD):
439
raise error
440
else:
441
400
if pid:
442
401
logger.warning(u"Checker was a zombie")
443
402
gobject.source_remove(self.checker_callback_tag)
499
458
logger.debug(u"Stopping checker for %(name)s", vars(self))
500
459
try:
501
460
os.kill(self.checker.pid, signal.SIGTERM)
502
#time.sleep(0.5)
461
#os.sleep(0.5)
503
462
#if self.checker.poll() is None:
504
463
# os.kill(self.checker.pid, signal.SIGKILL)
505
464
except OSError, error:
506
465
if error.errno != errno.ESRCH: # No such process
507
466
raise
508
467
self.checker = None
509
510
def dbus_service_property(dbus_interface, signature=u"v",
511
access=u"readwrite", byte_arrays=False):
512
"""Decorators for marking methods of a DBusObjectWithProperties to
513
become properties on the D-Bus.
514
515
The decorated method will be called with no arguments by "Get"
516
and with one argument by "Set".
517
518
The parameters, where they are supported, are the same as
519
dbus.service.method, except there is only "signature", since the
520
type from Get() and the type sent to Set() is the same.
521
"""
522
# Encoding deeply encoded byte arrays is not supported yet by the
523
# "Set" method, so we fail early here:
524
if byte_arrays and signature != u"ay":
525
raise ValueError(u"Byte arrays not supported for non-'ay'"
526
u" signature %r" % signature)
527
def decorator(func):
528
func._dbus_is_property = True
529
func._dbus_interface = dbus_interface
530
func._dbus_signature = signature
531
func._dbus_access = access
532
func._dbus_name = func.__name__
533
if func._dbus_name.endswith(u"_dbus_property"):
534
func._dbus_name = func._dbus_name[:-14]
535
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
536
return func
537
return decorator
538
539
540
class DBusPropertyException(dbus.exceptions.DBusException):
541
"""A base class for D-Bus property-related exceptions
542
"""
543
def __unicode__(self):
544
return unicode(str(self))
545
546
547
class DBusPropertyAccessException(DBusPropertyException):
548
"""A property's access permissions disallows an operation.
549
"""
550
pass
551
552
553
class DBusPropertyNotFound(DBusPropertyException):
554
"""An attempt was made to access a non-existing property.
555
"""
556
pass
557
558
559
class DBusObjectWithProperties(dbus.service.Object):
560
"""A D-Bus object with properties.
561
562
Classes inheriting from this can use the dbus_service_property
563
decorator to expose methods as D-Bus properties. It exposes the
564
standard Get(), Set(), and GetAll() methods on the D-Bus.
565
"""
566
567
@staticmethod
568
def _is_dbus_property(obj):
569
return getattr(obj, u"_dbus_is_property", False)
570
571
def _get_all_dbus_properties(self):
572
"""Returns a generator of (name, attribute) pairs
573
"""
574
return ((prop._dbus_name, prop)
575
for name, prop in
576
inspect.getmembers(self, self._is_dbus_property))
577
578
def _get_dbus_property(self, interface_name, property_name):
579
"""Returns a bound method if one exists which is a D-Bus
580
property with the specified name and interface.
581
"""
582
for name in (property_name,
583
property_name + u"_dbus_property"):
584
prop = getattr(self, name, None)
585
if (prop is None
586
or not self._is_dbus_property(prop)
587
or prop._dbus_name != property_name
588
or (interface_name and prop._dbus_interface
589
and interface_name != prop._dbus_interface)):
590
continue
591
return prop
592
# No such property
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
595
+ property_name)
596
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
598
out_signature=u"v")
599
def Get(self, interface_name, property_name):
600
"""Standard D-Bus property Get() method, see D-Bus standard.
601
"""
602
prop = self._get_dbus_property(interface_name, property_name)
603
if prop._dbus_access == u"write":
604
raise DBusPropertyAccessException(property_name)
605
value = prop()
606
if not hasattr(value, u"variant_level"):
607
return value
608
return type(value)(value, variant_level=value.variant_level+1)
609
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
611
def Set(self, interface_name, property_name, value):
612
"""Standard D-Bus property Set() method, see D-Bus standard.
613
"""
614
prop = self._get_dbus_property(interface_name, property_name)
615
if prop._dbus_access == u"read":
616
raise DBusPropertyAccessException(property_name)
617
if prop._dbus_get_args_options[u"byte_arrays"]:
618
# The byte_arrays option is not supported yet on
619
# signatures other than "ay".
620
if prop._dbus_signature != u"ay":
621
raise ValueError
622
value = dbus.ByteArray(''.join(unichr(byte)
623
for byte in value))
624
prop(value)
625
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
628
def GetAll(self, interface_name):
629
"""Standard D-Bus property GetAll() method, see D-Bus
630
standard.
631
632
Note: Will not include properties with access="write".
633
"""
634
all = {}
635
for name, prop in self._get_all_dbus_properties():
636
if (interface_name
637
and interface_name != prop._dbus_interface):
638
# Interface non-empty but did not match
639
continue
640
# Ignore write-only properties
641
if prop._dbus_access == u"write":
642
continue
643
value = prop()
644
if not hasattr(value, u"variant_level"):
645
all[name] = value
646
continue
647
all[name] = type(value)(value, variant_level=
648
value.variant_level+1)
649
return dbus.Dictionary(all, signature=u"sv")
650
651
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
652
out_signature=u"s",
653
path_keyword='object_path',
654
connection_keyword='connection')
655
def Introspect(self, object_path, connection):
656
"""Standard D-Bus method, overloaded to insert property tags.
657
"""
658
xmlstring = dbus.service.Object.Introspect(self, object_path,
659
connection)
660
try:
661
document = xml.dom.minidom.parseString(xmlstring)
662
def make_tag(document, name, prop):
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
667
return e
668
for if_tag in document.getElementsByTagName(u"interface"):
669
for tag in (make_tag(document, name, prop)
670
for name, prop
671
in self._get_all_dbus_properties()
672
if prop._dbus_interface
673
== if_tag.getAttribute(u"name")):
674
if_tag.appendChild(tag)
675
# Add the names to the return values for the
676
# "org.freedesktop.DBus.Properties" methods
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
683
== u"out"):
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
688
== u"out"):
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
691
document.unlink()
692
except (AttributeError, xml.dom.DOMException,
693
xml.parsers.expat.ExpatError), error:
694
logger.error(u"Failed to override Introspection method",
695
error)
696
return xmlstring
697
698
699
class ClientDBus(Client, DBusObjectWithProperties):
468
469
def still_valid(self):
470
"""Has the timeout not yet passed for this client?"""
471
if not getattr(self, u"enabled", False):
472
return False
473
now = datetime.datetime.utcnow()
474
if self.last_checked_ok is None:
475
return now < (self.created + self.timeout)
476
else:
477
return now < (self.last_checked_ok + self.timeout)
478
479
480
class ClientDBus(Client, dbus.service.Object):
700
481
"""A Client class using D-Bus
701
482
702
483
Attributes:
706
487
# dbus.service.Object doesn't use super(), so we can't either.
707
488
708
489
def __init__(self, bus = None, *args, **kwargs):
709
self._approvals_pending = 0
710
490
self.bus = bus
711
491
Client.__init__(self, *args, **kwargs)
712
492
# Only now, when this client is initialized, can it show up on
714
494
self.dbus_object_path = (dbus.ObjectPath
715
495
(u"/clients/"
716
496
+ self.name.replace(u".", u"_")))
717
DBusObjectWithProperties.__init__(self, self.bus,
718
self.dbus_object_path)
719
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
725
bval = bool(value)
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"approved_pending"),
730
dbus_bool)
731
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
497
dbus.service.Object.__init__(self, self.bus,
498
self.dbus_object_path)
735
499
736
500
@staticmethod
737
501
def _datetime_to_dbus(dt, variant_level=0):
752
516
variant_level=1))
753
517
return r
754
518
755
def disable(self, quiet = False):
519
def disable(self, signal = True):
756
520
oldstate = getattr(self, u"enabled", False)
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
521
r = Client.disable(self)
522
if signal and oldstate != self.enabled:
759
523
# Emit D-Bus signal
760
524
self.PropertyChanged(dbus.String(u"enabled"),
761
525
dbus.Boolean(False, variant_level=1))
766
530
self.remove_from_connection()
767
531
except LookupError:
768
532
pass
769
if hasattr(DBusObjectWithProperties, u"__del__"):
770
DBusObjectWithProperties.__del__(self, *args, **kwargs)
533
if hasattr(dbus.service.Object, u"__del__"):
534
dbus.service.Object.__del__(self, *args, **kwargs)
771
535
Client.__del__(self, *args, **kwargs)
772
536
773
537
def checker_callback(self, pid, condition, command,
826
590
self.PropertyChanged(dbus.String(u"checker_running"),
827
591
dbus.Boolean(False, variant_level=1))
828
592
return r
829
830
def _reset_approved(self):
831
self._approved = None
832
return False
833
834
def approve(self, value=True):
835
self.send_changedstate()
836
self._approved = value
837
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration),
838
self._reset_approved)
839
840
841
## D-Bus methods, signals & properties
593
594
## D-Bus methods & signals
842
595
_interface = u"se.bsnet.fukt.Mandos.Client"
843
596
844
## Signals
597
# CheckedOK - method
598
@dbus.service.method(_interface)
599
def CheckedOK(self):
600
return self.checked_ok()
845
601
846
602
# CheckerCompleted - signal
847
603
@dbus.service.signal(_interface, signature=u"nxs")
855
611
"D-Bus signal"
856
612
pass
857
613
614
# GetAllProperties - method
615
@dbus.service.method(_interface, out_signature=u"a{sv}")
616
def GetAllProperties(self):
617
"D-Bus method"
618
return dbus.Dictionary({
619
dbus.String(u"name"):
620
dbus.String(self.name, variant_level=1),
621
dbus.String(u"fingerprint"):
622
dbus.String(self.fingerprint, variant_level=1),
623
dbus.String(u"host"):
624
dbus.String(self.host, variant_level=1),
625
dbus.String(u"created"):
626
self._datetime_to_dbus(self.created,
627
variant_level=1),
628
dbus.String(u"last_enabled"):
629
(self._datetime_to_dbus(self.last_enabled,
630
variant_level=1)
631
if self.last_enabled is not None
632
else dbus.Boolean(False, variant_level=1)),
633
dbus.String(u"enabled"):
634
dbus.Boolean(self.enabled, variant_level=1),
635
dbus.String(u"last_checked_ok"):
636
(self._datetime_to_dbus(self.last_checked_ok,
637
variant_level=1)
638
if self.last_checked_ok is not None
639
else dbus.Boolean (False, variant_level=1)),
640
dbus.String(u"timeout"):
641
dbus.UInt64(self.timeout_milliseconds(),
642
variant_level=1),
643
dbus.String(u"interval"):
644
dbus.UInt64(self.interval_milliseconds(),
645
variant_level=1),
646
dbus.String(u"checker"):
647
dbus.String(self.checker_command,
648
variant_level=1),
649
dbus.String(u"checker_running"):
650
dbus.Boolean(self.checker is not None,
651
variant_level=1),
652
dbus.String(u"object_path"):
653
dbus.ObjectPath(self.dbus_object_path,
654
variant_level=1)
655
}, signature=u"sv")
656
657
# IsStillValid - method
658
@dbus.service.method(_interface, out_signature=u"b")
659
def IsStillValid(self):
660
return self.still_valid()
661
858
662
# PropertyChanged - signal
859
663
@dbus.service.signal(_interface, signature=u"sv")
860
664
def PropertyChanged(self, property, value):
861
665
"D-Bus signal"
862
666
pass
863
667
864
# GotSecret - signal
668
# ReceivedSecret - signal
865
669
@dbus.service.signal(_interface)
866
def GotSecret(self):
867
"""D-Bus signal
868
Is sent after a successful transfer of secret from the Mandos
869
server to mandos-client
870
"""
670
def ReceivedSecret(self):
671
"D-Bus signal"
871
672
pass
872
673
873
674
# Rejected - signal
874
@dbus.service.signal(_interface, signature=u"s")
875
def Rejected(self, reason):
876
"D-Bus signal"
877
pass
878
879
# NeedApproval - signal
880
@dbus.service.signal(_interface, signature=u"db")
881
def NeedApproval(self, timeout, default):
882
"D-Bus signal"
883
pass
884
885
## Methods
886
887
# Approve - method
888
@dbus.service.method(_interface, in_signature=u"b")
889
def Approve(self, value):
890
self.approve(value)
891
892
# CheckedOK - method
893
@dbus.service.method(_interface)
894
def CheckedOK(self):
895
return self.checked_ok()
675
@dbus.service.signal(_interface)
676
def Rejected(self):
677
"D-Bus signal"
678
pass
679
680
# SetChecker - method
681
@dbus.service.method(_interface, in_signature=u"s")
682
def SetChecker(self, checker):
683
"D-Bus setter method"
684
self.checker_command = checker
685
# Emit D-Bus signal
686
self.PropertyChanged(dbus.String(u"checker"),
687
dbus.String(self.checker_command,
688
variant_level=1))
689
690
# SetHost - method
691
@dbus.service.method(_interface, in_signature=u"s")
692
def SetHost(self, host):
693
"D-Bus setter method"
694
self.host = host
695
# Emit D-Bus signal
696
self.PropertyChanged(dbus.String(u"host"),
697
dbus.String(self.host, variant_level=1))
698
699
# SetInterval - method
700
@dbus.service.method(_interface, in_signature=u"t")
701
def SetInterval(self, milliseconds):
702
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
# Emit D-Bus signal
704
self.PropertyChanged(dbus.String(u"interval"),
705
(dbus.UInt64(self.interval_milliseconds(),
706
variant_level=1)))
707
708
# SetSecret - method
709
@dbus.service.method(_interface, in_signature=u"ay",
710
byte_arrays=True)
711
def SetSecret(self, secret):
712
"D-Bus setter method"
713
self.secret = str(secret)
714
715
# SetTimeout - method
716
@dbus.service.method(_interface, in_signature=u"t")
717
def SetTimeout(self, milliseconds):
718
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
719
# Emit D-Bus signal
720
self.PropertyChanged(dbus.String(u"timeout"),
721
(dbus.UInt64(self.timeout_milliseconds(),
722
variant_level=1)))
896
723
897
724
# Enable - method
898
725
@dbus.service.method(_interface)
917
744
def StopChecker(self):
918
745
self.stop_checker()
919
746
920
## Properties
921
922
# approved_pending - property
923
@dbus_service_property(_interface, signature=u"b", access=u"read")
924
def approved_pending_dbus_property(self):
925
return dbus.Boolean(bool(self.approvals_pending))
926
927
# approved_by_default - property
928
@dbus_service_property(_interface, signature=u"b",
929
access=u"readwrite")
930
def approved_by_default_dbus_property(self):
931
return dbus.Boolean(self.approved_by_default)
932
933
# approved_delay - property
934
@dbus_service_property(_interface, signature=u"t",
935
access=u"readwrite")
936
def approved_delay_dbus_property(self):
937
return dbus.UInt64(self.approved_delay_milliseconds())
938
939
# approved_duration - property
940
@dbus_service_property(_interface, signature=u"t",
941
access=u"readwrite")
942
def approved_duration_dbus_property(self):
943
return dbus.UInt64(self._timedelta_to_milliseconds(
944
self.approved_duration))
945
946
# name - property
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
948
def name_dbus_property(self):
949
return dbus.String(self.name)
950
951
# fingerprint - property
952
@dbus_service_property(_interface, signature=u"s", access=u"read")
953
def fingerprint_dbus_property(self):
954
return dbus.String(self.fingerprint)
955
956
# host - property
957
@dbus_service_property(_interface, signature=u"s",
958
access=u"readwrite")
959
def host_dbus_property(self, value=None):
960
if value is None: # get
961
return dbus.String(self.host)
962
self.host = value
963
# Emit D-Bus signal
964
self.PropertyChanged(dbus.String(u"host"),
965
dbus.String(value, variant_level=1))
966
967
# created - property
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def created_dbus_property(self):
970
return dbus.String(self._datetime_to_dbus(self.created))
971
972
# last_enabled - property
973
@dbus_service_property(_interface, signature=u"s", access=u"read")
974
def last_enabled_dbus_property(self):
975
if self.last_enabled is None:
976
return dbus.String(u"")
977
return dbus.String(self._datetime_to_dbus(self.last_enabled))
978
979
# enabled - property
980
@dbus_service_property(_interface, signature=u"b",
981
access=u"readwrite")
982
def enabled_dbus_property(self, value=None):
983
if value is None: # get
984
return dbus.Boolean(self.enabled)
985
if value:
986
self.enable()
987
else:
988
self.disable()
989
990
# last_checked_ok - property
991
@dbus_service_property(_interface, signature=u"s",
992
access=u"readwrite")
993
def last_checked_ok_dbus_property(self, value=None):
994
if value is not None:
995
self.checked_ok()
996
return
997
if self.last_checked_ok is None:
998
return dbus.String(u"")
999
return dbus.String(self._datetime_to_dbus(self
1000
.last_checked_ok))
1001
1002
# timeout - property
1003
@dbus_service_property(_interface, signature=u"t",
1004
access=u"readwrite")
1005
def timeout_dbus_property(self, value=None):
1006
if value is None: # get
1007
return dbus.UInt64(self.timeout_milliseconds())
1008
self.timeout = datetime.timedelta(0, 0, 0, value)
1009
# Emit D-Bus signal
1010
self.PropertyChanged(dbus.String(u"timeout"),
1011
dbus.UInt64(value, variant_level=1))
1012
if getattr(self, u"disable_initiator_tag", None) is None:
1013
return
1014
# Reschedule timeout
1015
gobject.source_remove(self.disable_initiator_tag)
1016
self.disable_initiator_tag = None
1017
time_to_die = (self.
1018
_timedelta_to_milliseconds((self
1019
.last_checked_ok
1020
+ self.timeout)
1021
- datetime.datetime
1022
.utcnow()))
1023
if time_to_die <= 0:
1024
# The timeout has passed
1025
self.disable()
1026
else:
1027
self.disable_initiator_tag = (gobject.timeout_add
1028
(time_to_die, self.disable))
1029
1030
# interval - property
1031
@dbus_service_property(_interface, signature=u"t",
1032
access=u"readwrite")
1033
def interval_dbus_property(self, value=None):
1034
if value is None: # get
1035
return dbus.UInt64(self.interval_milliseconds())
1036
self.interval = datetime.timedelta(0, 0, 0, value)
1037
# Emit D-Bus signal
1038
self.PropertyChanged(dbus.String(u"interval"),
1039
dbus.UInt64(value, variant_level=1))
1040
if getattr(self, u"checker_initiator_tag", None) is None:
1041
return
1042
# Reschedule checker run
1043
gobject.source_remove(self.checker_initiator_tag)
1044
self.checker_initiator_tag = (gobject.timeout_add
1045
(value, self.start_checker))
1046
self.start_checker() # Start one now, too
1047
1048
# checker - property
1049
@dbus_service_property(_interface, signature=u"s",
1050
access=u"readwrite")
1051
def checker_dbus_property(self, value=None):
1052
if value is None: # get
1053
return dbus.String(self.checker_command)
1054
self.checker_command = value
1055
# Emit D-Bus signal
1056
self.PropertyChanged(dbus.String(u"checker"),
1057
dbus.String(self.checker_command,
1058
variant_level=1))
1059
1060
# checker_running - property
1061
@dbus_service_property(_interface, signature=u"b",
1062
access=u"readwrite")
1063
def checker_running_dbus_property(self, value=None):
1064
if value is None: # get
1065
return dbus.Boolean(self.checker is not None)
1066
if value:
1067
self.start_checker()
1068
else:
1069
self.stop_checker()
1070
1071
# object_path - property
1072
@dbus_service_property(_interface, signature=u"o", access=u"read")
1073
def object_path_dbus_property(self):
1074
return self.dbus_object_path # is already a dbus.ObjectPath
1075
1076
# secret = property
1077
@dbus_service_property(_interface, signature=u"ay",
1078
access=u"write", byte_arrays=True)
1079
def secret_dbus_property(self, value):
1080
self.secret = str(value)
1081
1082
747
del _interface
1083
748
1084
749
1085
class ProxyClient(object):
1086
def __init__(self, child_pipe, fpr, address):
1087
self._pipe = child_pipe
1088
self._pipe.send(('init', fpr, address))
1089
if not self._pipe.recv():
1090
raise KeyError()
1091
1092
def __getattribute__(self, name):
1093
if(name == '_pipe'):
1094
return super(ProxyClient, self).__getattribute__(name)
1095
self._pipe.send(('getattr', name))
1096
data = self._pipe.recv()
1097
if data[0] == 'data':
1098
return data[1]
1099
if data[0] == 'function':
1100
def func(*args, **kwargs):
1101
self._pipe.send(('funcall', name, args, kwargs))
1102
return self._pipe.recv()[1]
1103
return func
1104
1105
def __setattr__(self, name, value):
1106
if(name == '_pipe'):
1107
return super(ProxyClient, self).__setattr__(name, value)
1108
self._pipe.send(('setattr', name, value))
1109
1110
1111
750
class ClientHandler(socketserver.BaseRequestHandler, object):
1112
751
"""A class to handle client connections.
1113
752
1115
754
Note: This will run in its own forked process."""
1116
755
1117
756
def handle(self):
1118
with contextlib.closing(self.server.child_pipe) as child_pipe:
1119
logger.info(u"TCP connection from: %s",
1120
unicode(self.client_address))
1121
logger.debug(u"Pipe FD: %d",
1122
self.server.child_pipe.fileno())
1123
757
logger.info(u"TCP connection from: %s",
758
unicode(self.client_address))
759
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
# Open IPC pipe to parent process
761
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1124
762
session = (gnutls.connection
1125
763
.ClientSession(self.request,
1126
764
gnutls.connection
1127
765
.X509Credentials()))
1128
766
767
line = self.request.makefile().readline()
768
logger.debug(u"Protocol version: %r", line)
769
try:
770
if int(line.strip().split()[0]) > 1:
771
raise RuntimeError
772
except (ValueError, IndexError, RuntimeError), error:
773
logger.error(u"Unknown protocol version: %s", error)
774
return
775
1129
776
# Note: gnutls.connection.X509Credentials is really a
1130
777
# generic GnuTLS certificate credentials object so long as
1131
778
# no X.509 keys are added to it. Therefore, we can use it
1132
779
# here despite using OpenPGP certificates.
1133
780
1134
781
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1135
782
# u"+AES-256-CBC", u"+SHA1",
1136
783
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1142
789
(gnutls.library.functions
1143
790
.gnutls_priority_set_direct(session._c_object,
1144
791
priority, None))
1145
1146
# Start communication using the Mandos protocol
1147
# Get protocol number
1148
line = self.request.makefile().readline()
1149
logger.debug(u"Protocol version: %r", line)
1150
try:
1151
if int(line.strip().split()[0]) > 1:
1152
raise RuntimeError
1153
except (ValueError, IndexError, RuntimeError), error:
1154
logger.error(u"Unknown protocol version: %s", error)
1155
return
1156
1157
# Start GnuTLS connection
792
1158
793
try:
1159
794
session.handshake()
1160
795
except gnutls.errors.GNUTLSError, error:
1163
798
# established. Just abandon the request.
1164
799
return
1165
800
logger.debug(u"Handshake succeeded")
1166
1167
approval_required = False
1168
801
try:
1169
try:
1170
fpr = self.fingerprint(self.peer_certificate
1171
(session))
1172
except (TypeError, gnutls.errors.GNUTLSError), error:
1173
logger.warning(u"Bad certificate: %s", error)
1174
return
1175
logger.debug(u"Fingerprint: %s", fpr)
1176
1177
try:
1178
client = ProxyClient(child_pipe, fpr,
1179
self.client_address)
1180
except KeyError:
1181
return
1182
1183
if client.approved_delay:
1184
delay = client.approved_delay
1185
client.approvals_pending += 1
1186
approval_required = True
1187
1188
while True:
1189
if not client.enabled:
1190
logger.warning(u"Client %s is disabled",
1191
client.name)
1192
if self.server.use_dbus:
1193
# Emit D-Bus signal
1194
client.Rejected("Disabled")
1195
return
1196
1197
if client._approved or not client.approved_delay:
1198
#We are approved or approval is disabled
1199
break
1200
elif client._approved is None:
1201
logger.info(u"Client %s need approval",
1202
client.name)
1203
if self.server.use_dbus:
1204
# Emit D-Bus signal
1205
client.NeedApproval(
1206
client.approved_delay_milliseconds(),
1207
client.approved_by_default)
1208
else:
1209
logger.warning(u"Client %s was not approved",
1210
client.name)
1211
if self.server.use_dbus:
1212
# Emit D-Bus signal
1213
client.Rejected("Disapproved")
1214
return
1215
1216
#wait until timeout or approved
1217
#x = float(client._timedelta_to_milliseconds(delay))
1218
time = datetime.datetime.now()
1219
client.changedstate.acquire()
1220
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1221
client.changedstate.release()
1222
time2 = datetime.datetime.now()
1223
if (time2 - time) >= delay:
1224
if not client.approved_by_default:
1225
logger.warning("Client %s timed out while"
1226
" waiting for approval",
1227
client.name)
1228
if self.server.use_dbus:
1229
# Emit D-Bus signal
1230
client.Rejected("Time out")
1231
return
1232
else:
1233
break
1234
else:
1235
delay -= time2 - time
1236
1237
sent_size = 0
1238
while sent_size < len(client.secret):
1239
try:
1240
sent = session.send(client.secret[sent_size:])
1241
except (gnutls.errors.GNUTLSError), error:
1242
logger.warning("gnutls send failed")
1243
return
1244
logger.debug(u"Sent: %d, remaining: %d",
1245
sent, len(client.secret)
1246
- (sent_size + sent))
1247
sent_size += sent
1248
1249
logger.info(u"Sending secret to %s", client.name)
1250
# bump the timeout as if seen
1251
client.checked_ok()
1252
if self.server.use_dbus:
1253
# Emit D-Bus signal
1254
client.GotSecret()
802
fpr = self.fingerprint(self.peer_certificate(session))
803
except (TypeError, gnutls.errors.GNUTLSError), error:
804
logger.warning(u"Bad certificate: %s", error)
805
session.bye()
806
return
807
logger.debug(u"Fingerprint: %s", fpr)
1255
808
1256
finally:
1257
if approval_required:
1258
client.approvals_pending -= 1
1259
try:
1260
session.bye()
1261
except (gnutls.errors.GNUTLSError), error:
1262
logger.warning("gnutls bye failed")
809
for c in self.server.clients:
810
if c.fingerprint == fpr:
811
client = c
812
break
813
else:
814
ipc.write(u"NOTFOUND %s\n" % fpr)
815
session.bye()
816
return
817
# Have to check if client.still_valid(), since it is
818
# possible that the client timed out while establishing
819
# the GnuTLS session.
820
if not client.still_valid():
821
ipc.write(u"INVALID %s\n" % client.name)
822
session.bye()
823
return
824
ipc.write(u"SENDING %s\n" % client.name)
825
sent_size = 0
826
while sent_size < len(client.secret):
827
sent = session.send(client.secret[sent_size:])
828
logger.debug(u"Sent: %d, remaining: %d",
829
sent, len(client.secret)
830
- (sent_size + sent))
831
sent_size += sent
832
session.bye()
1263
833
1264
834
@staticmethod
1265
835
def peer_certificate(session):
1325
895
return hex_fpr
1326
896
1327
897
1328
class MultiprocessingMixIn(object):
1329
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1330
def sub_process_main(self, request, address):
1331
try:
1332
self.finish_request(request, address)
1333
except:
1334
self.handle_error(request, address)
1335
self.close_request(request)
1336
1337
def process_request(self, request, address):
1338
"""Start a new process to process the request."""
1339
multiprocessing.Process(target = self.sub_process_main,
1340
args = (request, address)).start()
1341
1342
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1343
""" adds a pipe to the MixIn """
898
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
899
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1344
900
def process_request(self, request, client_address):
1345
901
"""Overrides and wraps the original process_request().
1346
902
1347
This function creates a new pipe in self.pipe
903
This function creates a new pipe in self.pipe
1348
904
"""
1349
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1350
1351
super(MultiprocessingMixInWithPipe,
905
self.pipe = os.pipe()
906
super(ForkingMixInWithPipe,
1352
907
self).process_request(request, client_address)
1353
self.child_pipe.close()
1354
self.add_pipe(parent_pipe)
1355
1356
def add_pipe(self, parent_pipe):
908
os.close(self.pipe[1]) # close write end
909
self.add_pipe(self.pipe[0])
910
def add_pipe(self, pipe):
1357
911
"""Dummy function; override as necessary"""
1358
pass
1359
1360
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
912
os.close(pipe)
913
914
915
class IPv6_TCPServer(ForkingMixInWithPipe,
1361
916
socketserver.TCPServer, object):
1362
917
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1363
918
1427
982
clients: set of Client objects
1428
983
gnutls_priority GnuTLS priority string
1429
984
use_dbus: Boolean; to emit D-Bus signals or not
985
clients: set of Client objects
986
gnutls_priority GnuTLS priority string
987
use_dbus: Boolean; to emit D-Bus signals or not
1430
988
1431
989
Assumes a gobject.MainLoop event loop.
1432
990
"""
1448
1006
return socketserver.TCPServer.server_activate(self)
1449
1007
def enable(self):
1450
1008
self.enabled = True
1451
def add_pipe(self, parent_pipe):
1009
def add_pipe(self, pipe):
1452
1010
# Call "handle_ipc" for both data and EOF events
1453
gobject.io_add_watch(parent_pipe.fileno(),
1454
gobject.IO_IN | gobject.IO_HUP,
1455
functools.partial(self.handle_ipc,
1456
parent_pipe = parent_pipe))
1457
1458
def handle_ipc(self, source, condition, parent_pipe=None,
1459
client_object=None):
1011
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1012
self.handle_ipc)
1013
def handle_ipc(self, source, condition, file_objects={}):
1460
1014
condition_names = {
1461
1015
gobject.IO_IN: u"IN", # There is data to read.
1462
1016
gobject.IO_OUT: u"OUT", # Data can be written (without
1473
1027
if cond & condition)
1474
1028
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1475
1029
conditions_string)
1476
1477
# error or the other end of multiprocessing.Pipe has closed
1478
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1479
return False
1480
1481
# Read a request from the child
1482
request = parent_pipe.recv()
1483
logger.debug(u"IPC request: %s", repr(request))
1484
command = request[0]
1485
1486
if command == 'init':
1487
fpr = request[1]
1488
address = request[2]
1489
1490
for c in self.clients:
1491
if c.fingerprint == fpr:
1492
client = c
1493
break
1494
else:
1495
logger.warning(u"Client not found for fingerprint: %s, ad"
1496
u"dress: %s", fpr, address)
1497
if self.use_dbus:
1498
# Emit D-Bus signal
1499
mandos_dbus_service.ClientNotFound(fpr, address)
1500
parent_pipe.send(False)
1501
return False
1502
1503
gobject.io_add_watch(parent_pipe.fileno(),
1504
gobject.IO_IN | gobject.IO_HUP,
1505
functools.partial(self.handle_ipc,
1506
parent_pipe = parent_pipe,
1507
client_object = client))
1508
parent_pipe.send(True)
1509
# remove the old hook in favor of the new above hook on same fileno
1510
return False
1511
if command == 'funcall':
1512
funcname = request[1]
1513
args = request[2]
1514
kwargs = request[3]
1515
1516
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1517
1518
if command == 'getattr':
1519
attrname = request[1]
1520
if callable(client_object.__getattribute__(attrname)):
1521
parent_pipe.send(('function',))
1522
else:
1523
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1524
1525
if command == 'setattr':
1526
attrname = request[1]
1527
value = request[2]
1528
setattr(client_object, attrname, value)
1529
1030
1031
# Turn the pipe file descriptor into a Python file object
1032
if source not in file_objects:
1033
file_objects[source] = os.fdopen(source, u"r", 1)
1034
1035
# Read a line from the file object
1036
cmdline = file_objects[source].readline()
1037
if not cmdline: # Empty line means end of file
1038
# close the IPC pipe
1039
file_objects[source].close()
1040
del file_objects[source]
1041
1042
# Stop calling this function
1043
return False
1044
1045
logger.debug(u"IPC command: %r", cmdline)
1046
1047
# Parse and act on command
1048
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1049
1050
if cmd == u"NOTFOUND":
1051
logger.warning(u"Client not found for fingerprint: %s",
1052
args)
1053
if self.use_dbus:
1054
# Emit D-Bus signal
1055
mandos_dbus_service.ClientNotFound(args)
1056
elif cmd == u"INVALID":
1057
for client in self.clients:
1058
if client.name == args:
1059
logger.warning(u"Client %s is invalid", args)
1060
if self.use_dbus:
1061
# Emit D-Bus signal
1062
client.Rejected()
1063
break
1064
else:
1065
logger.error(u"Unknown client %s is invalid", args)
1066
elif cmd == u"SENDING":
1067
for client in self.clients:
1068
if client.name == args:
1069
logger.info(u"Sending secret to %s", client.name)
1070
client.checked_ok()
1071
if self.use_dbus:
1072
# Emit D-Bus signal
1073
client.ReceivedSecret()
1074
break
1075
else:
1076
logger.error(u"Sending secret to unknown client %s",
1077
args)
1078
else:
1079
logger.error(u"Unknown IPC command: %r", cmdline)
1080
1081
# Keep calling this function
1530
1082
return True
1531
1083
1532
1084
1562
1114
elif suffix == u"w":
1563
1115
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1564
1116
else:
1565
raise ValueError(u"Unknown suffix %r" % suffix)
1566
except (ValueError, IndexError), e:
1567
raise ValueError(e.message)
1117
raise ValueError
1118
except (ValueError, IndexError):
1119
raise ValueError
1568
1120
timevalue += delta
1569
1121
return timevalue
1570
1122
1583
1135
def if_nametoindex(interface):
1584
1136
"Get an interface index the hard way, i.e. using fcntl()"
1585
1137
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1586
with contextlib.closing(socket.socket()) as s:
1138
with closing(socket.socket()) as s:
1587
1139
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1588
1140
struct.pack(str(u"16s16x"),
1589
1141
interface))
1609
1161
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1610
1162
if not stat.S_ISCHR(os.fstat(null).st_mode):
1611
1163
raise OSError(errno.ENODEV,
1612
u"%s not a character device"
1613
% os.path.devnull)
1164
u"/dev/null not a character device")
1614
1165
os.dup2(null, sys.stdin.fileno())
1615
1166
os.dup2(null, sys.stdout.fileno())
1616
1167
os.dup2(null, sys.stderr.fileno())
1620
1171
1621
1172
def main():
1622
1173
1623
##################################################################
1174
######################################################################
1624
1175
# Parsing of options, both command line and config file
1625
1176
1626
1177
parser = optparse.OptionParser(version = "%%prog %s" % version)
1635
1186
parser.add_option("--debug", action=u"store_true",
1636
1187
help=u"Debug mode; run in foreground and log to"
1637
1188
u" terminal")
1638
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1639
help=u"Debug level for stdout output")
1640
1189
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1641
1190
u" priority string (see GnuTLS documentation)")
1642
1191
parser.add_option("--servicename", type=u"string",
1667
1216
u"servicename": u"Mandos",
1668
1217
u"use_dbus": u"True",
1669
1218
u"use_ipv6": u"True",
1670
u"debuglevel": u"",
1671
1219
}
1672
1220
1673
1221
# Parse config file for server-global settings
1690
1238
# options, if set.
1691
1239
for option in (u"interface", u"address", u"port", u"debug",
1692
1240
u"priority", u"servicename", u"configdir",
1693
u"use_dbus", u"use_ipv6", u"debuglevel"):
1241
u"use_dbus", u"use_ipv6"):
1694
1242
value = getattr(options, option)
1695
1243
if value is not None:
1696
1244
server_settings[option] = value
1705
1253
1706
1254
# For convenience
1707
1255
debug = server_settings[u"debug"]
1708
debuglevel = server_settings[u"debuglevel"]
1709
1256
use_dbus = server_settings[u"use_dbus"]
1710
1257
use_ipv6 = server_settings[u"use_ipv6"]
1711
1258
1259
if not debug:
1260
syslogger.setLevel(logging.WARNING)
1261
console.setLevel(logging.WARNING)
1262
1712
1263
if server_settings[u"servicename"] != u"Mandos":
1713
1264
syslogger.setFormatter(logging.Formatter
1714
1265
(u'Mandos (%s) [%%(process)d]:'
1720
1271
u"interval": u"5m",
1721
1272
u"checker": u"fping -q -- %%(host)s",
1722
1273
u"host": u"",
1723
u"approved_delay": u"0s",
1724
u"approved_duration": u"1s",
1725
1274
}
1726
1275
client_config = configparser.SafeConfigParser(client_defaults)
1727
1276
client_config.read(os.path.join(server_settings[u"configdir"],
1766
1315
raise error
1767
1316
1768
1317
# Enable all possible GnuTLS debugging
1769
1770
1771
if not debug and not debuglevel:
1772
syslogger.setLevel(logging.WARNING)
1773
console.setLevel(logging.WARNING)
1774
if debuglevel:
1775
level = getattr(logging, debuglevel.upper())
1776
syslogger.setLevel(level)
1777
console.setLevel(level)
1778
1779
1318
if debug:
1780
1319
# "Use a log level over 10 to enable all debugging options."
1781
1320
# - GnuTLS manual
1787
1326
1788
1327
(gnutls.library.functions
1789
1328
.gnutls_global_set_log_function(debug_gnutls))
1790
1791
# Redirect stdin so all checkers get /dev/null
1792
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1793
os.dup2(null, sys.stdin.fileno())
1794
if null > 2:
1795
os.close(null)
1796
else:
1797
# No console logging
1798
logger.removeHandler(console)
1799
1800
1329
1801
1330
global main_loop
1802
1331
# From the Avahi example code
1805
1334
bus = dbus.SystemBus()
1806
1335
# End of Avahi example code
1807
1336
if use_dbus:
1808
try:
1809
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1810
bus, do_not_queue=True)
1811
except dbus.exceptions.NameExistsException, e:
1812
logger.error(unicode(e) + u", disabling D-Bus")
1813
use_dbus = False
1814
server_settings[u"use_dbus"] = False
1815
tcp_server.use_dbus = False
1337
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1816
1338
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1817
1339
service = AvahiService(name = server_settings[u"servicename"],
1818
1340
servicetype = u"_mandos._tcp",
1820
1342
if server_settings["interface"]:
1821
1343
service.interface = (if_nametoindex
1822
1344
(str(server_settings[u"interface"])))
1823
1824
if not debug:
1825
# Close all input and output, do double fork, etc.
1826
daemon()
1827
1828
global multiprocessing_manager
1829
multiprocessing_manager = multiprocessing.Manager()
1830
1345
1831
1346
client_class = Client
1832
1347
if use_dbus:
1833
1348
client_class = functools.partial(ClientDBus, bus = bus)
1834
def client_config_items(config, section):
1835
special_settings = {
1836
"approved_by_default":
1837
lambda: config.getboolean(section,
1838
"approved_by_default"),
1839
}
1840
for name, value in config.items(section):
1841
try:
1842
yield (name, special_settings[name]())
1843
except KeyError:
1844
yield (name, value)
1845
1846
1349
tcp_server.clients.update(set(
1847
1350
client_class(name = section,
1848
config= dict(client_config_items(
1849
client_config, section)))
1351
config= dict(client_config.items(section)))
1850
1352
for section in client_config.sections()))
1851
1353
if not tcp_server.clients:
1852
1354
logger.warning(u"No clients defined")
1853
1355
1356
if debug:
1357
# Redirect stdin so all checkers get /dev/null
1358
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1359
os.dup2(null, sys.stdin.fileno())
1360
if null > 2:
1361
os.close(null)
1362
else:
1363
# No console logging
1364
logger.removeHandler(console)
1365
# Close all input and output, do double fork, etc.
1366
daemon()
1367
1854
1368
try:
1855
with pidfile:
1369
with closing(pidfile):
1856
1370
pid = os.getpid()
1857
1371
pidfile.write(str(pid) + "\n")
1858
1372
del pidfile
1864
1378
pass
1865
1379
del pidfilename
1866
1380
1381
def cleanup():
1382
"Cleanup function; run on exit"
1383
service.cleanup()
1384
1385
while tcp_server.clients:
1386
client = tcp_server.clients.pop()
1387
client.disable_hook = None
1388
client.disable()
1389
1390
atexit.register(cleanup)
1391
1867
1392
if not debug:
1868
1393
signal.signal(signal.SIGINT, signal.SIG_IGN)
1869
1394
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1876
1401
dbus.service.Object.__init__(self, bus, u"/")
1877
1402
_interface = u"se.bsnet.fukt.Mandos"
1878
1403
1879
@dbus.service.signal(_interface, signature=u"o")
1880
def ClientAdded(self, objpath):
1404
@dbus.service.signal(_interface, signature=u"oa{sv}")
1405
def ClientAdded(self, objpath, properties):
1881
1406
"D-Bus signal"
1882
1407
pass
1883
1408
1884
@dbus.service.signal(_interface, signature=u"ss")
1885
def ClientNotFound(self, fingerprint, address):
1409
@dbus.service.signal(_interface, signature=u"s")
1410
def ClientNotFound(self, fingerprint):
1886
1411
"D-Bus signal"
1887
1412
pass
1888
1413
1902
1427
def GetAllClientsWithProperties(self):
1903
1428
"D-Bus method"
1904
1429
return dbus.Dictionary(
1905
((c.dbus_object_path, c.GetAll(u""))
1430
((c.dbus_object_path, c.GetAllProperties())
1906
1431
for c in tcp_server.clients),
1907
1432
signature=u"oa{sv}")
1908
1433
1914
1439
tcp_server.clients.remove(c)
1915
1440
c.remove_from_connection()
1916
1441
# Don't signal anything except ClientRemoved
1917
c.disable(quiet=True)
1442
c.disable(signal=False)
1918
1443
# Emit D-Bus signal
1919
1444
self.ClientRemoved(object_path, c.name)
1920
1445
return
1921
raise KeyError(object_path)
1446
raise KeyError
1922
1447
1923
1448
del _interface
1924
1449
1925
1450
mandos_dbus_service = MandosDBusService()
1926
1451
1927
def cleanup():
1928
"Cleanup function; run on exit"
1929
service.cleanup()
1930
1931
while tcp_server.clients:
1932
client = tcp_server.clients.pop()
1933
if use_dbus:
1934
client.remove_from_connection()
1935
client.disable_hook = None
1936
# Don't signal anything except ClientRemoved
1937
client.disable(quiet=True)
1938
if use_dbus:
1939
# Emit D-Bus signal
1940
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1941
client.name)
1942
1943
atexit.register(cleanup)
1944
1945
1452
for client in tcp_server.clients:
1946
1453
if use_dbus:
1947
1454
# Emit D-Bus signal
1948
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1455
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1456
client.GetAllProperties())
1949
1457
client.enable()
1950
1458
1951
1459
tcp_server.enable()
1969
1477
service.activate()
1970
1478
except dbus.exceptions.DBusException, error:
1971
1479
logger.critical(u"DBusException: %s", error)
1972
cleanup()
1973
1480
sys.exit(1)
1974
1481
# End of Avahi example code
1975
1482
1982
1489
main_loop.run()
1983
1490
except AvahiError, error:
1984
1491
logger.critical(u"AvahiError: %s", error)
1985
cleanup()
1986
1492
sys.exit(1)
1987
1493
except KeyboardInterrupt:
1988
1494
if debug:
1989
1495
print >> sys.stderr
1990
1496
logger.debug(u"Server received KeyboardInterrupt")
1991
1497
logger.debug(u"Server exiting")
1992
# Must run before the D-Bus bus name gets deregistered
1993
cleanup()
1994
1498
1995
1499
if __name__ == '__main__':
1996
1500
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0