Skip to content

Commit

Permalink
Fix LogoutRequest's missing NameQualifier and SPNameQualifier for sam…
Browse files Browse the repository at this point in the history
…letest.id
  • Loading branch information
timlegge committed Jan 14, 2023
1 parent e85848d commit c81e384
Show file tree
Hide file tree
Showing 7 changed files with 170 additions and 14 deletions.
33 changes: 33 additions & 0 deletions lib/Net/SAML2/Protocol/Assertion.pm
Expand Up @@ -210,6 +210,39 @@ sub nameid_format {
return $self->nameid_object->getAttribute('Format');
}

=head2 nameid_name_qualifier
Returns the NameID NameQualifier
=cut

sub nameid_name_qualifier {
my $self = shift;
return $self->nameid_object->getAttribute('NameQualifier');
}

=head2 nameid_sp_name_qualifier
Returns the NameID SPNameQualifier
=cut

sub nameid_sp_name_qualifier {
my $self = shift;
return $self->nameid_object->getAttribute('SPNameQualifier');
}

=head2 nameid_sp_provided_id
Returns the NameID SPProvidedID
=cut

sub nameid_sp_provided_id {
my $self = shift;
return $self->nameid_object->getAttribute('SPProvidedID');
}

=head2 valid( $audience, $in_response_to )
Returns true if this Assertion is currently valid for the given audience.
Expand Down
17 changes: 14 additions & 3 deletions lib/Net/SAML2/Protocol/LogoutRequest.pm
Expand Up @@ -63,6 +63,11 @@ Tell the module to include the NameQualifier and SPNameQualifier attributes in
the NameID. Defaults to false unless the B<nameid_format> equals
C<urn:oasis:names:tc:SAML:2.0:nameidformat:persistent>
=item B<name_qualifier>
When supplied sets the NameQualifier attribute. When not supplied, this
defaults to the destination.
=item B<affiliation_group_id>
When supplied sets the SPNameQualifier attribute. When not supplied, this
Expand Down Expand Up @@ -101,6 +106,12 @@ has affiliation_group_id => (
predicate => 'has_affiliation_group_id'
);

has name_qualifier => (
isa => NonEmptySimpleStr,
is => 'ro',
required => 0,
predicate => 'has_name_qualifier'
);
has include_name_qualifier =>
(isa => 'Bool', is => 'ro', required => 0, default => 0);

Expand Down Expand Up @@ -199,9 +210,9 @@ sub as_xml {
) : (),
$self->include_name_qualifier
? (
$self->has_destination
? (NameQualifier => $self->destination)
: (),
$self->has_name_qualifier
? (NameQualifier => $self->name_qualifier)
: ($self->has_destination ? (NameQualifier => $self->destination) : ()),
SPNameQualifier =>
$self->has_affiliation_group_id ? $self->affiliation_group_id : $self->issuer
)
Expand Down
26 changes: 23 additions & 3 deletions lib/Net/SAML2/SP.pm
Expand Up @@ -318,17 +318,29 @@ sub authn_request {

}

=head2 logout_request( $destination, $nameid, $nameid_format, $session )
=head2 logout_request( $destination, $nameid, $nameid_format, $session, $params )
Returns a LogoutRequest object created by this SP, intended for the
given destination, which should be the identity URI of the IdP.
Also requires the nameid (+format) and session to be logged out.
=over
$params is a HASH reference for parameters to Net::SAML2::Protocol::LogoutRequest
$params = (
# name qualifier parameters from Assertion NameId
name_qualifier => "https://idp.shibboleth.local/idp/shibboleth"
sp_name_qualifier => "https://netsaml2-testapp.local"
);
=back
=cut

sub logout_request {
my ($self, $destination, $nameid, $nameid_format, $session) = @_;
my ($self, $destination, $nameid, $nameid_format, $session, $params) = @_;

my $logout_req = Net::SAML2::Protocol::LogoutRequest->new(
issuer => $self->id,
Expand All @@ -338,8 +350,16 @@ sub logout_request {
NonEmptySimpleStr->check($nameid_format)
? (nameid_format => $nameid_format)
: (),
(defined $params->{sp_name_qualifier})
? (affiliation_group_id => $params->{sp_name_qualifier})
: (),
(defined $params->{name_qualifier})
? (name_qualifier => $params->{name_qualifier})
: (),
(defined $params->{include_name_qualifier})
? ( include_name_qualifier => $params->{include_name_qualifier} )
: ( include_name_qualifier => 1),
);

return $logout_req;
}

Expand Down
19 changes: 19 additions & 0 deletions t/03-assertions.t
Expand Up @@ -2,6 +2,7 @@ use strict;
use warnings;
use Test::Lib;
use Test::Net::SAML2;
use MIME::Base64 qw/decode_base64/;

use Net::SAML2::Protocol::Assertion;

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

my $assertion_b64 = <<'BASE64';
<?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>
BASE64

$xml = decode_base64($assertion_b64);
$assertion = Net::SAML2::Protocol::Assertion->new_from_xml(xml => $xml);
isa_ok($assertion, 'Net::SAML2::Protocol::Assertion');

is($assertion->nameid_name_qualifier,
"https://idp.shibboleth.local/idp/shibboleth",
"nameid_name_qualifier is ok");
is($assertion->nameid_sp_name_qualifier,
"https://netsaml2-testapp.local",
"nameid_sp_name_qualifier is ok");
is($assertion->nameid_sp_provided_id,
undef,
"nameid_sp_provided_id undefined as expected");

done_testing;
32 changes: 32 additions & 0 deletions t/07-logout-request.t
Expand Up @@ -82,5 +82,37 @@ foreach (qw(NameQualifier SPNameQualifier SPProvidedID)) {
$args{destination}, ".. and the NameQualifier");
}

{
my $sp = net_saml2_sp(
authnreq_signed => 0,
want_assertions_signed => 0,
slo_url_post => '/sls-post-response',
slo_url_soap => '/slo-soap',
);

my %logout_params = (
name_qualifier => 'https://idp.shibboleth.local/idp/shibboleth',
sp_name_qualifier => 'https://netsaml2-testapp',
);

my $logout_request = $sp->logout_request(
$args{destination},
$args{nameid},
$args{nameid_format},
$args{session},
\%logout_params);
my $xml = $logout_request->as_xml;

my $xpath = get_xpath(
$xml,
samlp => URN_PROTOCOL,
saml => URN_ASSERTION,
);
my $name_id = get_single_node_ok($xpath, '/samlp:LogoutRequest/saml:NameID');
is($name_id->getAttribute('SPNameQualifier'),
$logout_params{sp_name_qualifier}, "We the SPNameQualifier");
is($name_id->getAttribute('NameQualifier'),
$logout_params{name_qualifier}, ".. and the NameQualifier");

}
done_testing;

0 comments on commit c81e384

Please sign in to comment.