212
188
self.group.Commit()
213
189
def entry_group_state_changed(self, state, error):
214
190
"""Derived from the Avahi example code"""
215
logger.debug("Avahi entry group state change: %i", state)
191
logger.debug(u"Avahi state change: %i", state)
217
193
if state == avahi.ENTRY_GROUP_ESTABLISHED:
218
logger.debug("Zeroconf service established.")
194
logger.debug(u"Zeroconf service established.")
219
195
elif state == avahi.ENTRY_GROUP_COLLISION:
220
logger.info("Zeroconf service name collision.")
196
logger.warning(u"Zeroconf service name collision.")
222
198
elif state == avahi.ENTRY_GROUP_FAILURE:
223
logger.critical("Avahi: Error in group state changed %s",
199
logger.critical(u"Avahi: Error in group state changed %s",
225
raise AvahiGroupError("State changed: %s"
201
raise AvahiGroupError(u"State changed: %s"
226
202
% unicode(error))
227
203
def cleanup(self):
228
204
"""Derived from the Avahi example code"""
229
205
if self.group is not None:
232
except (dbus.exceptions.UnknownMethodException,
233
dbus.exceptions.DBusException) as e:
235
207
self.group = None
237
def server_state_changed(self, state, error=None):
208
def server_state_changed(self, state):
238
209
"""Derived from the Avahi example code"""
239
logger.debug("Avahi server state change: %i", state)
240
bad_states = { avahi.SERVER_INVALID:
241
"Zeroconf server invalid",
242
avahi.SERVER_REGISTERING: None,
243
avahi.SERVER_COLLISION:
244
"Zeroconf server name collision",
245
avahi.SERVER_FAILURE:
246
"Zeroconf server failure" }
247
if state in bad_states:
248
if bad_states[state] is not None:
250
logger.error(bad_states[state])
252
logger.error(bad_states[state] + ": %r", error)
210
if state == avahi.SERVER_COLLISION:
211
logger.error(u"Zeroconf server name collision")
254
213
elif state == avahi.SERVER_RUNNING:
258
logger.debug("Unknown state: %r", state)
260
logger.debug("Unknown state: %r: %r", state, error)
261
215
def activate(self):
262
216
"""Derived from the Avahi example code"""
263
217
if self.server is None:
264
218
self.server = dbus.Interface(
265
219
self.bus.get_object(avahi.DBUS_NAME,
266
avahi.DBUS_PATH_SERVER,
267
follow_name_owner_changes=True),
220
avahi.DBUS_PATH_SERVER),
268
221
avahi.DBUS_INTERFACE_SERVER)
269
self.server.connect_to_signal("StateChanged",
222
self.server.connect_to_signal(u"StateChanged",
270
223
self.server_state_changed)
271
224
self.server_state_changed(self.server.GetState())
273
class AvahiServiceToSyslog(AvahiService):
275
"""Add the new name to the syslog messages"""
276
ret = AvahiService.rename(self)
277
syslogger.setFormatter(logging.Formatter
278
('Mandos (%s) [%%(process)d]:'
279
' %%(levelname)s: %%(message)s'
283
def _timedelta_to_milliseconds(td):
284
"Convert a datetime.timedelta() to milliseconds"
285
return ((td.days * 24 * 60 * 60 * 1000)
286
+ (td.seconds * 1000)
287
+ (td.microseconds // 1000))
289
227
class Client(object):
290
228
"""A representation of a client host served by this server.
293
_approved: bool(); 'None' if not yet approved/disapproved
294
approval_delay: datetime.timedelta(); Time to wait for approval
295
approval_duration: datetime.timedelta(); Duration of one approval
231
name: string; from the config file, used in log messages and
233
fingerprint: string (40 or 32 hexadecimal digits); used to
234
uniquely identify the client
235
secret: bytestring; sent verbatim (over TLS) to client
236
host: string; available for use by the checker command
237
created: datetime.datetime(); (UTC) object creation
238
last_enabled: datetime.datetime(); (UTC)
240
last_checked_ok: datetime.datetime(); (UTC) or None
241
timeout: datetime.timedelta(); How long from last_checked_ok
242
until this client is invalid
243
interval: datetime.timedelta(); How often to start a new checker
244
disable_hook: If set, called by disable() as disable_hook(self)
296
245
checker: subprocess.Popen(); a running checker process used
297
246
to see if the client lives.
298
247
'None' if no process is running.
299
checker_callback_tag: a gobject event source tag, or None
300
checker_command: string; External command which is run to check
301
if client lives. %() expansions are done at
248
checker_initiator_tag: a gobject event source tag, or None
249
disable_initiator_tag: - '' -
250
checker_callback_tag: - '' -
251
checker_command: string; External command which is run to check if
252
client lives. %() expansions are done at
302
253
runtime with vars(self) as dict, so that for
303
254
instance %(name)s can be used in the command.
304
checker_initiator_tag: a gobject event source tag, or None
305
created: datetime.datetime(); (UTC) object creation
306
client_structure: Object describing what attributes a client has
307
and is used for storing the client at exit
308
255
current_checker_command: string; current running checker_command
309
disable_initiator_tag: a gobject event source tag, or None
311
fingerprint: string (40 or 32 hexadecimal digits); used to
312
uniquely identify the client
313
host: string; available for use by the checker command
314
interval: datetime.timedelta(); How often to start a new checker
315
last_approval_request: datetime.datetime(); (UTC) or None
316
last_checked_ok: datetime.datetime(); (UTC) or None
317
last_checker_status: integer between 0 and 255 reflecting exit status
318
of last checker. -1 reflect crashed checker,
320
last_enabled: datetime.datetime(); (UTC)
321
name: string; from the config file, used in log messages and
323
secret: bytestring; sent verbatim (over TLS) to client
324
timeout: datetime.timedelta(); How long from last_checked_ok
325
until this client is disabled
326
extended_timeout: extra long timeout when password has been sent
327
runtime_expansions: Allowed attributes for runtime expansion.
328
expires: datetime.datetime(); time (UTC) when a client will be
332
runtime_expansions = ("approval_delay", "approval_duration",
333
"created", "enabled", "fingerprint",
334
"host", "interval", "last_checked_ok",
335
"last_enabled", "name", "timeout")
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))
337
265
def timeout_milliseconds(self):
338
266
"Return the 'timeout' attribute in milliseconds"
339
return _timedelta_to_milliseconds(self.timeout)
341
def extended_timeout_milliseconds(self):
342
"Return the 'extended_timeout' attribute in milliseconds"
343
return _timedelta_to_milliseconds(self.extended_timeout)
267
return self._datetime_to_milliseconds(self.timeout)
345
269
def interval_milliseconds(self):
346
270
"Return the 'interval' attribute in milliseconds"
347
return _timedelta_to_milliseconds(self.interval)
349
def approval_delay_milliseconds(self):
350
return _timedelta_to_milliseconds(self.approval_delay)
352
def __init__(self, name = None, config=None):
271
return self._datetime_to_milliseconds(self.interval)
273
def __init__(self, name = None, disable_hook=None, config=None):
353
274
"""Note: the 'checker' key in 'config' sets the
354
275
'checker_command' attribute and *not* the 'checker'
357
278
if config is None:
359
logger.debug("Creating client %r", self.name)
280
logger.debug(u"Creating client %r", self.name)
360
281
# Uppercase and remove spaces from fingerprint for later
361
282
# comparison purposes with return value from the fingerprint()
363
self.fingerprint = (config["fingerprint"].upper()
365
logger.debug(" Fingerprint: %s", self.fingerprint)
366
if "secret" in config:
367
self.secret = config["secret"].decode("base64")
368
elif "secfile" in config:
369
with open(os.path.expanduser(os.path.expandvars
370
(config["secfile"])),
284
self.fingerprint = (config[u"fingerprint"].upper()
286
logger.debug(u" Fingerprint: %s", self.fingerprint)
287
if u"secret" in config:
288
self.secret = config[u"secret"].decode(u"base64")
289
elif u"secfile" in config:
290
with closing(open(os.path.expanduser
292
(config[u"secfile"])))) as secfile:
372
293
self.secret = secfile.read()
374
raise TypeError("No secret or secfile for client %s"
295
raise TypeError(u"No secret or secfile for client %s"
376
self.host = config.get("host", "")
297
self.host = config.get(u"host", u"")
377
298
self.created = datetime.datetime.utcnow()
379
self.last_approval_request = None
380
self.last_enabled = datetime.datetime.utcnow()
300
self.last_enabled = None
381
301
self.last_checked_ok = None
382
self.last_checker_status = None
383
self.timeout = string_to_delta(config["timeout"])
384
self.extended_timeout = string_to_delta(config
385
["extended_timeout"])
386
self.interval = string_to_delta(config["interval"])
302
self.timeout = string_to_delta(config[u"timeout"])
303
self.interval = string_to_delta(config[u"interval"])
304
self.disable_hook = disable_hook
387
305
self.checker = None
388
306
self.checker_initiator_tag = None
389
307
self.disable_initiator_tag = None
390
self.expires = datetime.datetime.utcnow() + self.timeout
391
308
self.checker_callback_tag = None
392
self.checker_command = config["checker"]
309
self.checker_command = config[u"checker"]
393
310
self.current_checker_command = None
394
self._approved = None
395
self.approved_by_default = config.get("approved_by_default",
397
self.approvals_pending = 0
398
self.approval_delay = string_to_delta(
399
config["approval_delay"])
400
self.approval_duration = string_to_delta(
401
config["approval_duration"])
402
self.changedstate = (multiprocessing_manager
403
.Condition(multiprocessing_manager
405
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
406
self.client_structure.append("client_structure")
409
for name, t in inspect.getmembers(type(self),
410
lambda obj: isinstance(obj, property)):
411
if not name.startswith("_"):
412
self.client_structure.append(name)
414
# Send notice to process children that client state has changed
415
def send_changedstate(self):
416
with self.changedstate:
417
self.changedstate.notify_all()
311
self.last_connect = None
419
313
def enable(self):
420
314
"""Start this client's checker and timeout hooks"""
421
if getattr(self, "enabled", False):
315
if getattr(self, u"enabled", False):
422
316
# Already enabled
424
self.send_changedstate()
425
self.expires = datetime.datetime.utcnow() + self.timeout
318
self.last_enabled = datetime.datetime.utcnow()
319
# Schedule a new checker to be started an 'interval' from now,
320
# and every interval from then on.
321
self.checker_initiator_tag = (gobject.timeout_add
322
(self.interval_milliseconds(),
324
# Also start a new checker *right now*.
326
# Schedule a disable() when 'timeout' has passed
327
self.disable_initiator_tag = (gobject.timeout_add
328
(self.timeout_milliseconds(),
426
330
self.enabled = True
427
self.last_enabled = datetime.datetime.utcnow()
430
def disable(self, quiet=True):
431
333
"""Disable this client."""
432
334
if not getattr(self, "enabled", False):
435
self.send_changedstate()
437
logger.info("Disabling client %s", self.name)
438
if getattr(self, "disable_initiator_tag", False):
336
logger.info(u"Disabling client %s", self.name)
337
if getattr(self, u"disable_initiator_tag", False):
439
338
gobject.source_remove(self.disable_initiator_tag)
440
339
self.disable_initiator_tag = None
442
if getattr(self, "checker_initiator_tag", False):
340
if getattr(self, u"checker_initiator_tag", False):
443
341
gobject.source_remove(self.checker_initiator_tag)
444
342
self.checker_initiator_tag = None
445
343
self.stop_checker()
344
if self.disable_hook:
345
self.disable_hook(self)
446
346
self.enabled = False
447
347
# Do not run this again if called by a gobject.timeout_add
450
350
def __del__(self):
351
self.disable_hook = None
453
def init_checker(self):
454
# Schedule a new checker to be started an 'interval' from now,
455
# and every interval from then on.
456
self.checker_initiator_tag = (gobject.timeout_add
457
(self.interval_milliseconds(),
459
# Schedule a disable() when 'timeout' has passed
460
self.disable_initiator_tag = (gobject.timeout_add
461
(self.timeout_milliseconds(),
463
# Also start a new checker *right now*.
467
354
def checker_callback(self, pid, condition, command):
468
355
"""The checker has completed, so take appropriate actions."""
469
356
self.checker_callback_tag = None
470
357
self.checker = None
471
358
if os.WIFEXITED(condition):
472
self.last_checker_status = os.WEXITSTATUS(condition)
473
if self.last_checker_status == 0:
474
logger.info("Checker for %(name)s succeeded",
359
exitstatus = os.WEXITSTATUS(condition)
361
logger.info(u"Checker for %(name)s succeeded",
476
363
self.checked_ok()
478
logger.info("Checker for %(name)s failed",
365
logger.info(u"Checker for %(name)s failed",
481
self.last_checker_status = -1
482
logger.warning("Checker for %(name)s crashed?",
368
logger.warning(u"Checker for %(name)s crashed?",
485
def checked_ok(self, timeout=None):
371
def checked_ok(self):
486
372
"""Bump up the timeout for this client.
488
374
This should only be called when the client has been seen,
492
timeout = self.timeout
493
377
self.last_checked_ok = datetime.datetime.utcnow()
494
if self.disable_initiator_tag is not None:
495
gobject.source_remove(self.disable_initiator_tag)
496
if getattr(self, "enabled", False):
497
self.disable_initiator_tag = (gobject.timeout_add
498
(_timedelta_to_milliseconds
499
(timeout), self.disable))
500
self.expires = datetime.datetime.utcnow() + timeout
502
def need_approval(self):
503
self.last_approval_request = datetime.datetime.utcnow()
378
gobject.source_remove(self.disable_initiator_tag)
379
self.disable_initiator_tag = (gobject.timeout_add
380
(self.timeout_milliseconds(),
505
383
def start_checker(self):
506
384
"""Start a new checker subprocess if one is not running.
582
453
if self.checker_callback_tag:
583
454
gobject.source_remove(self.checker_callback_tag)
584
455
self.checker_callback_tag = None
585
if getattr(self, "checker", None) is None:
456
if getattr(self, u"checker", None) is None:
587
logger.debug("Stopping checker for %(name)s", vars(self))
458
logger.debug(u"Stopping checker for %(name)s", vars(self))
589
460
os.kill(self.checker.pid, signal.SIGTERM)
591
462
#if self.checker.poll() is None:
592
463
# os.kill(self.checker.pid, signal.SIGKILL)
593
except OSError as error:
464
except OSError, error:
594
465
if error.errno != errno.ESRCH: # No such process
596
467
self.checker = None
598
# Encrypts a client secret and stores it in a varible encrypted_secret
599
def encrypt_secret(self, key):
600
# Encryption-key need to be of a specific size, so we hash inputed key
601
hasheng = hashlib.sha256()
603
encryptionkey = hasheng.digest()
605
# Create validation hash so we know at decryption if it was sucessful
606
hasheng = hashlib.sha256()
607
hasheng.update(self.secret)
608
validationhash = hasheng.digest()
611
iv = os.urandom(Crypto.Cipher.AES.block_size)
612
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
613
Crypto.Cipher.AES.MODE_CFB, iv)
614
ciphertext = ciphereng.encrypt(validationhash+self.secret)
615
self.encrypted_secret = (ciphertext, iv)
617
# Decrypt a encrypted client secret
618
def decrypt_secret(self, key):
619
# Decryption-key need to be of a specific size, so we hash inputed key
620
hasheng = hashlib.sha256()
622
encryptionkey = hasheng.digest()
624
# Decrypt encrypted secret
625
ciphertext, iv = self.encrypted_secret
626
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
627
Crypto.Cipher.AES.MODE_CFB, iv)
628
plain = ciphereng.decrypt(ciphertext)
630
# Validate decrypted secret to know if it was succesful
631
hasheng = hashlib.sha256()
632
validationhash = plain[:hasheng.digest_size]
633
secret = plain[hasheng.digest_size:]
634
hasheng.update(secret)
636
# if validation fails, we use key as new secret. Otherwhise, we use
637
# the decrypted secret
638
if hasheng.digest() == validationhash:
469
def still_valid(self):
470
"""Has the timeout not yet passed for this client?"""
471
if not getattr(self, u"enabled", False):
473
now = datetime.datetime.utcnow()
474
if self.last_checked_ok is None:
475
return now < (self.created + self.timeout)
642
del self.encrypted_secret
645
def dbus_service_property(dbus_interface, signature="v",
646
access="readwrite", byte_arrays=False):
647
"""Decorators for marking methods of a DBusObjectWithProperties to
648
become properties on the D-Bus.
650
The decorated method will be called with no arguments by "Get"
651
and with one argument by "Set".
653
The parameters, where they are supported, are the same as
654
dbus.service.method, except there is only "signature", since the
655
type from Get() and the type sent to Set() is the same.
657
# Encoding deeply encoded byte arrays is not supported yet by the
658
# "Set" method, so we fail early here:
659
if byte_arrays and signature != "ay":
660
raise ValueError("Byte arrays not supported for non-'ay'"
661
" signature %r" % signature)
663
func._dbus_is_property = True
664
func._dbus_interface = dbus_interface
665
func._dbus_signature = signature
666
func._dbus_access = access
667
func._dbus_name = func.__name__
668
if func._dbus_name.endswith("_dbus_property"):
669
func._dbus_name = func._dbus_name[:-14]
670
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
675
class DBusPropertyException(dbus.exceptions.DBusException):
676
"""A base class for D-Bus property-related exceptions
678
def __unicode__(self):
679
return unicode(str(self))
682
class DBusPropertyAccessException(DBusPropertyException):
683
"""A property's access permissions disallows an operation.
688
class DBusPropertyNotFound(DBusPropertyException):
689
"""An attempt was made to access a non-existing property.
694
class DBusObjectWithProperties(dbus.service.Object):
695
"""A D-Bus object with properties.
697
Classes inheriting from this can use the dbus_service_property
698
decorator to expose methods as D-Bus properties. It exposes the
699
standard Get(), Set(), and GetAll() methods on the D-Bus.
703
def _is_dbus_property(obj):
704
return getattr(obj, "_dbus_is_property", False)
706
def _get_all_dbus_properties(self):
707
"""Returns a generator of (name, attribute) pairs
709
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
710
for cls in self.__class__.__mro__
712
inspect.getmembers(cls, self._is_dbus_property))
714
def _get_dbus_property(self, interface_name, property_name):
715
"""Returns a bound method if one exists which is a D-Bus
716
property with the specified name and interface.
718
for cls in self.__class__.__mro__:
719
for name, value in (inspect.getmembers
720
(cls, self._is_dbus_property)):
721
if (value._dbus_name == property_name
722
and value._dbus_interface == interface_name):
723
return value.__get__(self)
726
raise DBusPropertyNotFound(self.dbus_object_path + ":"
727
+ interface_name + "."
730
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
732
def Get(self, interface_name, property_name):
733
"""Standard D-Bus property Get() method, see D-Bus standard.
735
prop = self._get_dbus_property(interface_name, property_name)
736
if prop._dbus_access == "write":
737
raise DBusPropertyAccessException(property_name)
739
if not hasattr(value, "variant_level"):
741
return type(value)(value, variant_level=value.variant_level+1)
743
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
744
def Set(self, interface_name, property_name, value):
745
"""Standard D-Bus property Set() method, see D-Bus standard.
747
prop = self._get_dbus_property(interface_name, property_name)
748
if prop._dbus_access == "read":
749
raise DBusPropertyAccessException(property_name)
750
if prop._dbus_get_args_options["byte_arrays"]:
751
# The byte_arrays option is not supported yet on
752
# signatures other than "ay".
753
if prop._dbus_signature != "ay":
755
value = dbus.ByteArray(''.join(unichr(byte)
759
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
760
out_signature="a{sv}")
761
def GetAll(self, interface_name):
762
"""Standard D-Bus property GetAll() method, see D-Bus
765
Note: Will not include properties with access="write".
768
for name, prop in self._get_all_dbus_properties():
770
and interface_name != prop._dbus_interface):
771
# Interface non-empty but did not match
773
# Ignore write-only properties
774
if prop._dbus_access == "write":
777
if not hasattr(value, "variant_level"):
780
all[name] = type(value)(value, variant_level=
781
value.variant_level+1)
782
return dbus.Dictionary(all, signature="sv")
784
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
786
path_keyword='object_path',
787
connection_keyword='connection')
788
def Introspect(self, object_path, connection):
789
"""Standard D-Bus method, overloaded to insert property tags.
791
xmlstring = dbus.service.Object.Introspect(self, object_path,
794
document = xml.dom.minidom.parseString(xmlstring)
795
def make_tag(document, name, prop):
796
e = document.createElement("property")
797
e.setAttribute("name", name)
798
e.setAttribute("type", prop._dbus_signature)
799
e.setAttribute("access", prop._dbus_access)
801
for if_tag in document.getElementsByTagName("interface"):
802
for tag in (make_tag(document, name, prop)
804
in self._get_all_dbus_properties()
805
if prop._dbus_interface
806
== if_tag.getAttribute("name")):
807
if_tag.appendChild(tag)
808
# Add the names to the return values for the
809
# "org.freedesktop.DBus.Properties" methods
810
if (if_tag.getAttribute("name")
811
== "org.freedesktop.DBus.Properties"):
812
for cn in if_tag.getElementsByTagName("method"):
813
if cn.getAttribute("name") == "Get":
814
for arg in cn.getElementsByTagName("arg"):
815
if (arg.getAttribute("direction")
817
arg.setAttribute("name", "value")
818
elif cn.getAttribute("name") == "GetAll":
819
for arg in cn.getElementsByTagName("arg"):
820
if (arg.getAttribute("direction")
822
arg.setAttribute("name", "props")
823
xmlstring = document.toxml("utf-8")
825
except (AttributeError, xml.dom.DOMException,
826
xml.parsers.expat.ExpatError) as error:
827
logger.error("Failed to override Introspection method",
832
def datetime_to_dbus (dt, variant_level=0):
833
"""Convert a UTC datetime.datetime() to a D-Bus type."""
835
return dbus.String("", variant_level = variant_level)
836
return dbus.String(dt.isoformat(),
837
variant_level=variant_level)
839
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
841
"""Applied to an empty subclass of a D-Bus object, this metaclass
842
will add additional D-Bus attributes matching a certain pattern.
844
def __new__(mcs, name, bases, attr):
845
# Go through all the base classes which could have D-Bus
846
# methods, signals, or properties in them
847
for base in (b for b in bases
848
if issubclass(b, dbus.service.Object)):
849
# Go though all attributes of the base class
850
for attrname, attribute in inspect.getmembers(base):
851
# Ignore non-D-Bus attributes, and D-Bus attributes
852
# with the wrong interface name
853
if (not hasattr(attribute, "_dbus_interface")
854
or not attribute._dbus_interface
855
.startswith("se.recompile.Mandos")):
857
# Create an alternate D-Bus interface name based on
859
alt_interface = (attribute._dbus_interface
860
.replace("se.recompile.Mandos",
861
"se.bsnet.fukt.Mandos"))
862
# Is this a D-Bus signal?
863
if getattr(attribute, "_dbus_is_signal", False):
864
# Extract the original non-method function by
866
nonmethod_func = (dict(
867
zip(attribute.func_code.co_freevars,
868
attribute.__closure__))["func"]
870
# Create a new, but exactly alike, function
871
# object, and decorate it to be a new D-Bus signal
872
# with the alternate D-Bus interface name
873
new_function = (dbus.service.signal
875
attribute._dbus_signature)
877
nonmethod_func.func_code,
878
nonmethod_func.func_globals,
879
nonmethod_func.func_name,
880
nonmethod_func.func_defaults,
881
nonmethod_func.func_closure)))
882
# Define a creator of a function to call both the
883
# old and new functions, so both the old and new
884
# signals gets sent when the function is called
885
def fixscope(func1, func2):
886
"""This function is a scope container to pass
887
func1 and func2 to the "call_both" function
888
outside of its arguments"""
889
def call_both(*args, **kwargs):
890
"""This function will emit two D-Bus
891
signals by calling func1 and func2"""
892
func1(*args, **kwargs)
893
func2(*args, **kwargs)
895
# Create the "call_both" function and add it to
897
attr[attrname] = fixscope(attribute,
899
# Is this a D-Bus method?
900
elif getattr(attribute, "_dbus_is_method", False):
901
# Create a new, but exactly alike, function
902
# object. Decorate it to be a new D-Bus method
903
# with the alternate D-Bus interface name. Add it
905
attr[attrname] = (dbus.service.method
907
attribute._dbus_in_signature,
908
attribute._dbus_out_signature)
910
(attribute.func_code,
911
attribute.func_globals,
913
attribute.func_defaults,
914
attribute.func_closure)))
915
# Is this a D-Bus property?
916
elif getattr(attribute, "_dbus_is_property", False):
917
# Create a new, but exactly alike, function
918
# object, and decorate it to be a new D-Bus
919
# property with the alternate D-Bus interface
920
# name. Add it to the class.
921
attr[attrname] = (dbus_service_property
923
attribute._dbus_signature,
924
attribute._dbus_access,
926
._dbus_get_args_options
929
(attribute.func_code,
930
attribute.func_globals,
932
attribute.func_defaults,
933
attribute.func_closure)))
934
return type.__new__(mcs, name, bases, attr)
936
class ClientDBus(Client, DBusObjectWithProperties):
477
return now < (self.last_checked_ok + self.timeout)
480
class ClientDBus(Client, dbus.service.Object):
937
481
"""A Client class using D-Bus
940
484
dbus_object_path: dbus.ObjectPath
941
485
bus: dbus.SystemBus()
944
runtime_expansions = (Client.runtime_expansions
945
+ ("dbus_object_path",))
947
487
# dbus.service.Object doesn't use super(), so we can't either.
949
489
def __init__(self, bus = None, *args, **kwargs):
951
491
Client.__init__(self, *args, **kwargs)
953
self._approvals_pending = 0
954
492
# Only now, when this client is initialized, can it show up on
956
client_object_name = unicode(self.name).translate(
959
494
self.dbus_object_path = (dbus.ObjectPath
960
("/clients/" + client_object_name))
961
DBusObjectWithProperties.__init__(self, self.bus,
962
self.dbus_object_path)
964
def notifychangeproperty(transform_func,
965
dbus_name, type_func=lambda x: x,
967
""" Modify a variable so that it's a property which announces
970
transform_fun: Function that takes a value and a variant_level
971
and transforms it to a D-Bus type.
972
dbus_name: D-Bus name of the variable
973
type_func: Function that transform the value before sending it
974
to the D-Bus. Default: no transform
975
variant_level: D-Bus variant level. Default: 1
977
attrname = "_{0}".format(dbus_name)
978
def setter(self, value):
979
if hasattr(self, "dbus_object_path"):
980
if (not hasattr(self, attrname) or
981
type_func(getattr(self, attrname, None))
982
!= type_func(value)):
983
dbus_value = transform_func(type_func(value),
986
self.PropertyChanged(dbus.String(dbus_name),
988
setattr(self, attrname, value)
990
return property(lambda self: getattr(self, attrname), setter)
993
expires = notifychangeproperty(datetime_to_dbus, "Expires")
994
approvals_pending = notifychangeproperty(dbus.Boolean,
997
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
998
last_enabled = notifychangeproperty(datetime_to_dbus,
1000
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1001
type_func = lambda checker:
1002
checker is not None)
1003
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1005
last_approval_request = notifychangeproperty(
1006
datetime_to_dbus, "LastApprovalRequest")
1007
approved_by_default = notifychangeproperty(dbus.Boolean,
1008
"ApprovedByDefault")
1009
approval_delay = notifychangeproperty(dbus.UInt16,
1012
_timedelta_to_milliseconds)
1013
approval_duration = notifychangeproperty(
1014
dbus.UInt16, "ApprovalDuration",
1015
type_func = _timedelta_to_milliseconds)
1016
host = notifychangeproperty(dbus.String, "Host")
1017
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1019
_timedelta_to_milliseconds)
1020
extended_timeout = notifychangeproperty(
1021
dbus.UInt16, "ExtendedTimeout",
1022
type_func = _timedelta_to_milliseconds)
1023
interval = notifychangeproperty(dbus.UInt16,
1026
_timedelta_to_milliseconds)
1027
checker_command = notifychangeproperty(dbus.String, "Checker")
1029
del notifychangeproperty
496
+ self.name.replace(u".", u"_")))
497
dbus.service.Object.__init__(self, self.bus,
498
self.dbus_object_path)
501
def _datetime_to_dbus(dt, variant_level=0):
502
"""Convert a UTC datetime.datetime() to a D-Bus type."""
503
return dbus.String(dt.isoformat(),
504
variant_level=variant_level)
507
oldstate = getattr(self, u"enabled", False)
508
r = Client.enable(self)
509
if oldstate != self.enabled:
511
self.PropertyChanged(dbus.String(u"enabled"),
512
dbus.Boolean(True, variant_level=1))
513
self.PropertyChanged(
514
dbus.String(u"last_enabled"),
515
self._datetime_to_dbus(self.last_enabled,
519
def disable(self, signal = True):
520
oldstate = getattr(self, u"enabled", False)
521
r = Client.disable(self)
522
if signal and oldstate != self.enabled:
524
self.PropertyChanged(dbus.String(u"enabled"),
525
dbus.Boolean(False, variant_level=1))
1031
528
def __del__(self, *args, **kwargs):
1033
530
self.remove_from_connection()
1034
531
except LookupError:
1036
if hasattr(DBusObjectWithProperties, "__del__"):
1037
DBusObjectWithProperties.__del__(self, *args, **kwargs)
533
if hasattr(dbus.service.Object, u"__del__"):
534
dbus.service.Object.__del__(self, *args, **kwargs)
1038
535
Client.__del__(self, *args, **kwargs)
1040
537
def checker_callback(self, pid, condition, command,
1041
538
*args, **kwargs):
1042
539
self.checker_callback_tag = None
1043
540
self.checker = None
542
self.PropertyChanged(dbus.String(u"checker_running"),
543
dbus.Boolean(False, variant_level=1))
1044
544
if os.WIFEXITED(condition):
1045
545
exitstatus = os.WEXITSTATUS(condition)
1046
546
# Emit D-Bus signal
1068
577
and old_checker_pid != self.checker.pid):
1069
578
# Emit D-Bus signal
1070
579
self.CheckerStarted(self.current_checker_command)
1073
def _reset_approved(self):
1074
self._approved = None
1077
def approve(self, value=True):
1078
self.send_changedstate()
1079
self._approved = value
1080
gobject.timeout_add(_timedelta_to_milliseconds
1081
(self.approval_duration),
1082
self._reset_approved)
1085
## D-Bus methods, signals & properties
1086
_interface = "se.recompile.Mandos.Client"
580
self.PropertyChanged(
581
dbus.String(u"checker_running"),
582
dbus.Boolean(True, variant_level=1))
585
def stop_checker(self, *args, **kwargs):
586
old_checker = getattr(self, u"checker", None)
587
r = Client.stop_checker(self, *args, **kwargs)
588
if (old_checker is not None
589
and getattr(self, u"checker", None) is None):
590
self.PropertyChanged(dbus.String(u"checker_running"),
591
dbus.Boolean(False, variant_level=1))
594
## D-Bus methods & signals
595
_interface = u"se.bsnet.fukt.Mandos.Client"
598
@dbus.service.method(_interface)
600
return self.checked_ok()
1090
602
# CheckerCompleted - signal
1091
@dbus.service.signal(_interface, signature="nxs")
603
@dbus.service.signal(_interface, signature=u"nxs")
1092
604
def CheckerCompleted(self, exitcode, waitstatus, command):
1096
608
# CheckerStarted - signal
1097
@dbus.service.signal(_interface, signature="s")
609
@dbus.service.signal(_interface, signature=u"s")
1098
610
def CheckerStarted(self, command):
614
# GetAllProperties - method
615
@dbus.service.method(_interface, out_signature=u"a{sv}")
616
def GetAllProperties(self):
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,
628
dbus.String(u"last_enabled"):
629
(self._datetime_to_dbus(self.last_enabled,
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,
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(),
643
dbus.String(u"interval"):
644
dbus.UInt64(self.interval_milliseconds(),
646
dbus.String(u"checker"):
647
dbus.String(self.checker_command,
649
dbus.String(u"checker_running"):
650
dbus.Boolean(self.checker is not None,
652
dbus.String(u"object_path"):
653
dbus.ObjectPath(self.dbus_object_path,
657
# IsStillValid - method
658
@dbus.service.method(_interface, out_signature=u"b")
659
def IsStillValid(self):
660
return self.still_valid()
1102
662
# PropertyChanged - signal
1103
@dbus.service.signal(_interface, signature="sv")
663
@dbus.service.signal(_interface, signature=u"sv")
1104
664
def PropertyChanged(self, property, value):
1108
# GotSecret - signal
668
# ReceivedSecret - signal
1109
669
@dbus.service.signal(_interface)
1110
def GotSecret(self):
1112
Is sent after a successful transfer of secret from the Mandos
1113
server to mandos-client
670
def ReceivedSecret(self):
1117
674
# Rejected - signal
1118
@dbus.service.signal(_interface, signature="s")
1119
def Rejected(self, reason):
1123
# NeedApproval - signal
1124
@dbus.service.signal(_interface, signature="tb")
1125
def NeedApproval(self, timeout, default):
1127
return self.need_approval()
1129
# NeRwequest - signal
1130
@dbus.service.signal(_interface, signature="s")
1131
def NewRequest(self, ip):
1133
Is sent after a client request a password.
1140
@dbus.service.method(_interface, in_signature="b")
1141
def Approve(self, value):
1144
# CheckedOK - method
1145
@dbus.service.method(_interface)
1146
def CheckedOK(self):
675
@dbus.service.signal(_interface)
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
686
self.PropertyChanged(dbus.String(u"checker"),
687
dbus.String(self.checker_command,
691
@dbus.service.method(_interface, in_signature=u"s")
692
def SetHost(self, host):
693
"D-Bus setter method"
696
self.PropertyChanged(dbus.String(u"host"),
697
dbus.String(self.host, variant_level=1))
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)
704
self.PropertyChanged(dbus.String(u"interval"),
705
(dbus.UInt64(self.interval_milliseconds(),
709
@dbus.service.method(_interface, in_signature=u"ay",
711
def SetSecret(self, secret):
712
"D-Bus setter method"
713
self.secret = str(secret)
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)
720
self.PropertyChanged(dbus.String(u"timeout"),
721
(dbus.UInt64(self.timeout_milliseconds(),
1149
724
# Enable - method
1150
725
@dbus.service.method(_interface)
1169
744
def StopChecker(self):
1170
745
self.stop_checker()
1174
# ApprovalPending - property
1175
@dbus_service_property(_interface, signature="b", access="read")
1176
def ApprovalPending_dbus_property(self):
1177
return dbus.Boolean(bool(self.approvals_pending))
1179
# ApprovedByDefault - property
1180
@dbus_service_property(_interface, signature="b",
1182
def ApprovedByDefault_dbus_property(self, value=None):
1183
if value is None: # get
1184
return dbus.Boolean(self.approved_by_default)
1185
self.approved_by_default = bool(value)
1187
# ApprovalDelay - property
1188
@dbus_service_property(_interface, signature="t",
1190
def ApprovalDelay_dbus_property(self, value=None):
1191
if value is None: # get
1192
return dbus.UInt64(self.approval_delay_milliseconds())
1193
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1195
# ApprovalDuration - property
1196
@dbus_service_property(_interface, signature="t",
1198
def ApprovalDuration_dbus_property(self, value=None):
1199
if value is None: # get
1200
return dbus.UInt64(_timedelta_to_milliseconds(
1201
self.approval_duration))
1202
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1205
@dbus_service_property(_interface, signature="s", access="read")
1206
def Name_dbus_property(self):
1207
return dbus.String(self.name)
1209
# Fingerprint - property
1210
@dbus_service_property(_interface, signature="s", access="read")
1211
def Fingerprint_dbus_property(self):
1212
return dbus.String(self.fingerprint)
1215
@dbus_service_property(_interface, signature="s",
1217
def Host_dbus_property(self, value=None):
1218
if value is None: # get
1219
return dbus.String(self.host)
1222
# Created - property
1223
@dbus_service_property(_interface, signature="s", access="read")
1224
def Created_dbus_property(self):
1225
return dbus.String(datetime_to_dbus(self.created))
1227
# LastEnabled - property
1228
@dbus_service_property(_interface, signature="s", access="read")
1229
def LastEnabled_dbus_property(self):
1230
return datetime_to_dbus(self.last_enabled)
1232
# Enabled - property
1233
@dbus_service_property(_interface, signature="b",
1235
def Enabled_dbus_property(self, value=None):
1236
if value is None: # get
1237
return dbus.Boolean(self.enabled)
1243
# LastCheckedOK - property
1244
@dbus_service_property(_interface, signature="s",
1246
def LastCheckedOK_dbus_property(self, value=None):
1247
if value is not None:
1250
return datetime_to_dbus(self.last_checked_ok)
1252
# Expires - property
1253
@dbus_service_property(_interface, signature="s", access="read")
1254
def Expires_dbus_property(self):
1255
return datetime_to_dbus(self.expires)
1257
# LastApprovalRequest - property
1258
@dbus_service_property(_interface, signature="s", access="read")
1259
def LastApprovalRequest_dbus_property(self):
1260
return datetime_to_dbus(self.last_approval_request)
1262
# Timeout - property
1263
@dbus_service_property(_interface, signature="t",
1265
def Timeout_dbus_property(self, value=None):
1266
if value is None: # get
1267
return dbus.UInt64(self.timeout_milliseconds())
1268
self.timeout = datetime.timedelta(0, 0, 0, value)
1269
if getattr(self, "disable_initiator_tag", None) is None:
1271
# Reschedule timeout
1272
gobject.source_remove(self.disable_initiator_tag)
1273
self.disable_initiator_tag = None
1275
time_to_die = _timedelta_to_milliseconds((self
1280
if time_to_die <= 0:
1281
# The timeout has passed
1284
self.expires = (datetime.datetime.utcnow()
1285
+ datetime.timedelta(milliseconds =
1287
self.disable_initiator_tag = (gobject.timeout_add
1288
(time_to_die, self.disable))
1290
# ExtendedTimeout - property
1291
@dbus_service_property(_interface, signature="t",
1293
def ExtendedTimeout_dbus_property(self, value=None):
1294
if value is None: # get
1295
return dbus.UInt64(self.extended_timeout_milliseconds())
1296
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1298
# Interval - property
1299
@dbus_service_property(_interface, signature="t",
1301
def Interval_dbus_property(self, value=None):
1302
if value is None: # get
1303
return dbus.UInt64(self.interval_milliseconds())
1304
self.interval = datetime.timedelta(0, 0, 0, value)
1305
if getattr(self, "checker_initiator_tag", None) is None:
1307
# Reschedule checker run
1308
gobject.source_remove(self.checker_initiator_tag)
1309
self.checker_initiator_tag = (gobject.timeout_add
1310
(value, self.start_checker))
1311
self.start_checker() # Start one now, too
1313
# Checker - property
1314
@dbus_service_property(_interface, signature="s",
1316
def Checker_dbus_property(self, value=None):
1317
if value is None: # get
1318
return dbus.String(self.checker_command)
1319
self.checker_command = value
1321
# CheckerRunning - property
1322
@dbus_service_property(_interface, signature="b",
1324
def CheckerRunning_dbus_property(self, value=None):
1325
if value is None: # get
1326
return dbus.Boolean(self.checker is not None)
1328
self.start_checker()
1332
# ObjectPath - property
1333
@dbus_service_property(_interface, signature="o", access="read")
1334
def ObjectPath_dbus_property(self):
1335
return self.dbus_object_path # is already a dbus.ObjectPath
1338
@dbus_service_property(_interface, signature="ay",
1339
access="write", byte_arrays=True)
1340
def Secret_dbus_property(self, value):
1341
self.secret = str(value)
1346
class ProxyClient(object):
1347
def __init__(self, child_pipe, fpr, address):
1348
self._pipe = child_pipe
1349
self._pipe.send(('init', fpr, address))
1350
if not self._pipe.recv():
1353
def __getattribute__(self, name):
1354
if(name == '_pipe'):
1355
return super(ProxyClient, self).__getattribute__(name)
1356
self._pipe.send(('getattr', name))
1357
data = self._pipe.recv()
1358
if data[0] == 'data':
1360
if data[0] == 'function':
1361
def func(*args, **kwargs):
1362
self._pipe.send(('funcall', name, args, kwargs))
1363
return self._pipe.recv()[1]
1366
def __setattr__(self, name, value):
1367
if(name == '_pipe'):
1368
return super(ProxyClient, self).__setattr__(name, value)
1369
self._pipe.send(('setattr', name, value))
1371
class ClientDBusTransitional(ClientDBus):
1372
__metaclass__ = AlternateDBusNamesMetaclass
1374
750
class ClientHandler(socketserver.BaseRequestHandler, object):
1375
751
"""A class to handle client connections.
1378
754
Note: This will run in its own forked process."""
1380
756
def handle(self):
1381
with contextlib.closing(self.server.child_pipe) as child_pipe:
1382
logger.info("TCP connection from: %s",
1383
unicode(self.client_address))
1384
logger.debug("Pipe FD: %d",
1385
self.server.child_pipe.fileno())
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:
1387
762
session = (gnutls.connection
1388
763
.ClientSession(self.request,
1389
764
gnutls.connection
1390
765
.X509Credentials()))
767
line = self.request.makefile().readline()
768
logger.debug(u"Protocol version: %r", line)
770
if int(line.strip().split()[0]) > 1:
772
except (ValueError, IndexError, RuntimeError), error:
773
logger.error(u"Unknown protocol version: %s", error)
1392
776
# Note: gnutls.connection.X509Credentials is really a
1393
777
# generic GnuTLS certificate credentials object so long as
1394
778
# no X.509 keys are added to it. Therefore, we can use it
1395
779
# here despite using OpenPGP certificates.
1397
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1398
# "+AES-256-CBC", "+SHA1",
1399
# "+COMP-NULL", "+CTYPE-OPENPGP",
781
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
782
# u"+AES-256-CBC", u"+SHA1",
783
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1401
785
# Use a fallback default, since this MUST be set.
1402
786
priority = self.server.gnutls_priority
1403
787
if priority is None:
1405
789
(gnutls.library.functions
1406
790
.gnutls_priority_set_direct(session._c_object,
1407
791
priority, None))
1409
# Start communication using the Mandos protocol
1410
# Get protocol number
1411
line = self.request.makefile().readline()
1412
logger.debug("Protocol version: %r", line)
1414
if int(line.strip().split()[0]) > 1:
1416
except (ValueError, IndexError, RuntimeError) as error:
1417
logger.error("Unknown protocol version: %s", error)
1420
# Start GnuTLS connection
1422
794
session.handshake()
1423
except gnutls.errors.GNUTLSError as error:
1424
logger.warning("Handshake failed: %s", error)
795
except gnutls.errors.GNUTLSError, error:
796
logger.warning(u"Handshake failed: %s", error)
1425
797
# Do not run session.bye() here: the session is not
1426
798
# established. Just abandon the request.
1428
logger.debug("Handshake succeeded")
1430
approval_required = False
800
logger.debug(u"Handshake succeeded")
1433
fpr = self.fingerprint(self.peer_certificate
1436
gnutls.errors.GNUTLSError) as error:
1437
logger.warning("Bad certificate: %s", error)
1439
logger.debug("Fingerprint: %s", fpr)
1440
if self.server.use_dbus:
1442
client.NewRequest(str(self.client_address))
1445
client = ProxyClient(child_pipe, fpr,
1446
self.client_address)
1450
if client.approval_delay:
1451
delay = client.approval_delay
1452
client.approvals_pending += 1
1453
approval_required = True
1456
if not client.enabled:
1457
logger.info("Client %s is disabled",
1459
if self.server.use_dbus:
1461
client.Rejected("Disabled")
1464
if client._approved or not client.approval_delay:
1465
#We are approved or approval is disabled
1467
elif client._approved is None:
1468
logger.info("Client %s needs approval",
1470
if self.server.use_dbus:
1472
client.NeedApproval(
1473
client.approval_delay_milliseconds(),
1474
client.approved_by_default)
1476
logger.warning("Client %s was not approved",
1478
if self.server.use_dbus:
1480
client.Rejected("Denied")
1483
#wait until timeout or approved
1484
time = datetime.datetime.now()
1485
client.changedstate.acquire()
1486
(client.changedstate.wait
1487
(float(client._timedelta_to_milliseconds(delay)
1489
client.changedstate.release()
1490
time2 = datetime.datetime.now()
1491
if (time2 - time) >= delay:
1492
if not client.approved_by_default:
1493
logger.warning("Client %s timed out while"
1494
" waiting for approval",
1496
if self.server.use_dbus:
1498
client.Rejected("Approval timed out")
1503
delay -= time2 - time
1506
while sent_size < len(client.secret):
1508
sent = session.send(client.secret[sent_size:])
1509
except gnutls.errors.GNUTLSError as error:
1510
logger.warning("gnutls send failed")
1512
logger.debug("Sent: %d, remaining: %d",
1513
sent, len(client.secret)
1514
- (sent_size + sent))
1517
logger.info("Sending secret to %s", client.name)
1518
# bump the timeout using extended_timeout
1519
client.checked_ok(client.extended_timeout)
1520
if self.server.use_dbus:
802
fpr = self.fingerprint(self.peer_certificate(session))
803
except (TypeError, gnutls.errors.GNUTLSError), error:
804
logger.warning(u"Bad certificate: %s", error)
807
logger.debug(u"Fingerprint: %s", fpr)
1525
if approval_required:
1526
client.approvals_pending -= 1
1529
except gnutls.errors.GNUTLSError as error:
1530
logger.warning("GnuTLS bye failed")
809
for c in self.server.clients:
810
if c.fingerprint == fpr:
814
ipc.write(u"NOTFOUND %s\n" % fpr)
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)
824
ipc.write(u"SENDING %s\n" % client.name)
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))
1533
835
def peer_certificate(session):
1906
##################################################################
1174
######################################################################
1907
1175
# Parsing of options, both command line and config file
1909
parser = argparse.ArgumentParser()
1910
parser.add_argument("-v", "--version", action="version",
1911
version = "%%(prog)s %s" % version,
1912
help="show version number and exit")
1913
parser.add_argument("-i", "--interface", metavar="IF",
1914
help="Bind to interface IF")
1915
parser.add_argument("-a", "--address",
1916
help="Address to listen for requests on")
1917
parser.add_argument("-p", "--port", type=int,
1918
help="Port number to receive requests on")
1919
parser.add_argument("--check", action="store_true",
1920
help="Run self-test")
1921
parser.add_argument("--debug", action="store_true",
1922
help="Debug mode; run in foreground and log"
1924
parser.add_argument("--debuglevel", metavar="LEVEL",
1925
help="Debug level for stdout output")
1926
parser.add_argument("--priority", help="GnuTLS"
1927
" priority string (see GnuTLS documentation)")
1928
parser.add_argument("--servicename",
1929
metavar="NAME", help="Zeroconf service name")
1930
parser.add_argument("--configdir",
1931
default="/etc/mandos", metavar="DIR",
1932
help="Directory to search for configuration"
1934
parser.add_argument("--no-dbus", action="store_false",
1935
dest="use_dbus", help="Do not provide D-Bus"
1936
" system bus interface")
1937
parser.add_argument("--no-ipv6", action="store_false",
1938
dest="use_ipv6", help="Do not use IPv6")
1939
parser.add_argument("--no-restore", action="store_false",
1940
dest="restore", help="Do not restore stored state",
1943
options = parser.parse_args()
1177
parser = optparse.OptionParser(version = "%%prog %s" % version)
1178
parser.add_option("-i", u"--interface", type=u"string",
1179
metavar="IF", help=u"Bind to interface IF")
1180
parser.add_option("-a", u"--address", type=u"string",
1181
help=u"Address to listen for requests on")
1182
parser.add_option("-p", u"--port", type=u"int",
1183
help=u"Port number to receive requests on")
1184
parser.add_option("--check", action=u"store_true",
1185
help=u"Run self-test")
1186
parser.add_option("--debug", action=u"store_true",
1187
help=u"Debug mode; run in foreground and log to"
1189
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1190
u" priority string (see GnuTLS documentation)")
1191
parser.add_option("--servicename", type=u"string",
1192
metavar=u"NAME", help=u"Zeroconf service name")
1193
parser.add_option("--configdir", type=u"string",
1194
default=u"/etc/mandos", metavar=u"DIR",
1195
help=u"Directory to search for configuration"
1197
parser.add_option("--no-dbus", action=u"store_false",
1198
dest=u"use_dbus", help=u"Do not provide D-Bus"
1199
u" system bus interface")
1200
parser.add_option("--no-ipv6", action=u"store_false",
1201
dest=u"use_ipv6", help=u"Do not use IPv6")
1202
options = parser.parse_args()[0]
1945
1204
if options.check:
1994
1252
##################################################################
1996
1254
# For convenience
1997
debug = server_settings["debug"]
1998
debuglevel = server_settings["debuglevel"]
1999
use_dbus = server_settings["use_dbus"]
2000
use_ipv6 = server_settings["use_ipv6"]
2003
initlogger(logging.DEBUG)
2008
level = getattr(logging, debuglevel.upper())
2011
if server_settings["servicename"] != "Mandos":
1255
debug = server_settings[u"debug"]
1256
use_dbus = server_settings[u"use_dbus"]
1257
use_ipv6 = server_settings[u"use_ipv6"]
1260
syslogger.setLevel(logging.WARNING)
1261
console.setLevel(logging.WARNING)
1263
if server_settings[u"servicename"] != u"Mandos":
2012
1264
syslogger.setFormatter(logging.Formatter
2013
('Mandos (%s) [%%(process)d]:'
2014
' %%(levelname)s: %%(message)s'
2015
% server_settings["servicename"]))
1265
(u'Mandos (%s) [%%(process)d]:'
1266
u' %%(levelname)s: %%(message)s'
1267
% server_settings[u"servicename"]))
2017
1269
# Parse config file with clients
2018
client_defaults = { "timeout": "5m",
2019
"extended_timeout": "15m",
2021
"checker": "fping -q -- %%(host)s",
2023
"approval_delay": "0s",
2024
"approval_duration": "1s",
1270
client_defaults = { u"timeout": u"1h",
1272
u"checker": u"fping -q -- %%(host)s",
2026
1275
client_config = configparser.SafeConfigParser(client_defaults)
2027
client_config.read(os.path.join(server_settings["configdir"],
1276
client_config.read(os.path.join(server_settings[u"configdir"],
2030
1279
global mandos_dbus_service
2031
1280
mandos_dbus_service = None
2033
tcp_server = MandosServer((server_settings["address"],
2034
server_settings["port"]),
1282
tcp_server = MandosServer((server_settings[u"address"],
1283
server_settings[u"port"]),
2036
interface=(server_settings["interface"]
1285
interface=server_settings[u"interface"],
2038
1286
use_ipv6=use_ipv6,
2039
1287
gnutls_priority=
2040
server_settings["priority"],
1288
server_settings[u"priority"],
2041
1289
use_dbus=use_dbus)
2043
pidfilename = "/var/run/mandos.pid"
2045
pidfile = open(pidfilename, "w")
2047
logger.error("Could not open file %r", pidfilename)
1290
pidfilename = u"/var/run/mandos.pid"
1292
pidfile = open(pidfilename, u"w")
1294
logger.error(u"Could not open file %r", pidfilename)
2050
uid = pwd.getpwnam("_mandos").pw_uid
2051
gid = pwd.getpwnam("_mandos").pw_gid
1297
uid = pwd.getpwnam(u"_mandos").pw_uid
1298
gid = pwd.getpwnam(u"_mandos").pw_gid
2052
1299
except KeyError:
2054
uid = pwd.getpwnam("mandos").pw_uid
2055
gid = pwd.getpwnam("mandos").pw_gid
1301
uid = pwd.getpwnam(u"mandos").pw_uid
1302
gid = pwd.getpwnam(u"mandos").pw_gid
2056
1303
except KeyError:
2058
uid = pwd.getpwnam("nobody").pw_uid
2059
gid = pwd.getpwnam("nobody").pw_gid
1305
uid = pwd.getpwnam(u"nobody").pw_uid
1306
gid = pwd.getpwnam(u"nobody").pw_gid
2060
1307
except KeyError:
2066
except OSError as error:
1313
except OSError, error:
2067
1314
if error[0] != errno.EPERM:
1317
# Enable all possible GnuTLS debugging
2071
# Enable all possible GnuTLS debugging
2073
1319
# "Use a log level over 10 to enable all debugging options."
2074
1320
# - GnuTLS manual
2075
1321
gnutls.library.functions.gnutls_global_set_log_level(11)
2077
1323
@gnutls.library.types.gnutls_log_func
2078
1324
def debug_gnutls(level, string):
2079
logger.debug("GnuTLS: %s", string[:-1])
1325
logger.debug(u"GnuTLS: %s", string[:-1])
2081
1327
(gnutls.library.functions
2082
1328
.gnutls_global_set_log_function(debug_gnutls))
2084
# Redirect stdin so all checkers get /dev/null
2085
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2086
os.dup2(null, sys.stdin.fileno())
2090
# No console logging
2091
logger.removeHandler(console)
2093
# Need to fork before connecting to D-Bus
2095
# Close all input and output, do double fork, etc.
2098
1330
global main_loop
2099
1331
# From the Avahi example code
2102
1334
bus = dbus.SystemBus()
2103
1335
# End of Avahi example code
2106
bus_name = dbus.service.BusName("se.recompile.Mandos",
2107
bus, do_not_queue=True)
2108
old_bus_name = (dbus.service.BusName
2109
("se.bsnet.fukt.Mandos", bus,
2111
except dbus.exceptions.NameExistsException as e:
2112
logger.error(unicode(e) + ", disabling D-Bus")
2114
server_settings["use_dbus"] = False
2115
tcp_server.use_dbus = False
1337
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
2116
1338
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2117
service = AvahiServiceToSyslog(name =
2118
server_settings["servicename"],
2119
servicetype = "_mandos._tcp",
2120
protocol = protocol, bus = bus)
1339
service = AvahiService(name = server_settings[u"servicename"],
1340
servicetype = u"_mandos._tcp",
1341
protocol = protocol, bus = bus)
2121
1342
if server_settings["interface"]:
2122
1343
service.interface = (if_nametoindex
2123
(str(server_settings["interface"])))
2125
global multiprocessing_manager
2126
multiprocessing_manager = multiprocessing.Manager()
1344
(str(server_settings[u"interface"])))
2128
1346
client_class = Client
2130
client_class = functools.partial(ClientDBusTransitional,
2133
special_settings = {
2134
# Some settings need to be accessd by special methods;
2135
# booleans need .getboolean(), etc. Here is a list of them:
2136
"approved_by_default":
2138
client_config.getboolean(section, "approved_by_default"),
2140
# Construct a new dict of client settings of this form:
2141
# { client_name: {setting_name: value, ...}, ...}
2142
# with exceptions for any special settings as defined above
2143
client_settings = dict((clientname,
2145
(value if setting not in special_settings
2146
else special_settings[setting](clientname)))
2147
for setting, value in client_config.items(clientname)))
2148
for clientname in client_config.sections())
2150
old_client_settings = {}
2153
# Get client data and settings from last running state.
2154
if server_settings["restore"]:
2156
with open(stored_state_path, "rb") as stored_state:
2157
clients_data, old_client_settings = pickle.load(stored_state)
2158
os.remove(stored_state_path)
2159
except IOError as e:
2160
logger.warning("Could not load persistant state: {0}".format(e))
2161
if e.errno != errno.ENOENT:
2164
for client in clients_data:
2165
client_name = client["name"]
2167
# Decide which value to use after restoring saved state.
2168
# We have three different values: Old config file,
2169
# new config file, and saved state.
2170
# New config value takes precedence if it differs from old
2171
# config value, otherwise use saved state.
2172
for name, value in client_settings[client_name].items():
2174
# For each value in new config, check if it differs
2175
# from the old config value (Except for the "secret"
2177
if name != "secret" and value != old_client_settings[client_name][name]:
2178
setattr(client, name, value)
2182
# Clients who has passed its expire date, can still be enabled if its
2183
# last checker was sucessful. Clients who checkers failed before we
2184
# stored it state is asumed to had failed checker during downtime.
2185
if client["enabled"] and client["last_checked_ok"]:
2186
if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2187
> client["interval"]):
2188
if client["last_checker_status"] != 0:
2189
client["enabled"] = False
2191
client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2193
client["changedstate"] = (multiprocessing_manager
2194
.Condition(multiprocessing_manager
2197
new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2198
tcp_server.clients[client_name] = new_client
2199
new_client.bus = bus
2200
for name, value in client.iteritems():
2201
setattr(new_client, name, value)
2202
client_object_name = unicode(client_name).translate(
2203
{ord("."): ord("_"),
2204
ord("-"): ord("_")})
2205
new_client.dbus_object_path = (dbus.ObjectPath
2206
("/clients/" + client_object_name))
2207
DBusObjectWithProperties.__init__(new_client,
2209
new_client.dbus_object_path)
2211
tcp_server.clients[client_name] = Client.__new__(Client)
2212
for name, value in client.iteritems():
2213
setattr(tcp_server.clients[client_name], name, value)
2215
tcp_server.clients[client_name].decrypt_secret(
2216
client_settings[client_name]["secret"])
2218
# Create/remove clients based on new changes made to config
2219
for clientname in set(old_client_settings) - set(client_settings):
2220
del tcp_server.clients[clientname]
2221
for clientname in set(client_settings) - set(old_client_settings):
2222
tcp_server.clients[clientname] = (client_class(name = clientname,
1348
client_class = functools.partial(ClientDBus, bus = bus)
1349
tcp_server.clients.update(set(
1350
client_class(name = section,
1351
config= dict(client_config.items(section)))
1352
for section in client_config.sections()))
2228
1353
if not tcp_server.clients:
2229
logger.warning("No clients defined")
1354
logger.warning(u"No clients defined")
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())
1363
# No console logging
1364
logger.removeHandler(console)
1365
# Close all input and output, do double fork, etc.
1369
with closing(pidfile):
1371
pidfile.write(str(pid) + "\n")
1374
logger.error(u"Could not write to file %r with PID %d",
1377
# "pidfile" was never created
1382
"Cleanup function; run on exit"
1385
while tcp_server.clients:
1386
client = tcp_server.clients.pop()
1387
client.disable_hook = None
1390
atexit.register(cleanup)
2235
pidfile.write(str(pid) + "\n".encode("utf-8"))
2238
logger.error("Could not write to file %r with PID %d",
2241
# "pidfile" was never created
2245
1393
signal.signal(signal.SIGINT, signal.SIG_IGN)
2247
1394
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2248
1395
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2251
1398
class MandosDBusService(dbus.service.Object):
2252
1399
"""A D-Bus proxy object"""
2253
1400
def __init__(self):
2254
dbus.service.Object.__init__(self, bus, "/")
2255
_interface = "se.recompile.Mandos"
2257
@dbus.service.signal(_interface, signature="o")
2258
def ClientAdded(self, objpath):
2262
@dbus.service.signal(_interface, signature="ss")
2263
def ClientNotFound(self, fingerprint, address):
2267
@dbus.service.signal(_interface, signature="os")
1401
dbus.service.Object.__init__(self, bus, u"/")
1402
_interface = u"se.bsnet.fukt.Mandos"
1404
@dbus.service.signal(_interface, signature=u"oa{sv}")
1405
def ClientAdded(self, objpath, properties):
1409
@dbus.service.signal(_interface, signature=u"s")
1410
def ClientNotFound(self, fingerprint):
1414
@dbus.service.signal(_interface, signature=u"os")
2268
1415
def ClientRemoved(self, objpath, name):
2272
@dbus.service.method(_interface, out_signature="ao")
1419
@dbus.service.method(_interface, out_signature=u"ao")
2273
1420
def GetAllClients(self):
2275
1422
return dbus.Array(c.dbus_object_path
2277
tcp_server.clients.itervalues())
1423
for c in tcp_server.clients)
2279
1425
@dbus.service.method(_interface,
2280
out_signature="a{oa{sv}}")
1426
out_signature=u"a{oa{sv}}")
2281
1427
def GetAllClientsWithProperties(self):
2283
1429
return dbus.Dictionary(
2284
((c.dbus_object_path, c.GetAll(""))
2285
for c in tcp_server.clients.itervalues()),
1430
((c.dbus_object_path, c.GetAllProperties())
1431
for c in tcp_server.clients),
1432
signature=u"oa{sv}")
2288
@dbus.service.method(_interface, in_signature="o")
1434
@dbus.service.method(_interface, in_signature=u"o")
2289
1435
def RemoveClient(self, object_path):
2291
for c in tcp_server.clients.itervalues():
1437
for c in tcp_server.clients:
2292
1438
if c.dbus_object_path == object_path:
2293
del tcp_server.clients[c.name]
1439
tcp_server.clients.remove(c)
2294
1440
c.remove_from_connection()
2295
1441
# Don't signal anything except ClientRemoved
2296
c.disable(quiet=True)
1442
c.disable(signal=False)
2297
1443
# Emit D-Bus signal
2298
1444
self.ClientRemoved(object_path, c.name)
2300
raise KeyError(object_path)
2304
class MandosDBusServiceTransitional(MandosDBusService):
2305
__metaclass__ = AlternateDBusNamesMetaclass
2306
mandos_dbus_service = MandosDBusServiceTransitional()
2309
"Cleanup function; run on exit"
2312
multiprocessing.active_children()
2313
if not (tcp_server.clients or client_settings):
2316
# Store client before exiting. Secrets are encrypted with key based
2317
# on what config file has. If config file is removed/edited, old
2318
# secret will thus be unrecovable.
2320
for client in tcp_server.clients.itervalues():
2321
client.encrypt_secret(client_settings[client.name]["secret"])
2325
# A list of attributes that will not be stored when shuting down.
2326
exclude = set(("bus", "changedstate", "secret"))
2327
for name, typ in inspect.getmembers(dbus.service.Object):
2330
client_dict["encrypted_secret"] = client.encrypted_secret
2331
for attr in client.client_structure:
2332
if attr not in exclude:
2333
client_dict[attr] = getattr(client, attr)
2335
clients.append(client_dict)
2336
del client_settings[client.name]["secret"]
2339
with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2340
pickle.dump((clients, client_settings), stored_state)
2341
except IOError as e:
2342
logger.warning("Could not save persistant state: {0}".format(e))
2343
if e.errno != errno.ENOENT:
2346
# Delete all clients, and settings from config
2347
while tcp_server.clients:
2348
name, client = tcp_server.clients.popitem()
2350
client.remove_from_connection()
2351
# Don't signal anything except ClientRemoved
2352
client.disable(quiet=True)
2355
mandos_dbus_service.ClientRemoved(client
2358
client_settings.clear()
2360
atexit.register(cleanup)
2362
for client in tcp_server.clients.itervalues():
1450
mandos_dbus_service = MandosDBusService()
1452
for client in tcp_server.clients:
2364
1454
# Emit D-Bus signal
2365
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2366
# Need to initiate checking of clients
2368
client.init_checker()
1455
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1456
client.GetAllProperties())
2371
1459
tcp_server.enable()
2372
1460
tcp_server.server_activate()