Commit 492b32c
Changed files (5)
lib
lib/saml/kit/configuration.rb
@@ -6,20 +6,20 @@ module Saml
attr_accessor :issuer, :acs_url
attr_accessor :signature_method, :digest_method
- attr_accessor :certificate_pem, :private_key_pem, :private_key_password
+ attr_accessor :signing_certificate_pem, :signing_private_key_pem, :signing_private_key_password
def initialize
@signature_method = :SHA256
@digest_method = :SHA256
- @certificate_pem, @private_key_pem, @private_key_password = create_self_signed_certificate
+ @signing_certificate_pem, @signing_private_key_pem, @signing_private_key_password = create_self_signed_certificate
end
- def stripped_certificate
- certificate_pem.to_s.gsub(BEGIN_CERT, '').gsub(END_CERT, '').gsub(/\n/, '')
+ def stripped_signing_certificate
+ signing_certificate_pem.to_s.gsub(BEGIN_CERT, '').gsub(END_CERT, '').gsub(/\n/, '')
end
- def private_key
- OpenSSL::PKey::RSA.new(private_key_pem, private_key_password)
+ def signing_private_key
+ OpenSSL::PKey::RSA.new(signing_private_key_pem, signing_private_key_password)
end
private
lib/saml/kit/service_provider_metadata.rb
@@ -29,7 +29,7 @@ module Saml
xml.tag! "md:KeyDescriptor", use: "signing" do
xml.tag! "ds:KeyInfo", "xmlns:ds": Saml::Kit::Signature::XMLDSIG do
xml.tag! "ds:X509Data" do
- xml.tag! "ds:X509Certificate", @configuration.stripped_certificate
+ xml.tag! "ds:X509Certificate", @configuration.stripped_signing_certificate
end
end
end
lib/saml/kit/signature.rb
@@ -41,7 +41,7 @@ module Saml
xml.tag! "ds:SignatureValue", ""
xml.tag! "ds:KeyInfo" do
xml.tag! "ds:X509Data" do
- xml.tag! "ds:X509Certificate", configuration.stripped_certificate
+ xml.tag! "ds:X509Certificate", configuration.stripped_signing_certificate
end
end
end
@@ -49,7 +49,7 @@ module Saml
def finalize(xml)
document = Xmldsig::SignedDocument.new(xml.target!)
- document.sign(configuration.private_key)
+ document.sign(configuration.signing_private_key)
end
end
end
spec/saml/service_provider_metadata_spec.rb
@@ -37,7 +37,7 @@ RSpec.describe Saml::Kit::ServiceProviderMetadata do
expect(result['EntityDescriptor']['SPSSODescriptor']['AssertionConsumerService']['index']).to eql('0')
expect(result['EntityDescriptor']['Signature']).to be_present
expect(result['EntityDescriptor']['SPSSODescriptor']['KeyDescriptor']['use']).to eql("signing")
- expect(result['EntityDescriptor']['SPSSODescriptor']['KeyDescriptor']['KeyInfo']['X509Data']['X509Certificate']).to eql(Saml::Kit.configuration.stripped_certificate)
+ expect(result['EntityDescriptor']['SPSSODescriptor']['KeyDescriptor']['KeyInfo']['X509Data']['X509Certificate']).to eql(Saml::Kit.configuration.stripped_signing_certificate)
end
end
end
spec/saml/signature_spec.rb
@@ -4,9 +4,9 @@ RSpec.describe Saml::Kit::Signature do
subject { described_class.new(reference_id, configuration) }
let(:configuration) do
config = Saml::Kit::Configuration.new
- config.certificate_pem = certificate
- config.private_key_pem = private_key
- config.private_key_password = password
+ config.signing_certificate_pem = certificate
+ config.signing_private_key_pem = private_key
+ config.signing_private_key_password = password
config
end