Skip to content

Commit c81e384

Browse files
committed
Fix LogoutRequest's missing NameQualifier and SPNameQualifier for samletest.id
1 parent e85848d commit c81e384

File tree

7 files changed

+170
-14
lines changed

7 files changed

+170
-14
lines changed

lib/Net/SAML2/Protocol/Assertion.pm

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,39 @@ sub nameid_format {
210210
return $self->nameid_object->getAttribute('Format');
211211
}
212212

213+
=head2 nameid_name_qualifier
214+
215+
Returns the NameID NameQualifier
216+
217+
=cut
218+
219+
sub nameid_name_qualifier {
220+
my $self = shift;
221+
return $self->nameid_object->getAttribute('NameQualifier');
222+
}
223+
224+
=head2 nameid_sp_name_qualifier
225+
226+
Returns the NameID SPNameQualifier
227+
228+
=cut
229+
230+
sub nameid_sp_name_qualifier {
231+
my $self = shift;
232+
return $self->nameid_object->getAttribute('SPNameQualifier');
233+
}
234+
235+
=head2 nameid_sp_provided_id
236+
237+
Returns the NameID SPProvidedID
238+
239+
=cut
240+
241+
sub nameid_sp_provided_id {
242+
my $self = shift;
243+
return $self->nameid_object->getAttribute('SPProvidedID');
244+
}
245+
213246
=head2 valid( $audience, $in_response_to )
214247
215248
Returns true if this Assertion is currently valid for the given audience.

lib/Net/SAML2/Protocol/LogoutRequest.pm

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ Tell the module to include the NameQualifier and SPNameQualifier attributes in
6363
the NameID. Defaults to false unless the B<nameid_format> equals
6464
C<urn:oasis:names:tc:SAML:2.0:nameidformat:persistent>
6565
66+
=item B<name_qualifier>
67+
68+
When supplied sets the NameQualifier attribute. When not supplied, this
69+
defaults to the destination.
70+
6671
=item B<affiliation_group_id>
6772
6873
When supplied sets the SPNameQualifier attribute. When not supplied, this
@@ -101,6 +106,12 @@ has affiliation_group_id => (
101106
predicate => 'has_affiliation_group_id'
102107
);
103108

109+
has name_qualifier => (
110+
isa => NonEmptySimpleStr,
111+
is => 'ro',
112+
required => 0,
113+
predicate => 'has_name_qualifier'
114+
);
104115
has include_name_qualifier =>
105116
(isa => 'Bool', is => 'ro', required => 0, default => 0);
106117

@@ -199,9 +210,9 @@ sub as_xml {
199210
) : (),
200211
$self->include_name_qualifier
201212
? (
202-
$self->has_destination
203-
? (NameQualifier => $self->destination)
204-
: (),
213+
$self->has_name_qualifier
214+
? (NameQualifier => $self->name_qualifier)
215+
: ($self->has_destination ? (NameQualifier => $self->destination) : ()),
205216
SPNameQualifier =>
206217
$self->has_affiliation_group_id ? $self->affiliation_group_id : $self->issuer
207218
)

lib/Net/SAML2/SP.pm

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,29 @@ sub authn_request {
318318

319319
}
320320

321-
=head2 logout_request( $destination, $nameid, $nameid_format, $session )
321+
=head2 logout_request( $destination, $nameid, $nameid_format, $session, $params )
322322
323323
Returns a LogoutRequest object created by this SP, intended for the
324324
given destination, which should be the identity URI of the IdP.
325325
326326
Also requires the nameid (+format) and session to be logged out.
327327
328+
=over
329+
330+
$params is a HASH reference for parameters to Net::SAML2::Protocol::LogoutRequest
331+
332+
$params = (
333+
# name qualifier parameters from Assertion NameId
334+
name_qualifier => "https://idp.shibboleth.local/idp/shibboleth"
335+
sp_name_qualifier => "https://netsaml2-testapp.local"
336+
);
337+
338+
=back
339+
328340
=cut
329341

