fix: add handling of uri-template format; fail on backslash in uri reference

Author: DannyvdSluijs

src/JsonSchema/ConstraintError.php

@@ -33,6 +33,7 @@ class ConstraintError extends Enum
     public const FORMAT_REGEX= 'regexFormat';
     public const FORMAT_STYLE = 'styleFormat';
     public const FORMAT_TIME = 'timeFormat';
+    public const FORMAT_URI_TEMPLATE = 'uriTemplateFormat';
     public const FORMAT_URL = 'urlFormat';
     public const FORMAT_URL_REF = 'urlRefFormat';
     public const INVALID_SCHEMA = 'invalidSchema';
@@ -90,6 +91,7 @@ public function getMessage()
             self::FORMAT_REGEX=> 'Invalid regex format %s',
             self::FORMAT_STYLE => 'Invalid style',
             self::FORMAT_TIME => 'Invalid time %s, expected format hh:mm:ss',
+            self::FORMAT_URI_TEMPLATE => 'Invalid URI template format',
             self::FORMAT_URL => 'Invalid URL format',
             self::FORMAT_URL_REF => 'Invalid URL reference format',
             self::LENGTH_MAX => 'Must be at most %d characters long',

src/JsonSchema/Constraints/Drafts/Draft06/FormatConstraint.php

@@ -96,6 +96,11 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
                     $this->addError(ConstraintError::FORMAT_URL(), $path, ['format' => $schema->format]);
                 }
                 break;
+            case 'uri-template':
+                if (!$this->validateUriTemplate($value)) {
+                    $this->addError(ConstraintError::FORMAT_URI_TEMPLATE(), $path, ['format' => $schema->format]);
+                }
+                break;
 
             case 'email':
                 if (filter_var($value, FILTER_VALIDATE_EMAIL, FILTER_NULL_ON_FAILURE | FILTER_FLAG_EMAIL_UNICODE) === null) {
@@ -113,7 +118,6 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
                     $this->addError(ConstraintError::FORMAT_JSON_POINTER(), $path, ['format' => $schema->format]);
                 }
                 break;
-                break;
             default:
                 break;
         }
@@ -205,4 +209,12 @@ private function validateRfc3339DateTime(string $value): bool
         // Compare value and date result to be equal
         return true;
     }
+
+    private function validateUriTemplate(string $value): bool
+    {
+        return preg_match(
+            '/^(?:[^\{\}]*|\{[a-zA-Z0-9_:%\/\.~\-\+\*]+\})*$/',
+            $value
+        ) === 1;
+    }
 }

src/JsonSchema/Tool/Validator/RelativeReferenceValidator.php

@@ -16,6 +16,10 @@ public static function isValid(string $ref): bool
         }
 
         // Additional checks for invalid cases
+        if (strpos($ref, '\\') !== false) {
+            return false; // Backslashes are not allowed in URI references
+        }
+
         if (preg_match('/^(http|https):\/\//', $ref)) {
             return false; // Absolute URI
         }