Skip to content

Commit

Permalink
Merge pull request #422 from joshwetzel/boolean_req_attr
Browse files Browse the repository at this point in the history 
Use to_s for requested attribute value
  • Loading branch information
@pitbulk
pitbulk committed Nov 11, 2017
2 parents b3ac5bd + 2711b0f commit c6da73b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions lib/onelogin/ruby-saml/metadata.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ module OneLogin
module RubySaml

# SAML2 Metadata. XML Metadata Builder
#
#
class Metadata

# Return SP metadata based on the settings.
# @param settings [OneLogin::RubySaml::Settings|nil] Toolkit settings
# @param pretty_print [Boolean] Pretty print or not the response
# @param pretty_print [Boolean] Pretty print or not the response
# (No pretty print if you gonna validate the signature)
# @return [String] XML Metadata of the Service Provider
#
Expand Down Expand Up @@ -83,7 +83,7 @@ def generate(settings, pretty_print=false)
if settings.attribute_consuming_service.configured?
sp_acs = sp_sso.add_element "md:AttributeConsumingService", {
"isDefault" => "true",
"index" => settings.attribute_consuming_service.index
"index" => settings.attribute_consuming_service.index
}
srv_name = sp_acs.add_element "md:ServiceName", {
"xml:lang" => "en"
Expand All @@ -92,14 +92,14 @@ def generate(settings, pretty_print=false)
settings.attribute_consuming_service.attributes.each do |attribute|
sp_req_attr = sp_acs.add_element "md:RequestedAttribute", {
"NameFormat" => attribute[:name_format],
"Name" => attribute[:name],
"Name" => attribute[:name],
"FriendlyName" => attribute[:friendly_name],
"isRequired" => attribute[:is_required] || false
}
unless attribute[:attribute_value].nil?
Array(attribute[:attribute_value]).each do |value|
sp_attr_val = sp_req_attr.add_element "saml:AttributeValue"
sp_attr_val.text = value.to_str
sp_attr_val.text = value.to_s
end
end
end
Expand All @@ -121,7 +121,7 @@ def generate(settings, pretty_print=false)
# pretty print the XML so IdP administrators can easily see what the SP supports
if pretty_print
meta_doc.write(ret, 1)
else
else
ret = meta_doc.to_s
end

Expand Down
24 changes: 12 additions & 12 deletions test/metadata_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MetadataTest < Minitest::Test
assert_equal "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", REXML::XPath.first(xml_doc, "//md:NameIDFormat").text.strip

assert_equal "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST", acs.attribute("Binding").value
assert_equal "https://foo.example/saml/consume", acs.attribute("Location").value
assert_equal "https://foo.example/saml/consume", acs.attribute("Location").value

assert validate_xml!(xml_text, "saml-schema-metadata-2.0.xsd")
end
Expand Down Expand Up @@ -225,7 +225,7 @@ class MetadataTest < Minitest::Test
before do
settings.attribute_consuming_service.configure do
service_name "Test Service"
add_attribute(:name => "Name", :name_format => "Name Format", :friendly_name => "Friendly Name", :attribute_value => ["Attribute Value One", "Attribute Value Two"])
add_attribute(:name => 'Name', :name_format => 'Name Format', :friendly_name => 'Friendly Name', :attribute_value => ['Attribute Value One', false])
end
end

Expand All @@ -240,20 +240,20 @@ class MetadataTest < Minitest::Test

attribute_values = REXML::XPath.match(xml_doc, "//saml:AttributeValue").map(&:text)
assert_equal "Attribute Value One", attribute_values[0]
assert_equal "Attribute Value Two", attribute_values[1]
assert_equal 'false', attribute_values[1]

assert validate_xml!(xml_text, "saml-schema-metadata-2.0.xsd")
end
end

describe "when attribute service is configured" do
let(:attr_svc) { REXML::XPath.first(xml_doc, "//md:AttributeConsumingService") }
let(:req_attr) { REXML::XPath.first(xml_doc, "//md:RequestedAttribute") }
let(:attr_svc) { REXML::XPath.first(xml_doc, '//md:AttributeConsumingService') }
let(:req_attr) { REXML::XPath.first(xml_doc, '//md:RequestedAttribute') }

before do
settings.attribute_consuming_service.configure do
service_name "Test Service"
add_attribute(:name => "Name", :name_format => "Name Format", :friendly_name => "Friendly Name", :attribute_value => "Attribute Value")
add_attribute(:name => 'active', :name_format => 'format', :friendly_name => 'Active', :attribute_value => true)
end
end

Expand All @@ -262,10 +262,10 @@ class MetadataTest < Minitest::Test
assert_equal "1", attr_svc.attribute("index").value
assert_equal REXML::XPath.first(xml_doc, "//md:ServiceName").text.strip, "Test Service"

assert_equal "Name", req_attr.attribute("Name").value
assert_equal "Name Format", req_attr.attribute("NameFormat").value
assert_equal "Friendly Name", req_attr.attribute("FriendlyName").value
assert_equal "Attribute Value", REXML::XPath.first(xml_doc, "//saml:AttributeValue").text.strip
assert_equal 'active', req_attr.attribute('Name').value
assert_equal 'format', req_attr.attribute('NameFormat').value
assert_equal 'Active', req_attr.attribute('FriendlyName').value
assert_equal 'true', REXML::XPath.first(xml_doc, '//saml:AttributeValue').text.strip

assert validate_xml!(xml_text, "saml-schema-metadata-2.0.xsd")
end
Expand Down Expand Up @@ -303,7 +303,7 @@ class MetadataTest < Minitest::Test
assert_match %r[<ds:SignatureMethod Algorithm='http://www.w3.org/2000/09/xmldsig#rsa-sha1'/>], xml_text
assert_match %r[<ds:DigestMethod Algorithm='http://www.w3.org/2000/09/xmldsig#sha1'/>], xml_text
signed_metadata = XMLSecurity::SignedDocument.new(xml_text)
assert signed_metadata.validate_document(ruby_saml_cert_fingerprint, false)
assert signed_metadata.validate_document(ruby_saml_cert_fingerprint, false)

assert validate_xml!(xml_text, "saml-schema-metadata-2.0.xsd")
end
Expand All @@ -321,7 +321,7 @@ class MetadataTest < Minitest::Test

signed_metadata_2 = XMLSecurity::SignedDocument.new(xml_text)

assert signed_metadata_2.validate_document(ruby_saml_cert_fingerprint, false)
assert signed_metadata_2.validate_document(ruby_saml_cert_fingerprint, false)

assert validate_xml!(xml_text, "saml-schema-metadata-2.0.xsd")
end
Expand Down

0 comments on commit c6da73b

Please sign in to comment.