Skip to content

Add the support for multiple Audiences within one AudienceRestriction #5

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add the support for multiple Audiences within one AudienceRestriction #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions lib/Net/SAML2/Protocol/Assertion.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ has 'session' => (isa => Str, is => 'ro', required => 1);
has 'nameid' => (isa => Str, is => 'ro', required => 1);
has 'not_before' => (isa => DateTime, is => 'ro', required => 1);
has 'not_after' => (isa => DateTime, is => 'ro', required => 1);
has 'audience' => (isa => NonEmptySimpleStr, is => 'ro', required => 1);
has 'audience' => (isa => HashRef[NonEmptySimpleStr], is => 'ro', required => 1);

=head1 METHODS

Expand All @@ -51,7 +51,13 @@ sub new_from_xml {
map { $_->string_value } @values
];
}


my %audiences = ();
for my $audience_restriction ($xpath->findnodes('//saml:Conditions/saml:AudienceRestriction')) {
my @values = $audience_restriction->findnodes('saml:Audience');
%audiences = map { $_->string_value => 1 } @values;
}

my $not_before = DateTime::Format::XSD->parse_datetime(
$xpath->findvalue('//saml:Conditions/@NotBefore')->value
);
Expand All @@ -63,7 +69,7 @@ sub new_from_xml {
attributes => $attributes,
session => $xpath->findvalue('//saml:AuthnStatement/@SessionIndex')->value,
nameid => $xpath->findvalue('//saml:Subject/saml:NameID')->value,
audience => $xpath->findvalue('//saml:Conditions/saml:AudienceRestriction/saml:Audience')->value,
audience => \%audiences,
not_before => $not_before,
not_after => $not_after,
);
Expand Down Expand Up @@ -95,7 +101,7 @@ sub valid {
my ($self, $audience) = @_;

return 0 unless defined $audience;
return 0 unless ($audience eq $self->audience);
return 0 unless ($self->audience->{$audience});

my $now = DateTime::->now;

Expand Down
6 changes: 5 additions & 1 deletion t/03-assertions.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ my $xml = <<XML;
<saml:Conditions NotBefore="2010-10-12T14:39:27Z" NotOnOrAfter="2010-10-12T14:59:27Z">
<saml:AudienceRestriction>
<saml:Audience>http://ct.local</saml:Audience>
<saml:Audience>http://ct2.local</saml:Audience>
</saml:AudienceRestriction>
</saml:Conditions>
<saml:AuthnStatement AuthnInstant="2010-10-12T12:58:34Z" SessionIndex="s2b087bdce06dbbf9cd4662af82b8b853d4d285c01">
Expand Down Expand Up @@ -79,16 +80,19 @@ is($assertion->attributes->{Phone2}->[2], '345678');

isa_ok($assertion->not_before, 'DateTime');
isa_ok($assertion->not_after, 'DateTime');
is($assertion->audience, 'http://ct.local');
is($assertion->audience->{'http://ct.local'}, 1);
is($assertion->audience->{'http://ct2.local'}, 1);
is($assertion->valid('foo'), 0);
is($assertion->valid('http://ct.local'), 0);

# fudge validity times to test valid()
$assertion->{not_before} = DateTime->now;
$assertion->{not_after} = DateTime->now->add( minutes => 15);
is($assertion->valid('http://ct.local'), 1);
is($assertion->valid('http://ct2.local'), 1);

$assertion->{not_before} = DateTime->now->add( minutes => 5 );
is($assertion->valid('http://ct.local'), 0);
is($assertion->valid('http://ct2.local'), 0);

done_testing;