208
188
self.group.Commit()
209
189
def entry_group_state_changed(self, state, error):
210
190
"""Derived from the Avahi example code"""
211
logger.debug("Avahi entry group state change: %i", state)
191
logger.debug(u"Avahi state change: %i", state)
213
193
if state == avahi.ENTRY_GROUP_ESTABLISHED:
214
logger.debug("Zeroconf service established.")
194
logger.debug(u"Zeroconf service established.")
215
195
elif state == avahi.ENTRY_GROUP_COLLISION:
216
logger.info("Zeroconf service name collision.")
196
logger.warning(u"Zeroconf service name collision.")
218
198
elif state == avahi.ENTRY_GROUP_FAILURE:
219
logger.critical("Avahi: Error in group state changed %s",
199
logger.critical(u"Avahi: Error in group state changed %s",
221
raise AvahiGroupError("State changed: %s"
201
raise AvahiGroupError(u"State changed: %s"
222
202
% unicode(error))
223
203
def cleanup(self):
224
204
"""Derived from the Avahi example code"""
225
205
if self.group is not None:
228
except (dbus.exceptions.UnknownMethodException,
229
dbus.exceptions.DBusException) as e:
231
207
self.group = None
233
def server_state_changed(self, state, error=None):
208
def server_state_changed(self, state):
234
209
"""Derived from the Avahi example code"""
235
logger.debug("Avahi server state change: %i", state)
236
bad_states = { avahi.SERVER_INVALID:
237
"Zeroconf server invalid",
238
avahi.SERVER_REGISTERING: None,
239
avahi.SERVER_COLLISION:
240
"Zeroconf server name collision",
241
avahi.SERVER_FAILURE:
242
"Zeroconf server failure" }
243
if state in bad_states:
244
if bad_states[state] is not None:
246
logger.error(bad_states[state])
248
logger.error(bad_states[state] + ": %r", error)
210
if state == avahi.SERVER_COLLISION:
211
logger.error(u"Zeroconf server name collision")
250
213
elif state == avahi.SERVER_RUNNING:
254
logger.debug("Unknown state: %r", state)
256
logger.debug("Unknown state: %r: %r", state, error)
257
215
def activate(self):
258
216
"""Derived from the Avahi example code"""
259
217
if self.server is None:
260
218
self.server = dbus.Interface(
261
219
self.bus.get_object(avahi.DBUS_NAME,
262
avahi.DBUS_PATH_SERVER,
263
follow_name_owner_changes=True),
220
avahi.DBUS_PATH_SERVER),
264
221
avahi.DBUS_INTERFACE_SERVER)
265
self.server.connect_to_signal("StateChanged",
222
self.server.connect_to_signal(u"StateChanged",
266
223
self.server_state_changed)
267
224
self.server_state_changed(self.server.GetState())
269
class AvahiServiceToSyslog(AvahiService):
271
"""Add the new name to the syslog messages"""
272
ret = AvahiService.rename(self)
273
syslogger.setFormatter(logging.Formatter
274
('Mandos (%s) [%%(process)d]:'
275
' %%(levelname)s: %%(message)s'
279
def _timedelta_to_milliseconds(td):
280
"Convert a datetime.timedelta() to milliseconds"
281
return ((td.days * 24 * 60 * 60 * 1000)
282
+ (td.seconds * 1000)
283
+ (td.microseconds // 1000))
285
227
class Client(object):
286
228
"""A representation of a client host served by this server.
289
_approved: bool(); 'None' if not yet approved/disapproved
290
approval_delay: datetime.timedelta(); Time to wait for approval
291
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)
292
245
checker: subprocess.Popen(); a running checker process used
293
246
to see if the client lives.
294
247
'None' if no process is running.
295
checker_callback_tag: a gobject event source tag, or None
296
checker_command: string; External command which is run to check
297
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
298
253
runtime with vars(self) as dict, so that for
299
254
instance %(name)s can be used in the command.
300
checker_initiator_tag: a gobject event source tag, or None
301
created: datetime.datetime(); (UTC) object creation
302
client_structure: Object describing what attributes a client has
303
and is used for storing the client at exit
304
255
current_checker_command: string; current running checker_command
305
disable_initiator_tag: a gobject event source tag, or None
307
fingerprint: string (40 or 32 hexadecimal digits); used to
308
uniquely identify the client
309
host: string; available for use by the checker command
310
interval: datetime.timedelta(); How often to start a new checker
311
last_approval_request: datetime.datetime(); (UTC) or None
312
last_checked_ok: datetime.datetime(); (UTC) or None
313
last_checker_status: integer between 0 and 255 reflecting exit status
314
of last checker. -1 reflect crashed checker,
316
last_enabled: datetime.datetime(); (UTC)
317
name: string; from the config file, used in log messages and
319
secret: bytestring; sent verbatim (over TLS) to client
320
timeout: datetime.timedelta(); How long from last_checked_ok
321
until this client is disabled
322
extended_timeout: extra long timeout when password has been sent
323
runtime_expansions: Allowed attributes for runtime expansion.
324
expires: datetime.datetime(); time (UTC) when a client will be
328
runtime_expansions = ("approval_delay", "approval_duration",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
331
"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))
333
265
def timeout_milliseconds(self):
334
266
"Return the 'timeout' attribute in milliseconds"
335
return _timedelta_to_milliseconds(self.timeout)
337
def extended_timeout_milliseconds(self):
338
"Return the 'extended_timeout' attribute in milliseconds"
339
return _timedelta_to_milliseconds(self.extended_timeout)
267
return self._datetime_to_milliseconds(self.timeout)
341
269
def interval_milliseconds(self):
342
270
"Return the 'interval' attribute in milliseconds"
343
return _timedelta_to_milliseconds(self.interval)
345
def approval_delay_milliseconds(self):
346
return _timedelta_to_milliseconds(self.approval_delay)
348
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):
349
274
"""Note: the 'checker' key in 'config' sets the
350
275
'checker_command' attribute and *not* the 'checker'
353
278
if config is None:
355
logger.debug("Creating client %r", self.name)
280
logger.debug(u"Creating client %r", self.name)
356
281
# Uppercase and remove spaces from fingerprint for later
357
282
# comparison purposes with return value from the fingerprint()
359
self.fingerprint = (config["fingerprint"].upper()
361
logger.debug(" Fingerprint: %s", self.fingerprint)
362
if "secret" in config:
363
self.secret = config["secret"].decode("base64")
364
elif "secfile" in config:
365
with open(os.path.expanduser(os.path.expandvars
366
(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:
368
293
self.secret = secfile.read()
370
raise TypeError("No secret or secfile for client %s"
295
raise TypeError(u"No secret or secfile for client %s"
372
self.host = config.get("host", "")
297
self.host = config.get(u"host", u"")
373
298
self.created = datetime.datetime.utcnow()
375
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
300
self.last_enabled = None
377
301
self.last_checked_ok = None
378
self.last_checker_status = None
379
self.timeout = string_to_delta(config["timeout"])
380
self.extended_timeout = string_to_delta(config
381
["extended_timeout"])
382
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
383
305
self.checker = None
384
306
self.checker_initiator_tag = None
385
307
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
387
308
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
309
self.checker_command = config[u"checker"]
389
310
self.current_checker_command = None
390
self._approved = None
391
self.approved_by_default = config.get("approved_by_default",
393
self.approvals_pending = 0
394
self.approval_delay = string_to_delta(
395
config["approval_delay"])
396
self.approval_duration = string_to_delta(
397
config["approval_duration"])
398
self.changedstate = (multiprocessing_manager
399
.Condition(multiprocessing_manager
401
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
402
self.client_structure.append("client_structure")
405
for name, t in inspect.getmembers(type(self),
406
lambda obj: isinstance(obj, property)):
407
if not name.startswith("_"):
408
self.client_structure.append(name)
410
# Send notice to process children that client state has changed
411
def send_changedstate(self):
412
with self.changedstate:
413
self.changedstate.notify_all()
311
self.last_connect = None
415
313
def enable(self):
416
314
"""Start this client's checker and timeout hooks"""
417
if getattr(self, "enabled", False):
315
if getattr(self, u"enabled", False):
418
316
# Already enabled
420
self.send_changedstate()
421
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(),
422
330
self.enabled = True
423
self.last_enabled = datetime.datetime.utcnow()
426
def disable(self, quiet=True):
427
333
"""Disable this client."""
428
334
if not getattr(self, "enabled", False):
431
self.send_changedstate()
433
logger.info("Disabling client %s", self.name)
434
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):
435
338
gobject.source_remove(self.disable_initiator_tag)
436
339
self.disable_initiator_tag = None
438
if getattr(self, "checker_initiator_tag", False):
340
if getattr(self, u"checker_initiator_tag", False):
439
341
gobject.source_remove(self.checker_initiator_tag)
440
342
self.checker_initiator_tag = None
441
343
self.stop_checker()
344
if self.disable_hook:
345
self.disable_hook(self)
442
346
self.enabled = False
443
347
# Do not run this again if called by a gobject.timeout_add
446
350
def __del__(self):
351
self.disable_hook = None
449
def init_checker(self):
450
# Schedule a new checker to be started an 'interval' from now,
451
# and every interval from then on.
452
self.checker_initiator_tag = (gobject.timeout_add
453
(self.interval_milliseconds(),
455
# Schedule a disable() when 'timeout' has passed
456
self.disable_initiator_tag = (gobject.timeout_add
457
(self.timeout_milliseconds(),
459
# Also start a new checker *right now*.
463
354
def checker_callback(self, pid, condition, command):
464
355
"""The checker has completed, so take appropriate actions."""
465
356
self.checker_callback_tag = None
466
357
self.checker = None
467
358
if os.WIFEXITED(condition):
468
self.last_checker_status = os.WEXITSTATUS(condition)
469
if self.last_checker_status == 0:
470
logger.info("Checker for %(name)s succeeded",
359
exitstatus = os.WEXITSTATUS(condition)
361
logger.info(u"Checker for %(name)s succeeded",
472
363
self.checked_ok()
474
logger.info("Checker for %(name)s failed",
365
logger.info(u"Checker for %(name)s failed",
477
self.last_checker_status = -1
478
logger.warning("Checker for %(name)s crashed?",
368
logger.warning(u"Checker for %(name)s crashed?",
481
def checked_ok(self, timeout=None):
371
def checked_ok(self):
482
372
"""Bump up the timeout for this client.
484
374
This should only be called when the client has been seen,
488
timeout = self.timeout
489
377
self.last_checked_ok = datetime.datetime.utcnow()
490
if self.disable_initiator_tag is not None:
491
gobject.source_remove(self.disable_initiator_tag)
492
if getattr(self, "enabled", False):
493
self.disable_initiator_tag = (gobject.timeout_add
494
(_timedelta_to_milliseconds
495
(timeout), self.disable))
496
self.expires = datetime.datetime.utcnow() + timeout
498
def need_approval(self):
499
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(),
501
383
def start_checker(self):
502
384
"""Start a new checker subprocess if one is not running.
578
453
if self.checker_callback_tag:
579
454
gobject.source_remove(self.checker_callback_tag)
580
455
self.checker_callback_tag = None
581
if getattr(self, "checker", None) is None:
456
if getattr(self, u"checker", None) is None:
583
logger.debug("Stopping checker for %(name)s", vars(self))
458
logger.debug(u"Stopping checker for %(name)s", vars(self))
585
460
os.kill(self.checker.pid, signal.SIGTERM)
587
462
#if self.checker.poll() is None:
588
463
# os.kill(self.checker.pid, signal.SIGKILL)
589
except OSError as error:
464
except OSError, error:
590
465
if error.errno != errno.ESRCH: # No such process
592
467
self.checker = None
594
# Encrypts a client secret and stores it in a varible encrypted_secret
595
def encrypt_secret(self, key):
596
# Encryption-key need to be of a specific size, so we hash inputed key
597
hasheng = hashlib.sha256()
599
encryptionkey = hasheng.digest()
601
# Create validation hash so we know at decryption if it was sucessful
602
hasheng = hashlib.sha256()
603
hasheng.update(self.secret)
604
validationhash = hasheng.digest()
607
iv = os.urandom(Crypto.Cipher.AES.block_size)
608
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
609
Crypto.Cipher.AES.MODE_CFB, iv)
610
ciphertext = ciphereng.encrypt(validationhash+self.secret)
611
self.encrypted_secret = (ciphertext, iv)
613
# Decrypt a encrypted client secret
614
def decrypt_secret(self, key):
615
# Decryption-key need to be of a specific size, so we hash inputed key
616
hasheng = hashlib.sha256()
618
encryptionkey = hasheng.digest()
620
# Decrypt encrypted secret
621
ciphertext, iv = self.encrypted_secret
622
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
623
Crypto.Cipher.AES.MODE_CFB, iv)
624
plain = ciphereng.decrypt(ciphertext)
626
# Validate decrypted secret to know if it was succesful
627
hasheng = hashlib.sha256()
628
validationhash = plain[:hasheng.digest_size]
629
secret = plain[hasheng.digest_size:]
630
hasheng.update(secret)
632
# if validation fails, we use key as new secret. Otherwhise, we use
633
# the decrypted secret
634
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)
638
del self.encrypted_secret
641
def dbus_service_property(dbus_interface, signature="v",
642
access="readwrite", byte_arrays=False):
643
"""Decorators for marking methods of a DBusObjectWithProperties to
644
become properties on the D-Bus.
646
The decorated method will be called with no arguments by "Get"
647
and with one argument by "Set".
649
The parameters, where they are supported, are the same as
650
dbus.service.method, except there is only "signature", since the
651
type from Get() and the type sent to Set() is the same.
653
# Encoding deeply encoded byte arrays is not supported yet by the
654
# "Set" method, so we fail early here:
655
if byte_arrays and signature != "ay":
656
raise ValueError("Byte arrays not supported for non-'ay'"
657
" signature %r" % signature)
659
func._dbus_is_property = True
660
func._dbus_interface = dbus_interface
661
func._dbus_signature = signature
662
func._dbus_access = access
663
func._dbus_name = func.__name__
664
if func._dbus_name.endswith("_dbus_property"):
665
func._dbus_name = func._dbus_name[:-14]
666
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
671
class DBusPropertyException(dbus.exceptions.DBusException):
672
"""A base class for D-Bus property-related exceptions
674
def __unicode__(self):
675
return unicode(str(self))
678
class DBusPropertyAccessException(DBusPropertyException):
679
"""A property's access permissions disallows an operation.
684
class DBusPropertyNotFound(DBusPropertyException):
685
"""An attempt was made to access a non-existing property.
690
class DBusObjectWithProperties(dbus.service.Object):
691
"""A D-Bus object with properties.
693
Classes inheriting from this can use the dbus_service_property
694
decorator to expose methods as D-Bus properties. It exposes the
695
standard Get(), Set(), and GetAll() methods on the D-Bus.
699
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
702
def _get_all_dbus_properties(self):
703
"""Returns a generator of (name, attribute) pairs
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
706
for cls in self.__class__.__mro__
708
inspect.getmembers(cls, self._is_dbus_property))
710
def _get_dbus_property(self, interface_name, property_name):
711
"""Returns a bound method if one exists which is a D-Bus
712
property with the specified name and interface.
714
for cls in self.__class__.__mro__:
715
for name, value in (inspect.getmembers
716
(cls, self._is_dbus_property)):
717
if (value._dbus_name == property_name
718
and value._dbus_interface == interface_name):
719
return value.__get__(self)
722
raise DBusPropertyNotFound(self.dbus_object_path + ":"
723
+ interface_name + "."
726
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
728
def Get(self, interface_name, property_name):
729
"""Standard D-Bus property Get() method, see D-Bus standard.
731
prop = self._get_dbus_property(interface_name, property_name)
732
if prop._dbus_access == "write":
733
raise DBusPropertyAccessException(property_name)
735
if not hasattr(value, "variant_level"):
737
return type(value)(value, variant_level=value.variant_level+1)
739
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
740
def Set(self, interface_name, property_name, value):
741
"""Standard D-Bus property Set() method, see D-Bus standard.
743
prop = self._get_dbus_property(interface_name, property_name)
744
if prop._dbus_access == "read":
745
raise DBusPropertyAccessException(property_name)
746
if prop._dbus_get_args_options["byte_arrays"]:
747
# The byte_arrays option is not supported yet on
748
# signatures other than "ay".
749
if prop._dbus_signature != "ay":
751
value = dbus.ByteArray(''.join(unichr(byte)
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
756
out_signature="a{sv}")
757
def GetAll(self, interface_name):
758
"""Standard D-Bus property GetAll() method, see D-Bus
761
Note: Will not include properties with access="write".
764
for name, prop in self._get_all_dbus_properties():
766
and interface_name != prop._dbus_interface):
767
# Interface non-empty but did not match
769
# Ignore write-only properties
770
if prop._dbus_access == "write":
773
if not hasattr(value, "variant_level"):
776
all[name] = type(value)(value, variant_level=
777
value.variant_level+1)
778
return dbus.Dictionary(all, signature="sv")
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
782
path_keyword='object_path',
783
connection_keyword='connection')
784
def Introspect(self, object_path, connection):
785
"""Standard D-Bus method, overloaded to insert property tags.
787
xmlstring = dbus.service.Object.Introspect(self, object_path,
790
document = xml.dom.minidom.parseString(xmlstring)
791
def make_tag(document, name, prop):
792
e = document.createElement("property")
793
e.setAttribute("name", name)
794
e.setAttribute("type", prop._dbus_signature)
795
e.setAttribute("access", prop._dbus_access)
797
for if_tag in document.getElementsByTagName("interface"):
798
for tag in (make_tag(document, name, prop)
800
in self._get_all_dbus_properties()
801
if prop._dbus_interface
802
== if_tag.getAttribute("name")):
803
if_tag.appendChild(tag)
804
# Add the names to the return values for the
805
# "org.freedesktop.DBus.Properties" methods
806
if (if_tag.getAttribute("name")
807
== "org.freedesktop.DBus.Properties"):
808
for cn in if_tag.getElementsByTagName("method"):
809
if cn.getAttribute("name") == "Get":
810
for arg in cn.getElementsByTagName("arg"):
811
if (arg.getAttribute("direction")
813
arg.setAttribute("name", "value")
814
elif cn.getAttribute("name") == "GetAll":
815
for arg in cn.getElementsByTagName("arg"):
816
if (arg.getAttribute("direction")
818
arg.setAttribute("name", "props")
819
xmlstring = document.toxml("utf-8")
821
except (AttributeError, xml.dom.DOMException,
822
xml.parsers.expat.ExpatError) as error:
823
logger.error("Failed to override Introspection method",
828
def datetime_to_dbus (dt, variant_level=0):
829
"""Convert a UTC datetime.datetime() to a D-Bus type."""
831
return dbus.String("", variant_level = variant_level)
832
return dbus.String(dt.isoformat(),
833
variant_level=variant_level)
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
837
"""Applied to an empty subclass of a D-Bus object, this metaclass
838
will add additional D-Bus attributes matching a certain pattern.
840
def __new__(mcs, name, bases, attr):
841
# Go through all the base classes which could have D-Bus
842
# methods, signals, or properties in them
843
for base in (b for b in bases
844
if issubclass(b, dbus.service.Object)):
845
# Go though all attributes of the base class
846
for attrname, attribute in inspect.getmembers(base):
847
# Ignore non-D-Bus attributes, and D-Bus attributes
848
# with the wrong interface name
849
if (not hasattr(attribute, "_dbus_interface")
850
or not attribute._dbus_interface
851
.startswith("se.recompile.Mandos")):
853
# Create an alternate D-Bus interface name based on
855
alt_interface = (attribute._dbus_interface
856
.replace("se.recompile.Mandos",
857
"se.bsnet.fukt.Mandos"))
858
# Is this a D-Bus signal?
859
if getattr(attribute, "_dbus_is_signal", False):
860
# Extract the original non-method function by
862
nonmethod_func = (dict(
863
zip(attribute.func_code.co_freevars,
864
attribute.__closure__))["func"]
866
# Create a new, but exactly alike, function
867
# object, and decorate it to be a new D-Bus signal
868
# with the alternate D-Bus interface name
869
new_function = (dbus.service.signal
871
attribute._dbus_signature)
873
nonmethod_func.func_code,
874
nonmethod_func.func_globals,
875
nonmethod_func.func_name,
876
nonmethod_func.func_defaults,
877
nonmethod_func.func_closure)))
878
# Define a creator of a function to call both the
879
# old and new functions, so both the old and new
880
# signals gets sent when the function is called
881
def fixscope(func1, func2):
882
"""This function is a scope container to pass
883
func1 and func2 to the "call_both" function
884
outside of its arguments"""
885
def call_both(*args, **kwargs):
886
"""This function will emit two D-Bus
887
signals by calling func1 and func2"""
888
func1(*args, **kwargs)
889
func2(*args, **kwargs)
891
# Create the "call_both" function and add it to
893
attr[attrname] = fixscope(attribute,
895
# Is this a D-Bus method?
896
elif getattr(attribute, "_dbus_is_method", False):
897
# Create a new, but exactly alike, function
898
# object. Decorate it to be a new D-Bus method
899
# with the alternate D-Bus interface name. Add it
901
attr[attrname] = (dbus.service.method
903
attribute._dbus_in_signature,
904
attribute._dbus_out_signature)
906
(attribute.func_code,
907
attribute.func_globals,
909
attribute.func_defaults,
910
attribute.func_closure)))
911
# Is this a D-Bus property?
912
elif getattr(attribute, "_dbus_is_property", False):
913
# Create a new, but exactly alike, function
914
# object, and decorate it to be a new D-Bus
915
# property with the alternate D-Bus interface
916
# name. Add it to the class.
917
attr[attrname] = (dbus_service_property
919
attribute._dbus_signature,
920
attribute._dbus_access,
922
._dbus_get_args_options
925
(attribute.func_code,
926
attribute.func_globals,
928
attribute.func_defaults,
929
attribute.func_closure)))
930
return type.__new__(mcs, name, bases, attr)
932
class ClientDBus(Client, DBusObjectWithProperties):
477
return now < (self.last_checked_ok + self.timeout)
480
class ClientDBus(Client, dbus.service.Object):
933
481
"""A Client class using D-Bus
936
484
dbus_object_path: dbus.ObjectPath
937
485
bus: dbus.SystemBus()
940
runtime_expansions = (Client.runtime_expansions
941
+ ("dbus_object_path",))
943
487
# dbus.service.Object doesn't use super(), so we can't either.
945
489
def __init__(self, bus = None, *args, **kwargs):
947
491
Client.__init__(self, *args, **kwargs)
949
self._approvals_pending = 0
950
492
# Only now, when this client is initialized, can it show up on
952
client_object_name = unicode(self.name).translate(
955
494
self.dbus_object_path = (dbus.ObjectPath
956
("/clients/" + client_object_name))
957
DBusObjectWithProperties.__init__(self, self.bus,
958
self.dbus_object_path)
960
def notifychangeproperty(transform_func,
961
dbus_name, type_func=lambda x: x,
963
""" Modify a variable so that it's a property which announces
966
transform_fun: Function that takes a value and a variant_level
967
and transforms it to a D-Bus type.
968
dbus_name: D-Bus name of the variable
969
type_func: Function that transform the value before sending it
970
to the D-Bus. Default: no transform
971
variant_level: D-Bus variant level. Default: 1
973
attrname = "_{0}".format(dbus_name)
974
def setter(self, value):
975
if hasattr(self, "dbus_object_path"):
976
if (not hasattr(self, attrname) or
977
type_func(getattr(self, attrname, None))
978
!= type_func(value)):
979
dbus_value = transform_func(type_func(value),
982
self.PropertyChanged(dbus.String(dbus_name),
984
setattr(self, attrname, value)
986
return property(lambda self: getattr(self, attrname), setter)
989
expires = notifychangeproperty(datetime_to_dbus, "Expires")
990
approvals_pending = notifychangeproperty(dbus.Boolean,
993
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
994
last_enabled = notifychangeproperty(datetime_to_dbus,
996
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
997
type_func = lambda checker:
999
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1001
last_approval_request = notifychangeproperty(
1002
datetime_to_dbus, "LastApprovalRequest")
1003
approved_by_default = notifychangeproperty(dbus.Boolean,
1004
"ApprovedByDefault")
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1008
_timedelta_to_milliseconds)
1009
approval_duration = notifychangeproperty(
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
1012
host = notifychangeproperty(dbus.String, "Host")
1013
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1015
_timedelta_to_milliseconds)
1016
extended_timeout = notifychangeproperty(
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1022
_timedelta_to_milliseconds)
1023
checker_command = notifychangeproperty(dbus.String, "Checker")
1025
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))
1027
528
def __del__(self, *args, **kwargs):
1029
530
self.remove_from_connection()
1030
531
except LookupError:
1032
if hasattr(DBusObjectWithProperties, "__del__"):
1033
DBusObjectWithProperties.__del__(self, *args, **kwargs)
533
if hasattr(dbus.service.Object, u"__del__"):
534
dbus.service.Object.__del__(self, *args, **kwargs)
1034
535
Client.__del__(self, *args, **kwargs)
1036
537
def checker_callback(self, pid, condition, command,
1037
538
*args, **kwargs):
1038
539
self.checker_callback_tag = None
1039
540
self.checker = None
542
self.PropertyChanged(dbus.String(u"checker_running"),
543
dbus.Boolean(False, variant_level=1))
1040
544
if os.WIFEXITED(condition):
1041
545
exitstatus = os.WEXITSTATUS(condition)
1042
546
# Emit D-Bus signal
1064
577
and old_checker_pid != self.checker.pid):
1065
578
# Emit D-Bus signal
1066
579
self.CheckerStarted(self.current_checker_command)
1069
def _reset_approved(self):
1070
self._approved = None
1073
def approve(self, value=True):
1074
self.send_changedstate()
1075
self._approved = value
1076
gobject.timeout_add(_timedelta_to_milliseconds
1077
(self.approval_duration),
1078
self._reset_approved)
1081
## D-Bus methods, signals & properties
1082
_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()
1086
602
# CheckerCompleted - signal
1087
@dbus.service.signal(_interface, signature="nxs")
603
@dbus.service.signal(_interface, signature=u"nxs")
1088
604
def CheckerCompleted(self, exitcode, waitstatus, command):
1092
608
# CheckerStarted - signal
1093
@dbus.service.signal(_interface, signature="s")
609
@dbus.service.signal(_interface, signature=u"s")
1094
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()
1098
662
# PropertyChanged - signal
1099
@dbus.service.signal(_interface, signature="sv")
663
@dbus.service.signal(_interface, signature=u"sv")
1100
664
def PropertyChanged(self, property, value):
1104
# GotSecret - signal
668
# ReceivedSecret - signal
1105
669
@dbus.service.signal(_interface)
1106
def GotSecret(self):
1108
Is sent after a successful transfer of secret from the Mandos
1109
server to mandos-client
670
def ReceivedSecret(self):
1113
674
# Rejected - signal
1114
@dbus.service.signal(_interface, signature="s")
1115
def Rejected(self, reason):
1119
# NeedApproval - signal
1120
@dbus.service.signal(_interface, signature="tb")
1121
def NeedApproval(self, timeout, default):
1123
return self.need_approval()
1125
# NeRwequest - signal
1126
@dbus.service.signal(_interface, signature="s")
1127
def NewRequest(self, ip):
1129
Is sent after a client request a password.
1136
@dbus.service.method(_interface, in_signature="b")
1137
def Approve(self, value):
1140
# CheckedOK - method
1141
@dbus.service.method(_interface)
1142
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(),
1145
724
# Enable - method
1146
725
@dbus.service.method(_interface)
1165
744
def StopChecker(self):
1166
745
self.stop_checker()
1170
# ApprovalPending - property
1171
@dbus_service_property(_interface, signature="b", access="read")
1172
def ApprovalPending_dbus_property(self):
1173
return dbus.Boolean(bool(self.approvals_pending))
1175
# ApprovedByDefault - property
1176
@dbus_service_property(_interface, signature="b",
1178
def ApprovedByDefault_dbus_property(self, value=None):
1179
if value is None: # get
1180
return dbus.Boolean(self.approved_by_default)
1181
self.approved_by_default = bool(value)
1183
# ApprovalDelay - property
1184
@dbus_service_property(_interface, signature="t",
1186
def ApprovalDelay_dbus_property(self, value=None):
1187
if value is None: # get
1188
return dbus.UInt64(self.approval_delay_milliseconds())
1189
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1191
# ApprovalDuration - property
1192
@dbus_service_property(_interface, signature="t",
1194
def ApprovalDuration_dbus_property(self, value=None):
1195
if value is None: # get
1196
return dbus.UInt64(_timedelta_to_milliseconds(
1197
self.approval_duration))
1198
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1201
@dbus_service_property(_interface, signature="s", access="read")
1202
def Name_dbus_property(self):
1203
return dbus.String(self.name)
1205
# Fingerprint - property
1206
@dbus_service_property(_interface, signature="s", access="read")
1207
def Fingerprint_dbus_property(self):
1208
return dbus.String(self.fingerprint)
1211
@dbus_service_property(_interface, signature="s",
1213
def Host_dbus_property(self, value=None):
1214
if value is None: # get
1215
return dbus.String(self.host)
1218
# Created - property
1219
@dbus_service_property(_interface, signature="s", access="read")
1220
def Created_dbus_property(self):
1221
return dbus.String(datetime_to_dbus(self.created))
1223
# LastEnabled - property
1224
@dbus_service_property(_interface, signature="s", access="read")
1225
def LastEnabled_dbus_property(self):
1226
return datetime_to_dbus(self.last_enabled)
1228
# Enabled - property
1229
@dbus_service_property(_interface, signature="b",
1231
def Enabled_dbus_property(self, value=None):
1232
if value is None: # get
1233
return dbus.Boolean(self.enabled)
1239
# LastCheckedOK - property
1240
@dbus_service_property(_interface, signature="s",
1242
def LastCheckedOK_dbus_property(self, value=None):
1243
if value is not None:
1246
return datetime_to_dbus(self.last_checked_ok)
1248
# Expires - property
1249
@dbus_service_property(_interface, signature="s", access="read")
1250
def Expires_dbus_property(self):
1251
return datetime_to_dbus(self.expires)
1253
# LastApprovalRequest - property
1254
@dbus_service_property(_interface, signature="s", access="read")
1255
def LastApprovalRequest_dbus_property(self):
1256
return datetime_to_dbus(self.last_approval_request)
1258
# Timeout - property
1259
@dbus_service_property(_interface, signature="t",
1261
def Timeout_dbus_property(self, value=None):
1262
if value is None: # get
1263
return dbus.UInt64(self.timeout_milliseconds())
1264
self.timeout = datetime.timedelta(0, 0, 0, value)
1265
if getattr(self, "disable_initiator_tag", None) is None:
1267
# Reschedule timeout
1268
gobject.source_remove(self.disable_initiator_tag)
1269
self.disable_initiator_tag = None
1271
time_to_die = _timedelta_to_milliseconds((self
1276
if time_to_die <= 0:
1277
# The timeout has passed
1280
self.expires = (datetime.datetime.utcnow()
1281
+ datetime.timedelta(milliseconds =
1283
self.disable_initiator_tag = (gobject.timeout_add
1284
(time_to_die, self.disable))
1286
# ExtendedTimeout - property
1287
@dbus_service_property(_interface, signature="t",
1289
def ExtendedTimeout_dbus_property(self, value=None):
1290
if value is None: # get
1291
return dbus.UInt64(self.extended_timeout_milliseconds())
1292
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1294
# Interval - property
1295
@dbus_service_property(_interface, signature="t",
1297
def Interval_dbus_property(self, value=None):
1298
if value is None: # get
1299
return dbus.UInt64(self.interval_milliseconds())
1300
self.interval = datetime.timedelta(0, 0, 0, value)
1301
if getattr(self, "checker_initiator_tag", None) is None:
1303
# Reschedule checker run
1304
gobject.source_remove(self.checker_initiator_tag)
1305
self.checker_initiator_tag = (gobject.timeout_add
1306
(value, self.start_checker))
1307
self.start_checker() # Start one now, too
1309
# Checker - property
1310
@dbus_service_property(_interface, signature="s",
1312
def Checker_dbus_property(self, value=None):
1313
if value is None: # get
1314
return dbus.String(self.checker_command)
1315
self.checker_command = value
1317
# CheckerRunning - property
1318
@dbus_service_property(_interface, signature="b",
1320
def CheckerRunning_dbus_property(self, value=None):
1321
if value is None: # get
1322
return dbus.Boolean(self.checker is not None)
1324
self.start_checker()
1328
# ObjectPath - property
1329
@dbus_service_property(_interface, signature="o", access="read")
1330
def ObjectPath_dbus_property(self):
1331
return self.dbus_object_path # is already a dbus.ObjectPath
1334
@dbus_service_property(_interface, signature="ay",
1335
access="write", byte_arrays=True)
1336
def Secret_dbus_property(self, value):
1337
self.secret = str(value)
1342
class ProxyClient(object):
1343
def __init__(self, child_pipe, fpr, address):
1344
self._pipe = child_pipe
1345
self._pipe.send(('init', fpr, address))
1346
if not self._pipe.recv():
1349
def __getattribute__(self, name):
1350
if(name == '_pipe'):
1351
return super(ProxyClient, self).__getattribute__(name)
1352
self._pipe.send(('getattr', name))
1353
data = self._pipe.recv()
1354
if data[0] == 'data':
1356
if data[0] == 'function':
1357
def func(*args, **kwargs):
1358
self._pipe.send(('funcall', name, args, kwargs))
1359
return self._pipe.recv()[1]
1362
def __setattr__(self, name, value):
1363
if(name == '_pipe'):
1364
return super(ProxyClient, self).__setattr__(name, value)
1365
self._pipe.send(('setattr', name, value))
1367
class ClientDBusTransitional(ClientDBus):
1368
__metaclass__ = AlternateDBusNamesMetaclass
1370
750
class ClientHandler(socketserver.BaseRequestHandler, object):
1371
751
"""A class to handle client connections.
1374
754
Note: This will run in its own forked process."""
1376
756
def handle(self):
1377
with contextlib.closing(self.server.child_pipe) as child_pipe:
1378
logger.info("TCP connection from: %s",
1379
unicode(self.client_address))
1380
logger.debug("Pipe FD: %d",
1381
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:
1383
762
session = (gnutls.connection
1384
763
.ClientSession(self.request,
1385
764
gnutls.connection
1386
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)
1388
776
# Note: gnutls.connection.X509Credentials is really a
1389
777
# generic GnuTLS certificate credentials object so long as
1390
778
# no X.509 keys are added to it. Therefore, we can use it
1391
779
# here despite using OpenPGP certificates.
1393
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1394
# "+AES-256-CBC", "+SHA1",
1395
# "+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",
1397
785
# Use a fallback default, since this MUST be set.
1398
786
priority = self.server.gnutls_priority
1399
787
if priority is None:
1401
789
(gnutls.library.functions
1402
790
.gnutls_priority_set_direct(session._c_object,
1403
791
priority, None))
1405
# Start communication using the Mandos protocol
1406
# Get protocol number
1407
line = self.request.makefile().readline()
1408
logger.debug("Protocol version: %r", line)
1410
if int(line.strip().split()[0]) > 1:
1412
except (ValueError, IndexError, RuntimeError) as error:
1413
logger.error("Unknown protocol version: %s", error)
1416
# Start GnuTLS connection
1418
794
session.handshake()
1419
except gnutls.errors.GNUTLSError as error:
1420
logger.warning("Handshake failed: %s", error)
795
except gnutls.errors.GNUTLSError, error:
796
logger.warning(u"Handshake failed: %s", error)
1421
797
# Do not run session.bye() here: the session is not
1422
798
# established. Just abandon the request.
1424
logger.debug("Handshake succeeded")
1426
approval_required = False
800
logger.debug(u"Handshake succeeded")
1429
fpr = self.fingerprint(self.peer_certificate
1432
gnutls.errors.GNUTLSError) as error:
1433
logger.warning("Bad certificate: %s", error)
1435
logger.debug("Fingerprint: %s", fpr)
1436
if self.server.use_dbus:
1438
client.NewRequest(str(self.client_address))
1441
client = ProxyClient(child_pipe, fpr,
1442
self.client_address)
1446
if client.approval_delay:
1447
delay = client.approval_delay
1448
client.approvals_pending += 1
1449
approval_required = True
1452
if not client.enabled:
1453
logger.info("Client %s is disabled",
1455
if self.server.use_dbus:
1457
client.Rejected("Disabled")
1460
if client._approved or not client.approval_delay:
1461
#We are approved or approval is disabled
1463
elif client._approved is None:
1464
logger.info("Client %s needs approval",
1466
if self.server.use_dbus:
1468
client.NeedApproval(
1469
client.approval_delay_milliseconds(),
1470
client.approved_by_default)
1472
logger.warning("Client %s was not approved",
1474
if self.server.use_dbus:
1476
client.Rejected("Denied")
1479
#wait until timeout or approved
1480
time = datetime.datetime.now()
1481
client.changedstate.acquire()
1482
(client.changedstate.wait
1483
(float(client._timedelta_to_milliseconds(delay)
1485
client.changedstate.release()
1486
time2 = datetime.datetime.now()
1487
if (time2 - time) >= delay:
1488
if not client.approved_by_default:
1489
logger.warning("Client %s timed out while"
1490
" waiting for approval",
1492
if self.server.use_dbus:
1494
client.Rejected("Approval timed out")
1499
delay -= time2 - time
1502
while sent_size < len(client.secret):
1504
sent = session.send(client.secret[sent_size:])
1505
except gnutls.errors.GNUTLSError as error:
1506
logger.warning("gnutls send failed")
1508
logger.debug("Sent: %d, remaining: %d",
1509
sent, len(client.secret)
1510
- (sent_size + sent))
1513
logger.info("Sending secret to %s", client.name)
1514
# bump the timeout using extended_timeout
1515
client.checked_ok(client.extended_timeout)
1516
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)
1521
if approval_required:
1522
client.approvals_pending -= 1
1525
except gnutls.errors.GNUTLSError as error:
1526
logger.warning("GnuTLS bye failed")
809
for c in self.server.clients:
810
if c.fingerprint == fpr:
814
ipc.write(u"NOTFOUND %s %s\n"
815
% (fpr, unicode(self.client_address)))
818
# Have to check if client.still_valid(), since it is
819
# possible that the client timed out while establishing
820
# the GnuTLS session.
821
if not client.still_valid():
822
ipc.write(u"INVALID %s\n" % client.name)
825
ipc.write(u"SENDING %s\n" % client.name)
827
while sent_size < len(client.secret):
828
sent = session.send(client.secret[sent_size:])
829
logger.debug(u"Sent: %d, remaining: %d",
830
sent, len(client.secret)
831
- (sent_size + sent))
1529
836
def peer_certificate(session):
1902
##################################################################
1175
######################################################################
1903
1176
# Parsing of options, both command line and config file
1905
parser = argparse.ArgumentParser()
1906
parser.add_argument("-v", "--version", action="version",
1907
version = "%%(prog)s %s" % version,
1908
help="show version number and exit")
1909
parser.add_argument("-i", "--interface", metavar="IF",
1910
help="Bind to interface IF")
1911
parser.add_argument("-a", "--address",
1912
help="Address to listen for requests on")
1913
parser.add_argument("-p", "--port", type=int,
1914
help="Port number to receive requests on")
1915
parser.add_argument("--check", action="store_true",
1916
help="Run self-test")
1917
parser.add_argument("--debug", action="store_true",
1918
help="Debug mode; run in foreground and log"
1920
parser.add_argument("--debuglevel", metavar="LEVEL",
1921
help="Debug level for stdout output")
1922
parser.add_argument("--priority", help="GnuTLS"
1923
" priority string (see GnuTLS documentation)")
1924
parser.add_argument("--servicename",
1925
metavar="NAME", help="Zeroconf service name")
1926
parser.add_argument("--configdir",
1927
default="/etc/mandos", metavar="DIR",
1928
help="Directory to search for configuration"
1930
parser.add_argument("--no-dbus", action="store_false",
1931
dest="use_dbus", help="Do not provide D-Bus"
1932
" system bus interface")
1933
parser.add_argument("--no-ipv6", action="store_false",
1934
dest="use_ipv6", help="Do not use IPv6")
1935
parser.add_argument("--no-restore", action="store_false",
1936
dest="restore", help="Do not restore stored state",
1939
options = parser.parse_args()
1178
parser = optparse.OptionParser(version = "%%prog %s" % version)
1179
parser.add_option("-i", u"--interface", type=u"string",
1180
metavar="IF", help=u"Bind to interface IF")
1181
parser.add_option("-a", u"--address", type=u"string",
1182
help=u"Address to listen for requests on")
1183
parser.add_option("-p", u"--port", type=u"int",
1184
help=u"Port number to receive requests on")
1185
parser.add_option("--check", action=u"store_true",
1186
help=u"Run self-test")
1187
parser.add_option("--debug", action=u"store_true",
1188
help=u"Debug mode; run in foreground and log to"
1190
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1191
u" priority string (see GnuTLS documentation)")
1192
parser.add_option("--servicename", type=u"string",
1193
metavar=u"NAME", help=u"Zeroconf service name")
1194
parser.add_option("--configdir", type=u"string",
1195
default=u"/etc/mandos", metavar=u"DIR",
1196
help=u"Directory to search for configuration"
1198
parser.add_option("--no-dbus", action=u"store_false",
1199
dest=u"use_dbus", help=u"Do not provide D-Bus"
1200
u" system bus interface")
1201
parser.add_option("--no-ipv6", action=u"store_false",
1202
dest=u"use_ipv6", help=u"Do not use IPv6")
1203
options = parser.parse_args()[0]
1941
1205
if options.check:
1990
1253
##################################################################
1992
1255
# For convenience
1993
debug = server_settings["debug"]
1994
debuglevel = server_settings["debuglevel"]
1995
use_dbus = server_settings["use_dbus"]
1996
use_ipv6 = server_settings["use_ipv6"]
1998
if server_settings["servicename"] != "Mandos":
1256
debug = server_settings[u"debug"]
1257
use_dbus = server_settings[u"use_dbus"]
1258
use_ipv6 = server_settings[u"use_ipv6"]
1261
syslogger.setLevel(logging.WARNING)
1262
console.setLevel(logging.WARNING)
1264
if server_settings[u"servicename"] != u"Mandos":
1999
1265
syslogger.setFormatter(logging.Formatter
2000
('Mandos (%s) [%%(process)d]:'
2001
' %%(levelname)s: %%(message)s'
2002
% server_settings["servicename"]))
1266
(u'Mandos (%s) [%%(process)d]:'
1267
u' %%(levelname)s: %%(message)s'
1268
% server_settings[u"servicename"]))
2004
1270
# Parse config file with clients
2005
client_defaults = { "timeout": "5m",
2006
"extended_timeout": "15m",
2008
"checker": "fping -q -- %%(host)s",
2010
"approval_delay": "0s",
2011
"approval_duration": "1s",
1271
client_defaults = { u"timeout": u"1h",
1273
u"checker": u"fping -q -- %%(host)s",
2013
1276
client_config = configparser.SafeConfigParser(client_defaults)
2014
client_config.read(os.path.join(server_settings["configdir"],
1277
client_config.read(os.path.join(server_settings[u"configdir"],
2017
1280
global mandos_dbus_service
2018
1281
mandos_dbus_service = None
2020
tcp_server = MandosServer((server_settings["address"],
2021
server_settings["port"]),
1283
tcp_server = MandosServer((server_settings[u"address"],
1284
server_settings[u"port"]),
2023
interface=(server_settings["interface"]
1286
interface=server_settings[u"interface"],
2025
1287
use_ipv6=use_ipv6,
2026
1288
gnutls_priority=
2027
server_settings["priority"],
1289
server_settings[u"priority"],
2028
1290
use_dbus=use_dbus)
2030
pidfilename = "/var/run/mandos.pid"
2032
pidfile = open(pidfilename, "w")
2034
logger.error("Could not open file %r", pidfilename)
1291
pidfilename = u"/var/run/mandos.pid"
1293
pidfile = open(pidfilename, u"w")
1295
logger.error(u"Could not open file %r", pidfilename)
2037
uid = pwd.getpwnam("_mandos").pw_uid
2038
gid = pwd.getpwnam("_mandos").pw_gid
1298
uid = pwd.getpwnam(u"_mandos").pw_uid
1299
gid = pwd.getpwnam(u"_mandos").pw_gid
2039
1300
except KeyError:
2041
uid = pwd.getpwnam("mandos").pw_uid
2042
gid = pwd.getpwnam("mandos").pw_gid
1302
uid = pwd.getpwnam(u"mandos").pw_uid
1303
gid = pwd.getpwnam(u"mandos").pw_gid
2043
1304
except KeyError:
2045
uid = pwd.getpwnam("nobody").pw_uid
2046
gid = pwd.getpwnam("nobody").pw_gid
1306
uid = pwd.getpwnam(u"nobody").pw_uid
1307
gid = pwd.getpwnam(u"nobody").pw_gid
2047
1308
except KeyError:
2053
except OSError as error:
1314
except OSError, error:
2054
1315
if error[0] != errno.EPERM:
2057
if not debug and not debuglevel:
2058
logger.setLevel(logging.WARNING)
2060
level = getattr(logging, debuglevel.upper())
2061
logger.setLevel(level)
1318
# Enable all possible GnuTLS debugging
2064
logger.setLevel(logging.DEBUG)
2065
# Enable all possible GnuTLS debugging
2067
1320
# "Use a log level over 10 to enable all debugging options."
2068
1321
# - GnuTLS manual
2069
1322
gnutls.library.functions.gnutls_global_set_log_level(11)
2071
1324
@gnutls.library.types.gnutls_log_func
2072
1325
def debug_gnutls(level, string):
2073
logger.debug("GnuTLS: %s", string[:-1])
1326
logger.debug(u"GnuTLS: %s", string[:-1])
2075
1328
(gnutls.library.functions
2076
1329
.gnutls_global_set_log_function(debug_gnutls))
2078
# Redirect stdin so all checkers get /dev/null
2079
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2080
os.dup2(null, sys.stdin.fileno())
2084
# No console logging
2085
logger.removeHandler(console)
2087
# Need to fork before connecting to D-Bus
2089
# Close all input and output, do double fork, etc.
2092
1331
global main_loop
2093
1332
# From the Avahi example code
2096
1335
bus = dbus.SystemBus()
2097
1336
# End of Avahi example code
2100
bus_name = dbus.service.BusName("se.recompile.Mandos",
2101
bus, do_not_queue=True)
2102
old_bus_name = (dbus.service.BusName
2103
("se.bsnet.fukt.Mandos", bus,
2105
except dbus.exceptions.NameExistsException as e:
2106
logger.error(unicode(e) + ", disabling D-Bus")
2108
server_settings["use_dbus"] = False
2109
tcp_server.use_dbus = False
1338
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
2110
1339
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2111
service = AvahiServiceToSyslog(name =
2112
server_settings["servicename"],
2113
servicetype = "_mandos._tcp",
2114
protocol = protocol, bus = bus)
1340
service = AvahiService(name = server_settings[u"servicename"],
1341
servicetype = u"_mandos._tcp",
1342
protocol = protocol, bus = bus)
2115
1343
if server_settings["interface"]:
2116
1344
service.interface = (if_nametoindex
2117
(str(server_settings["interface"])))
2119
global multiprocessing_manager
2120
multiprocessing_manager = multiprocessing.Manager()
1345
(str(server_settings[u"interface"])))
2122
1347
client_class = Client
2124
client_class = functools.partial(ClientDBusTransitional,
2127
special_settings = {
2128
# Some settings need to be accessd by special methods;
2129
# booleans need .getboolean(), etc. Here is a list of them:
2130
"approved_by_default":
2132
client_config.getboolean(section, "approved_by_default"),
2134
# Construct a new dict of client settings of this form:
2135
# { client_name: {setting_name: value, ...}, ...}
2136
# with exceptions for any special settings as defined above
2137
client_settings = dict((clientname,
2139
(value if setting not in special_settings
2140
else special_settings[setting](clientname)))
2141
for setting, value in client_config.items(clientname)))
2142
for clientname in client_config.sections())
2144
old_client_settings = {}
2147
# Get client data and settings from last running state.
2148
if server_settings["restore"]:
2150
with open(stored_state_path, "rb") as stored_state:
2151
clients_data, old_client_settings = pickle.load(stored_state)
2152
os.remove(stored_state_path)
2153
except IOError as e:
2154
logger.warning("Could not load persistant state: {0}".format(e))
2155
if e.errno != errno.ENOENT:
2158
for client in clients_data:
2159
client_name = client["name"]
2161
# Decide which value to use after restoring saved state.
2162
# We have three different values: Old config file,
2163
# new config file, and saved state.
2164
# New config value takes precedence if it differs from old
2165
# config value, otherwise use saved state.
2166
for name, value in client_settings[client_name].items():
2168
# For each value in new config, check if it differs
2169
# from the old config value (Except for the "secret"
2171
if name != "secret" and value != old_client_settings[client_name][name]:
2172
setattr(client, name, value)
2176
# Clients who has passed its expire date, can still be enabled if its
2177
# last checker was sucessful. Clients who checkers failed before we
2178
# stored it state is asumed to had failed checker during downtime.
2179
if client["enabled"] and client["last_checked_ok"]:
2180
if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2181
> client["interval"]):
2182
if client["last_checker_status"] != 0:
2183
client["enabled"] = False
2185
client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2187
client["changedstate"] = (multiprocessing_manager
2188
.Condition(multiprocessing_manager
2191
new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2192
tcp_server.clients[client_name] = new_client
2193
new_client.bus = bus
2194
for name, value in client.iteritems():
2195
setattr(new_client, name, value)
2196
client_object_name = unicode(client_name).translate(
2197
{ord("."): ord("_"),
2198
ord("-"): ord("_")})
2199
new_client.dbus_object_path = (dbus.ObjectPath
2200
("/clients/" + client_object_name))
2201
DBusObjectWithProperties.__init__(new_client,
2203
new_client.dbus_object_path)
2205
tcp_server.clients[client_name] = Client.__new__(Client)
2206
for name, value in client.iteritems():
2207
setattr(tcp_server.clients[client_name], name, value)
2209
tcp_server.clients[client_name].decrypt_secret(
2210
client_settings[client_name]["secret"])
2212
# Create/remove clients based on new changes made to config
2213
for clientname in set(old_client_settings) - set(client_settings):
2214
del tcp_server.clients[clientname]
2215
for clientname in set(client_settings) - set(old_client_settings):
2216
tcp_server.clients[clientname] = (client_class(name = clientname,
1349
client_class = functools.partial(ClientDBus, bus = bus)
1350
tcp_server.clients.update(set(
1351
client_class(name = section,
1352
config= dict(client_config.items(section)))
1353
for section in client_config.sections()))
2222
1354
if not tcp_server.clients:
2223
logger.warning("No clients defined")
1355
logger.warning(u"No clients defined")
1358
# Redirect stdin so all checkers get /dev/null
1359
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1360
os.dup2(null, sys.stdin.fileno())
1364
# No console logging
1365
logger.removeHandler(console)
1366
# Close all input and output, do double fork, etc.
1370
with closing(pidfile):
1372
pidfile.write(str(pid) + "\n")
1375
logger.error(u"Could not write to file %r with PID %d",
1378
# "pidfile" was never created
1383
"Cleanup function; run on exit"
1386
while tcp_server.clients:
1387
client = tcp_server.clients.pop()
1388
client.disable_hook = None
1391
atexit.register(cleanup)
2229
pidfile.write(str(pid) + "\n".encode("utf-8"))
2232
logger.error("Could not write to file %r with PID %d",
2235
# "pidfile" was never created
2239
1394
signal.signal(signal.SIGINT, signal.SIG_IGN)
2241
1395
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2242
1396
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2245
1399
class MandosDBusService(dbus.service.Object):
2246
1400
"""A D-Bus proxy object"""
2247
1401
def __init__(self):
2248
dbus.service.Object.__init__(self, bus, "/")
2249
_interface = "se.recompile.Mandos"
2251
@dbus.service.signal(_interface, signature="o")
2252
def ClientAdded(self, objpath):
2256
@dbus.service.signal(_interface, signature="ss")
2257
def ClientNotFound(self, fingerprint, address):
2261
@dbus.service.signal(_interface, signature="os")
1402
dbus.service.Object.__init__(self, bus, u"/")
1403
_interface = u"se.bsnet.fukt.Mandos"
1405
@dbus.service.signal(_interface, signature=u"oa{sv}")
1406
def ClientAdded(self, objpath, properties):
1410
@dbus.service.signal(_interface, signature=u"s")
1411
def ClientNotFound(self, fingerprint):
1415
@dbus.service.signal(_interface, signature=u"os")
2262
1416
def ClientRemoved(self, objpath, name):
2266
@dbus.service.method(_interface, out_signature="ao")
1420
@dbus.service.method(_interface, out_signature=u"ao")
2267
1421
def GetAllClients(self):
2269
1423
return dbus.Array(c.dbus_object_path
2271
tcp_server.clients.itervalues())
1424
for c in tcp_server.clients)
2273
1426
@dbus.service.method(_interface,
2274
out_signature="a{oa{sv}}")
1427
out_signature=u"a{oa{sv}}")
2275
1428
def GetAllClientsWithProperties(self):
2277
1430
return dbus.Dictionary(
2278
((c.dbus_object_path, c.GetAll(""))
2279
for c in tcp_server.clients.itervalues()),
1431
((c.dbus_object_path, c.GetAllProperties())
1432
for c in tcp_server.clients),
1433
signature=u"oa{sv}")
2282
@dbus.service.method(_interface, in_signature="o")
1435
@dbus.service.method(_interface, in_signature=u"o")
2283
1436
def RemoveClient(self, object_path):
2285
for c in tcp_server.clients.itervalues():
1438
for c in tcp_server.clients:
2286
1439
if c.dbus_object_path == object_path:
2287
del tcp_server.clients[c.name]
1440
tcp_server.clients.remove(c)
2288
1441
c.remove_from_connection()
2289
1442
# Don't signal anything except ClientRemoved
2290
c.disable(quiet=True)
1443
c.disable(signal=False)
2291
1444
# Emit D-Bus signal
2292
1445
self.ClientRemoved(object_path, c.name)
2294
raise KeyError(object_path)
2298
class MandosDBusServiceTransitional(MandosDBusService):
2299
__metaclass__ = AlternateDBusNamesMetaclass
2300
mandos_dbus_service = MandosDBusServiceTransitional()
2303
"Cleanup function; run on exit"
2306
multiprocessing.active_children()
2307
if not (tcp_server.clients or client_settings):
2310
# Store client before exiting. Secrets are encrypted with key based
2311
# on what config file has. If config file is removed/edited, old
2312
# secret will thus be unrecovable.
2314
for client in tcp_server.clients.itervalues():
2315
client.encrypt_secret(client_settings[client.name]["secret"])
2319
# A list of attributes that will not be stored when shuting down.
2320
exclude = set(("bus", "changedstate", "secret"))
2321
for name, typ in inspect.getmembers(dbus.service.Object):
2324
client_dict["encrypted_secret"] = client.encrypted_secret
2325
for attr in client.client_structure:
2326
if attr not in exclude:
2327
client_dict[attr] = getattr(client, attr)
2329
clients.append(client_dict)
2330
del client_settings[client.name]["secret"]
2333
with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2334
pickle.dump((clients, client_settings), stored_state)
2335
except IOError as e:
2336
logger.warning("Could not save persistant state: {0}".format(e))
2337
if e.errno != errno.ENOENT:
2340
# Delete all clients, and settings from config
2341
while tcp_server.clients:
2342
name, client = tcp_server.clients.popitem()
2344
client.remove_from_connection()
2345
# Don't signal anything except ClientRemoved
2346
client.disable(quiet=True)
2349
mandos_dbus_service.ClientRemoved(client
2352
client_settings.clear()
2354
atexit.register(cleanup)
2356
for client in tcp_server.clients.itervalues():
1451
mandos_dbus_service = MandosDBusService()
1453
for client in tcp_server.clients:
2358
1455
# Emit D-Bus signal
2359
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2360
# Need to initiate checking of clients
2362
client.init_checker()
1456
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1457
client.GetAllProperties())
2365
1460
tcp_server.enable()
2366
1461
tcp_server.server_activate()