330342
sub logout_request {
331-
my ($self, $destination, $nameid, $nameid_format, $session) = @_;
343+
my ($self, $destination, $nameid, $nameid_format, $session, $params) = @_;
332344

333345
my $logout_req = Net::SAML2::Protocol::LogoutRequest->new(
334346
issuer => $self->id,
@@ -338,8 +350,16 @@ sub logout_request {
338350
NonEmptySimpleStr->check($nameid_format)
339351
? (nameid_format => $nameid_format)
340352
: (),
353+
(defined $params->{sp_name_qualifier})
354+
? (affiliation_group_id => $params->{sp_name_qualifier})
355+
: (),
356+
(defined $params->{name_qualifier})
357+
? (name_qualifier => $params->{name_qualifier})
358+
: (),
359+
(defined $params->{include_name_qualifier})
360+
? ( include_name_qualifier => $params->{include_name_qualifier} )
361+
: ( include_name_qualifier => 1),
341362
);
342-
343363
return $logout_req;
344364
}
345365

t/03-assertions.t

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use strict;
22
use warnings;
33
use Test::Lib;
44
use Test::Net::SAML2;
5+
use MIME::Base64 qw/decode_base64/;
56

67
use Net::SAML2::Protocol::Assertion;
78

@@ -109,4 +110,22 @@ $assertion->{not_before} = DateTime->now->add(minutes => 5);
109110
is($assertion->valid('http://ct.local'), 0, "and invalid again - InResponseTo not Checked");
110111
is($assertion->valid('http://ct.local', 'N3k95Hg41WCHdwc9mqXynLPhB'), 0, "and invalid again - InResponseTo Checked");
111112

113+
my $assertion_b64 = <<'BASE64';
114+
<?xml version="1.0" encoding="UTF-8"?><saml2p:Response xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" Destination="https://netsaml2-testapp.local/consumer-post" ID="_b160e710ec868cb78e7d303b8db9b536" InResponseTo="NETSAML2_743421ef5c9302186d8050c4c5bab7e76a8b8fd4e329b0f9a39a182356760de1" IssueInstant="2023-01-14T14:37:15.814Z" Version="2.0"><saml2:Issuer xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">https://idp.shibboleth.local/idp/shibboleth</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#_b160e710ec868cb78e7d303b8db9b536"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>cfQgrmymQlljx+6+XKgETRKrMrV0gfa2kbUJkVvba1E=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>CKBNQ0Ri+dYtUfrU+uhPHsGbpJsXzVe0JAkm2hEQzGcSYGLs/qLgA+SdBqfikOAKaJoX8CM8kvZhpzri7R+pTUQMwvVBLqbbBt2oSifyTXn4I9LCwAlNXvfL+YXdfDd5tkLqO213DYIBr7WKSVFOdfciksKfiWRMP3QT/qvcae6KO7U8NjqDKRs+V2TZKA+Ty4IdcLzsWqwyfDYhJwDChGlfna06YV5fYfLfyBzMS5E73570Ku6ncH27lGHjGNqMqTh8VfT3aeVCROrB2JDgJIfyWivRY/Ghi7L0YRIufWqn4YufO0FDJwHMuLtmEp5ZNj5g7JpfssQx9dCfctoGs27/3kjeHUTrvEQhQ4wdWj0eEfyms5GMjZb9ZH95EOpCS3z8MhPd/FidSRQHBoyNtUcs8ACwcgE2E2EKtDY8azbnF+rBoRgaXkoKpiOkJmTXuo1cGvUMvWnChY2v60lYfLW/9KYkR7JPJGTUsdFBhZBPhZ+epkHMP9JzCDxb+9c5</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUU2fynUQZS+sXRqj0Oc4YgF4mIOowDQYJKoZIhvcNAQELBQAwHzEdMBsG
A1UEAwwUaWRwLnNoaWJib2xldGgubG9jYWwwHhcNMjIxMjI1MjIzMjA4WhcNNDIxMjI1MjIzMjA4
WjAfMR0wGwYDVQQDDBRpZHAuc2hpYmJvbGV0aC5sb2NhbDCCAaIwDQYJKoZIhvcNAQEBBQADggGP
ADCCAYoCggGBAKv1cHr62t1KN7CM6pBi4E78F7djkO3ASQjP5smPuZisB4KQQ/oMKNcJ0BRJ2f2m
5KNRj8RnT2nrD1ychwYqtbTAfQdfUMc+rVdhg8FnsN/e41f8XcBh5f74vnt9AcHeCSV/GGlde/MI
pzl7fSyHzM9B5BeZpV9IvaX75dyeWpHJO64z9QvYfLM3ZrBGubKaUDKE+42dpOgj7HQo7NcpOeDo
6lmhaUseAHx6juL63IXWyjKGKlUhc7yYo+Alu+9VcfWH4O/UT59lzzajFdMxbdkqr/FP2LTKWYpo
Te9fxzTphcTNylrv8XyhtFFqP572x85HqbLx3wyUxvK7A6XwEDQniMatEoHRp620Uf+4Z1RZYaUy
KRmWilOcMToXMOxBx68y/z7OrOYLFjbixZeej7tlVEMz7pwUL7I/dZA4/SIFyUEPdj8tHw313IHD
00NMZBfq/1u41LBsYbZ2b8YzRc6fhzqKr+SgR1eqkOePNYHENA44NnWtRrOQPJHdxKxzDQIDAQAB
o28wbTAdBgNVHQ4EFgQUhlv49y3eVyyEQs4fFoSai52/INwwTAYDVR0RBEUwQ4IUaWRwLnNoaWJi
b2xldGgubG9jYWyGK2h0dHBzOi8vaWRwLnNoaWJib2xldGgubG9jYWwvaWRwL3NoaWJib2xldGgw
DQYJKoZIhvcNAQELBQADggGBAKWWexRPg3WMe0m6v9JkJkX3luPQvSY5MJmw32ogEMQJiaRa3JZT
YuL5z5zeBhidTQ+IZQbt2bi6mw5MySi/JMuiW69N9sh28IgcvGSY7sSry5HVr2qEByd0PMVm6xez
puL9mHD50AlfC5hwW19c4C2HvjLqcz79XKtL09Fd8QLbjc1vM9Ekpt15H55KzsFS5GbXAUjZYhzG
IW6xWoGR22kd+dIbP7l55LD8Ldr8fJLdFdEDAZ7FpxsZCIek+5bKrPRv75seaE2hxO/Z+TuBSuMm
9q1LhHRUQUy9CKAEw4fFFqeSTg/Nnw3lnmAF/T00A5eKCW4uk1VeTOU65ywvxGyOm0OUfkOTqsQR
8tqz/4FY+qJIksf0ZpCZztH+7jqRdv8nQ7lIleetUamPe2hB/hOS9+xrADc4bd53b1vs/UzxZPhH
WRtV/102e7SLITBll5bV/cNPEiFzXA9WeWGToP4+QnYBdao/AlPhokHHidyzGngTAguXx84i08+F
e+kMqQ==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2p:Status><saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></saml2p:Status><saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" ID="_61f377717caad87ce2af0e7946cb97b1" IssueInstant="2023-01-14T14:37:15.814Z" Version="2.0"><saml2:Issuer>https://idp.shibboleth.local/idp/shibboleth</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#_61f377717caad87ce2af0e7946cb97b1"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><ds:DigestValue>MwBFLs34YYkMRe3q1DkWgMjqi6V8bHbT3JCTfxyZLJk=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>oqevIAEnWLQwSZx8hxiSApNBVrWZLoF1Z4KOTRbvOGdYvgqw7meBvdoRUlGupy3C/jn0UQPB5ZSoUWwPgebLmF5OayWKAcC6MYoQ+Zttq+4kOTJ+DKPaKO2fEsCzCS+HX8ac+LuajHfKvqtd1mKP9U1TQ63Z1joDo2H1EXMQdOZnRwWXgKFeXAWPJab0vfvVfYauVUrn1ZC20QaNLzBjRDC0d6loXL3g7CTy/YNf2mJNcRjWF4ER4cqOdUwDdtBgXVFGjQs345rK3/oN8lO5T7Timgl1aMPxCof+EivsWjkbiAxTs9M05QEWRj/BWzKGYGyu9srDZMid+Z5BacCQIzFZ1/8kKGI6+UYVDxaUCLT9aQow4lEuT10k2l4LXqjaXA/ymOih4nIKJ1AsGH13UMul4BOEyLO5AFAXz57H3oxrdlvW7CaSwby0yhxyTcK54VoL2lC0hFaz9XLvsh1jSHwyZfN+63VBu8w50S5egn4eAYBezYLwzLukHXRwIazC</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUU2fynUQZS+sXRqj0Oc4YgF4mIOowDQYJKoZIhvcNAQELBQAwHzEdMBsG
A1UEAwwUaWRwLnNoaWJib2xldGgubG9jYWwwHhcNMjIxMjI1MjIzMjA4WhcNNDIxMjI1MjIzMjA4
WjAfMR0wGwYDVQQDDBRpZHAuc2hpYmJvbGV0aC5sb2NhbDCCAaIwDQYJKoZIhvcNAQEBBQADggGP
ADCCAYoCggGBAKv1cHr62t1KN7CM6pBi4E78F7djkO3ASQjP5smPuZisB4KQQ/oMKNcJ0BRJ2f2m
5KNRj8RnT2nrD1ychwYqtbTAfQdfUMc+rVdhg8FnsN/e41f8XcBh5f74vnt9AcHeCSV/GGlde/MI
pzl7fSyHzM9B5BeZpV9IvaX75dyeWpHJO64z9QvYfLM3ZrBGubKaUDKE+42dpOgj7HQo7NcpOeDo
6lmhaUseAHx6juL63IXWyjKGKlUhc7yYo+Alu+9VcfWH4O/UT59lzzajFdMxbdkqr/FP2LTKWYpo
Te9fxzTphcTNylrv8XyhtFFqP572x85HqbLx3wyUxvK7A6XwEDQniMatEoHRp620Uf+4Z1RZYaUy
KRmWilOcMToXMOxBx68y/z7OrOYLFjbixZeej7tlVEMz7pwUL7I/dZA4/SIFyUEPdj8tHw313IHD
00NMZBfq/1u41LBsYbZ2b8YzRc6fhzqKr+SgR1eqkOePNYHENA44NnWtRrOQPJHdxKxzDQIDAQAB
o28wbTAdBgNVHQ4EFgQUhlv49y3eVyyEQs4fFoSai52/INwwTAYDVR0RBEUwQ4IUaWRwLnNoaWJi
b2xldGgubG9jYWyGK2h0dHBzOi8vaWRwLnNoaWJib2xldGgubG9jYWwvaWRwL3NoaWJib2xldGgw
DQYJKoZIhvcNAQELBQADggGBAKWWexRPg3WMe0m6v9JkJkX3luPQvSY5MJmw32ogEMQJiaRa3JZT
YuL5z5zeBhidTQ+IZQbt2bi6mw5MySi/JMuiW69N9sh28IgcvGSY7sSry5HVr2qEByd0PMVm6xez
puL9mHD50AlfC5hwW19c4C2HvjLqcz79XKtL09Fd8QLbjc1vM9Ekpt15H55KzsFS5GbXAUjZYhzG
IW6xWoGR22kd+dIbP7l55LD8Ldr8fJLdFdEDAZ7FpxsZCIek+5bKrPRv75seaE2hxO/Z+TuBSuMm
9q1LhHRUQUy9CKAEw4fFFqeSTg/Nnw3lnmAF/T00A5eKCW4uk1VeTOU65ywvxGyOm0OUfkOTqsQR
8tqz/4FY+qJIksf0ZpCZztH+7jqRdv8nQ7lIleetUamPe2hB/hOS9+xrADc4bd53b1vs/UzxZPhH
WRtV/102e7SLITBll5bV/cNPEiFzXA9WeWGToP4+QnYBdao/AlPhokHHidyzGngTAguXx84i08+F
e+kMqQ==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2:Subject><saml2:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" NameQualifier="https://idp.shibboleth.local/idp/shibboleth" SPNameQualifier="https://netsaml2-testapp.local" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">7VTBH4WVXMCYOKWXKVAFJLMTMGNIIGMX</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml2:SubjectConfirmationData Address="192.168.122.1" InResponseTo="NETSAML2_743421ef5c9302186d8050c4c5bab7e76a8b8fd4e329b0f9a39a182356760de1" NotOnOrAfter="2023-01-14T14:42:15.826Z" Recipient="https://netsaml2-testapp.local/consumer-post"/></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2023-01-14T14:37:15.814Z" NotOnOrAfter="2023-01-14T14:42:15.814Z"><saml2:AudienceRestriction><saml2:Audience>https://netsaml2-testapp.local</saml2:Audience></saml2:AudienceRestriction></saml2:Conditions><saml2:AuthnStatement AuthnInstant="2023-01-14T14:37:15.781Z" SessionIndex="_121cef54191d57f90753619ff81856bd"><saml2:SubjectLocality Address="192.168.122.1"/><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement><saml2:AttributeStatement><saml2:Attribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>shibboleth.local</saml2:AttributeValue></saml2:Attribute></saml2:AttributeStatement></saml2:Assertion></saml2p:Response>
115+
BASE64
116+
117+
$xml = decode_base64($assertion_b64);
118+
$assertion = Net::SAML2::Protocol::Assertion->new_from_xml(xml => $xml);
119+
isa_ok($assertion, 'Net::SAML2::Protocol::Assertion');
120+
121+
is($assertion->nameid_name_qualifier,
122+
"https://idp.shibboleth.local/idp/shibboleth",
123+
"nameid_name_qualifier is ok");
124+
is($assertion->nameid_sp_name_qualifier,
125+
"https://netsaml2-testapp.local",
126+
"nameid_sp_name_qualifier is ok");
127+
is($assertion->nameid_sp_provided_id,
128+
undef,
129+
"nameid_sp_provided_id undefined as expected");
130+
112131
done_testing;

t/07-logout-request.t

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,37 @@ foreach (qw(NameQualifier SPNameQualifier SPProvidedID)) {
8282
$args{destination}, ".. and the NameQualifier");
8383
}
8484

