Skip to content

LG-763 Fix SAML NameFormat to comply with the SAML 2.0 standard #2624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevegsa merged 9 commits into from
Nov 2, 2018
Merged

LG-763 Fix SAML NameFormat to comply with the SAML 2.0 standard #2624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c17f6d1
LG-763 Fix SAML NameFormat to comply with the SAML 2.0 standard
stevegsa Oct 24, 2018
99c27e7
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Oct 24, 2018
8a067fc
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Oct 26, 2018
8618831
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Nov 1, 2018
4f988fe
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Nov 1, 2018
9680836
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Nov 1, 2018
4b6c82c
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Nov 1, 2018
8f5e242
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Nov 1, 2018
3e81fd2
Merge branch 'master' into stevegsa-fix-saml-nameformat
stevegsa Nov 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/services/attribute_asserter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def default_attrs
{
uuid: {
getter: uuid_getter_function,
name_format: Saml::XML::Namespaces::Formats::NameId::PERSISTENT,
name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic',
name_id_format: Saml::XML::Namespaces::Formats::NameId::PERSISTENT,
},
}
Expand Down Expand Up @@ -75,7 +75,7 @@ def attribute_getter_function_ascii(attr)
def add_email(attrs)
attrs[:email] = {
getter: :email,
name_format: Saml::XML::Namespaces::Formats::NameId::EMAIL_ADDRESS,
name_format: 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic',
name_id_format: Saml::XML::Namespaces::Formats::NameId::EMAIL_ADDRESS,
}
end
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/saml_idp_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@

expect(email.name).to eq('Attribute')
expect(email['Name']).to eq('email')
expect(email['NameFormat']).to eq(Saml::XML::Namespaces::Formats::NameId::EMAIL_ADDRESS)
expect(email['NameFormat']).to eq('urn:oasis:names:tc:SAML:2.0:attrname-format:basic')
expect(email['FriendlyName']).to eq('email')
end

Expand All @@ -878,7 +878,7 @@

expect(uuid.name).to eq('Attribute')
expect(uuid['Name']).to eq('uuid')
expect(uuid['NameFormat']).to eq(Saml::XML::Namespaces::Formats::NameId::PERSISTENT)
expect(uuid['NameFormat']).to eq('urn:oasis:names:tc:SAML:2.0:attrname-format:basic')
expect(uuid['FriendlyName']).to eq('uuid')
end

Expand Down