Be lenient in what we accept, like dateTime/time with trailing sub-second zeros

Author: tvdijen

src/XMLSchema/Type/DateTimeValue.php

@@ -11,6 +11,11 @@
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 use SimpleSAML\XMLSchema\Type\Interface\AbstractAnySimpleType;
 
+use function rtrim;
+use function strlen;
+use function strpos;
+use function substr;
+
 /**
  * @package simplesaml/xml-common
  */
@@ -28,7 +33,28 @@ class DateTimeValue extends AbstractAnySimpleType
      */
     protected function sanitizeValue(string $value): string
     {
-        return static::collapseWhitespace(static::normalizeWhitespace($value));
+        $normalized = static::collapseWhitespace(static::normalizeWhitespace($value));
+
+        // Trim any trailing zero's from the sub-seconds
+        $decimal = strrpos($normalized, '.');
+        if ($decimal !== false) {
+            $timezone = strrpos($normalized, '+') ?? strrpos($normalized, '-') ?? strrpos($normalized, 'Z');
+            if ($timezone !== false) {
+                $subseconds = substr($normalized, $decimal + 1, strlen($normalized) - $timezone);
+            } else {
+                $subseconds = substr($normalized, $decimal + 1);
+            }
+
+            $subseconds = rtrim($subseconds, '0');
+            if ($subseconds === '') {
+                return substr($normalized, 0, $decimal);
+            }
+            return substr($normalized, 0, $decimal + 1)
+              . $subseconds
+              . (($timezone === false) ? '' : substr($normalized, $timezone));
+        }
+
+        return $normalized;
     }
 
 

src/XMLSchema/Type/TimeValue.php

@@ -8,6 +8,11 @@
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 use SimpleSAML\XMLSchema\Type\Interface\AbstractAnySimpleType;
 
+use function rtrim;
+use function strlen;
+use function strpos;
+use function substr;
+
 /**
  * @package simplesaml/xml-common
  */
@@ -23,7 +28,28 @@ class TimeValue extends AbstractAnySimpleType
      */
     protected function sanitizeValue(string $value): string
     {
-        return static::collapseWhitespace(static::normalizeWhitespace($value));
+        $normalized = static::collapseWhitespace(static::normalizeWhitespace($value));
+
+        // Trim any trailing zero's from the sub-seconds
+        $decimal = strrpos($normalized, '.');
+        if ($decimal !== false) {
+            $timezone = strrpos($normalized, '+') ?? strrpos($normalized, '-') ?? strrpos($normalized, 'Z');
+            if ($timezone !== false) {
+                $subseconds = substr($normalized, $decimal + 1, strlen($normalized) - $timezone);
+            } else {
+                $subseconds = substr($normalized, $decimal + 1);
+            }
+
+            $subseconds = rtrim($subseconds, '0');
+            if ($subseconds === '') {
+                return substr($normalized, 0, $decimal);
+            }
+            return substr($normalized, 0, $decimal + 1)
+              . $subseconds
+              . (($timezone === false) ? '' : substr($normalized, $timezone));
+        }
+
+        return $normalized;
     }
 
 

tests/XMLSchema/Type/DateTimeValueTest.php

@@ -61,6 +61,8 @@ public static function provideValidDateTime(): array
     {
         return [
             'whitespace collapse' => [true, ' 2001-10-26T21:32:52 '],
+            'trailing sub-second zero' => [true, '2001-10-26T21:32:52.1230'],
+            'all trailing sub-second zero' => [true, '2001-10-26T21:32:52.00'],
         ];
     }
 

tests/XMLSchema/Type/TimeValueTest.php

@@ -47,6 +47,8 @@ public static function provideValidTime(): array
     {
         return [
             'whitespace collapse' =>  [true, "\n  21:32:52.12679\t "],
+            'trailing sub-second zero' => [true, '21:32:52.1230'],
+            'all trailing sub-second zero' => [true, '21:32:52.00'],
         ];
     }