85+
{
86+
my $sp = net_saml2_sp(
87+
authnreq_signed => 0,
88+
want_assertions_signed => 0,
89+
slo_url_post => '/sls-post-response',
90+
slo_url_soap => '/slo-soap',
91+
);
92+
93+
my %logout_params = (
94+
name_qualifier => 'https://idp.shibboleth.local/idp/shibboleth',
95+
sp_name_qualifier => 'https://netsaml2-testapp',
96+
);
97+
98+
my $logout_request = $sp->logout_request(
99+
$args{destination},
100+
$args{nameid},
101+
$args{nameid_format},
102+
$args{session},
103+
\%logout_params);
104+
my $xml = $logout_request->as_xml;
105+
106+
my $xpath = get_xpath(
107+
$xml,
108+
samlp => URN_PROTOCOL,
109+
saml => URN_ASSERTION,
110+
);
111+
my $name_id = get_single_node_ok($xpath, '/samlp:LogoutRequest/saml:NameID');
112+
is($name_id->getAttribute('SPNameQualifier'),
113+
$logout_params{sp_name_qualifier}, "We the SPNameQualifier");
114+
is($name_id->getAttribute('NameQualifier'),
115+
$logout_params{name_qualifier}, ".. and the NameQualifier");
85116

117+
}
86118
done_testing;

0 commit comments

Comments
 (0)