Skip to content
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

Use ppid instead of nameid for unique identifier #12

Merged
merged 4 commits into from
May 17, 2024
Merged

Use ppid instead of nameid for unique identifier #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3dc5d5a
Use ppid instead of nameid for unique identifier
azelcs May 8, 2024
b46f942
Add test
azelcs May 8, 2024
558e12c
Rename fixture
azelcs May 8, 2024
30e6086
Keep VPM internal ID in legacy UIDs as fallback
azelcs May 8, 2024
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
5 changes: 3 additions & 2 deletions lib/omniauth/strategies/latvija.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def raw_info
end

def uid
@response.name_identifier
"PK:#{raw_info['privatepersonalidentifier']}"
end

def full_name
Expand All @@ -99,7 +99,8 @@ def legacy_uids
# UIDs that could have been assigned to this identity by previous versions of the gem, or due to peronal identifier change

legacy_uids = [
"#{full_name}, #{raw_info["privatepersonalidentifier"]}" # generated by gem version <= 4.0
"#{full_name}, #{raw_info["privatepersonalidentifier"]}", # generated by gem version <= 4.0
@response.name_identifier # VPM internal UID fallback, generated by gem version <= 6.3.0
]

raw_info.fetch('historical_privatepersonalidentifier', []).each do |historical_identifier|
Expand Down
63 changes: 63 additions & 0 deletions spec/fixtures/wresult_single_personal_code_nameidentifier_mismatch_decrypted.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?xml version="1.0"?>
<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
<trust:RequestSecurityTokenResponse Context="https://demo.latvijasnotars.lv/users/auth/latvija/callback">
<trust:Lifetime>
<wsu:Created xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2019-11-05T13:57:02.777Z</wsu:Created>
<wsu:Expires xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">2019-11-05T17:57:02.777Z</wsu:Expires>
</trust:Lifetime>
<wsp:AppliesTo xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
<wsa:Address>https://example.com</wsa:Address>
</wsa:EndpointReference>
</wsp:AppliesTo>
<trust:RequestedSecurityToken>
<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" MajorVersion="1" MinorVersion="1" AssertionID="_fe766b93-7b30-43cb-9f54-7e66c7421a26" Issuer="http://www.latvija.lv/sts" IssueInstant="2019-11-04T14:12:08.977Z">
<saml:Conditions NotBefore="2019-11-05T13:57:02.777Z" NotOnOrAfter="2019-11-05T17:57:02.777Z">
<saml:AudienceRestrictionCondition>
<saml:Audience>https://ivis.eps.gov.lv/LVP.Sitecore</saml:Audience>
</saml:AudienceRestrictionCondition>
</saml:Conditions>
<saml:AttributeStatement>
<saml:Subject>
<saml:NameIdentifier Format="urn:ivis:100001:name.id-viss">PK:32345678901</saml:NameIdentifier>
<saml:SubjectConfirmation>
<saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:bearer</saml:ConfirmationMethod>
</saml:SubjectConfirmation>
</saml:Subject>
<saml:Attribute AttributeName="givenname" AttributeNamespace="http://schemas.xmlsoap.org/ws/2005/05/identity/claims" a:OriginalIssuer="TESTidp"
xmlns:a="http://schemas.xmlsoap.org/ws/2009/09/identity/claims">
<saml:AttributeValue>ODS</saml:AttributeValue>
</saml:Attribute>
<saml:Attribute AttributeName="surname" AttributeNamespace="http://schemas.xmlsoap.org/ws/2005/05/identity/claims" a:OriginalIssuer="TESTidp"
xmlns:a="http://schemas.xmlsoap.org/ws/2009/09/identity/claims">
<saml:AttributeValue>KNISLIS</saml:AttributeValue>
</saml:Attribute>
<saml:Attribute AttributeName="privatepersonalidentifier" AttributeNamespace="http://schemas.xmlsoap.org/ws/2005/05/identity/claims" a:OriginalIssuer="TESTidp"
xmlns:a="http://schemas.xmlsoap.org/ws/2009/09/identity/claims">
<saml:AttributeValue>01018012345</saml:AttributeValue>
</saml:Attribute>
<saml:Attribute AttributeName="citizenQAALevel" AttributeNamespace="http://ivis.eps.gov.lv/schema/identity/claims">
<saml:AttributeValue a:type="tn:integer"
xmlns:tn="http://www.w3.org/2001/XMLSchema"
xmlns:a="http://www.w3.org/2001/XMLSchema-instance">4</saml:AttributeValue>
</saml:Attribute>
<saml:Attribute AttributeName="109x34" AttributeNamespace="http://ivis.eps.gov.lv/schema/media/image">
<saml:AttributeValue>https://epakvisstv.vraa.gov.lv/STS/VISS.LVP.STS/Image.ashx?id=am-test</saml:AttributeValue>
</saml:Attribute>
</saml:AttributeStatement>
<saml:AuthenticationStatement AuthenticationMethod="urn:ivis:100001:am-idp40-wif" AuthenticationInstant="2019-11-05T13:57:02.511Z">
<saml:Subject>
<saml:NameIdentifier Format="urn:ivis:100001:name.id-viss">PK:32345678901</saml:NameIdentifier>
<saml:SubjectConfirmation>
<saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:bearer</saml:ConfirmationMethod>
</saml:SubjectConfirmation>
</saml:Subject>
<saml:SubjectLocality IPAddress="127.0.0.1" />
</saml:AuthenticationStatement>
</saml:Assertion>
</trust:RequestedSecurityToken>
<trust:TokenType>urn:oasis:names:tc:SAML:1.0:assertion</trust:TokenType>
<trust:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</trust:RequestType>
<trust:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer</trust:KeyType>
</trust:RequestSecurityTokenResponse>
</trust:RequestSecurityTokenResponseCollection>
34 changes: 32 additions & 2 deletions spec/omniauth/strategies/latvija_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def strategy
expect(response.dig('extra', 'raw_info', 'historical_privatepersonalidentifier')).to match_array(['12345678901'])
end

it 'should return NameIdentifier property as the auth UID' do
it 'should return PK:privatepersonalidentifier as the auth UID' do
expect(response.dig('uid')).to eq('PK:32345678901')
end

Expand Down Expand Up @@ -237,9 +237,39 @@ def strategy
expect(response.dig('extra', 'raw_info', 'historical_privatepersonalidentifier')).to be_empty
end

it 'should return NameIdentifier property as the auth UID' do
it 'should return PK:privatepersonalidentifier as the auth UID' do
expect(response.dig('uid')).to eq('PK:32345678901')
end
end

context 'when response NameIdentifier code does not match real private personal identifier' do
let(:wresult_decrypted) { File.read('spec/fixtures/wresult_single_personal_code_nameidentifier_mismatch_decrypted.xml') }

before(:each) do
allow_any_instance_of(OmniAuth::Strategies::Latvija::SignedDocument).to receive(:validate!).and_return(true)
end

let(:response) do
post '/auth/latvija/callback', {
:wa => "wsignin1.0",
:wctx => "http://example.org/auth/latvija/callback",
:wresult => wresult_decrypted
}

last_request.env['omniauth.auth']
end

it 'should return primary personal code' do
expect(response.dig('info', 'private_personal_identifier')).to eq('01018012345')
end

it 'should not return historical personal codes in extra info' do
expect(response.dig('extra', 'raw_info', 'historical_privatepersonalidentifier')).to be_empty
end

it 'should return PK:privatepersonalidentifier as the auth UID' do
expect(response.dig('uid')).to eq('PK:01018012345')
end
end
end
end