Commit 19e60d2
Changed files (2)
lib
saml
lib/saml/kit/composite_metadata.rb.orig
@@ -1,51 +0,0 @@
-module Saml
- module Kit
- class CompositeMetadata < Metadata
- attr_reader :service_provider, :identity_provider
-
- def initialize(xml)
- super("IDPSSODescriptor", xml)
- @service_provider = Saml::Kit::ServiceProviderMetadata.new(xml)
- @identity_provider = Saml::Kit::IdentityProviderMetadata.new(xml)
- end
-
-<<<<<<< HEAD
- def single_sign_on_services
- identity_provider.single_sign_on_services
- end
-
- def single_sign_on_service_for(*args)
- identity_provider.single_sign_on_service_for(*args)
- end
-
- def assertion_consumer_services
- service_provider.assertion_consumer_services
- end
-
-=======
->>>>>>> 14771fc562487f9c80443197a89e776d256f47c2
- def services(type)
- xpath = "//md:EntityDescriptor/md:SPSSODescriptor/md:#{type}|//md:EntityDescriptor/md:IDPSSODescriptor/md:#{type}"
- document.find_all(xpath).map do |item|
- binding = item.attribute("Binding").value
- location = item.attribute("Location").value
- Saml::Kit::Bindings.create_for(binding, location)
- end
- end
-
- def certificates
- identity_provider.certificates + service_provider.certificates
- end
-
- def method_missing(name, *args)
- if identity_provider.respond_to?(name)
- identity_provider.public_send(name, *args)
- elsif service_provider.respond_to?(name)
- service_provider.public_send(name, *args)
- else
- super
- end
- end
- end
- end
-end
lib/saml/kit/signatures.rb
@@ -5,22 +5,23 @@ module Saml
def initialize(configuration:, sign: true)
@configuration = configuration
- @reference_ids = []
@sign = sign
end
def build(reference_id)
- @reference_ids << reference_id
XmlSignature.new(reference_id, configuration: configuration, sign: sign)
end
def complete(raw_xml)
return raw_xml unless sign
- @reference_ids.each do |reference_id|
- raw_xml = Xmldsig::SignedDocument.new(raw_xml).sign(configuration.signing_private_key)
- end
- raw_xml
+ Xmldsig::SignedDocument.new(raw_xml).sign(private_key)
+ end
+
+ private
+
+ def private_key
+ configuration.signing_private_key
end
end
end