Merge pull request #154 from waterkip/GL-assertion-with_correct_dates

Get the correct dates from the assertions

Author: waterkip

lib/Net/SAML2/Protocol/Assertion.pm

@@ -142,19 +142,25 @@ sub new_from_xml {
         $attributes->{$node->getAttribute('Name')} = [map $_->string_value, @values];
     }
 
+    my $xpath_base = '//samlp:Response/saml:Assertion/saml:Conditions/';
+
     my $not_before;
-    if($xpath->findvalue('//saml:Conditions/@NotBefore')) {
-        $not_before = DateTime::Format::XSD->parse_datetime(
-            $xpath->findvalue('//saml:Conditions/@NotBefore'));
+    if (my $value = $xpath->findvalue($xpath_base . '@NotBefore')) {
+        $not_before = DateTime::Format::XSD->parse_datetime($value);
+    }
+    elsif (my $global = $xpath->findvalue('//saml:Conditions/@NotBefore')) {
+        $not_before = DateTime::Format::XSD->parse_datetime($global);
     }
     else {
         $not_before = DateTime::HiRes->now();
     }
 
     my $not_after;
-    if($xpath->findvalue('//saml:Conditions/@NotOnOrAfter')) {
-        $not_after = DateTime::Format::XSD->parse_datetime(
-            $xpath->findvalue('//saml:Conditions/@NotOnOrAfter'));
+    if (my $value = $xpath->findvalue($xpath_base . '@NotOnOrAfter')) {
+        $not_after = DateTime::Format::XSD->parse_datetime($value);
+    }
+    elsif (my $global = $xpath->findvalue('//saml:Conditions/@NotOnOrAfter')) {
+        $not_after = DateTime::Format::XSD->parse_datetime($global);
     }
     else {
         $not_after = DateTime->from_epoch(epoch => time() + 1000);

t/03-assertions.t

@@ -128,4 +128,21 @@ is($assertion->nameid_sp_provided_id,
     undef,
     "nameid_sp_provided_id undefined as expected");
 
+
+
+lives_ok(
+    sub {
+       my  $xml = path('t/data/eherkenning-assertion.xml')->slurp;
+       $assertion = Net::SAML2::Protocol::Assertion->new_from_xml(xml => $xml);
+    },
+    "Correct parsing of dates"
+);
+
+isa_ok($assertion, 'Net::SAML2::Protocol::Assertion');
+isa_ok($assertion->not_before, "DateTime", "not before is correct");
+isa_ok($assertion->not_after, "DateTime", "... and so it not after");
+
+is($assertion->not_before, "2020-06-02T11:48:07", "... and the correct not_before");
+is($assertion->not_after, "2020-06-02T11:53:07", "... and the correct not_after");
+
 done_testing;