Merge pull request #96 from Hotdawg/regex_with_equals

Limit split for string keywords

fixtures/equals_in_pattern.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://github.com/invopop/jsonschema/pattern-equals-test",
+  "$ref": "#/$defs/PatternEqualsTest",
+  "$defs": {
+    "PatternEqualsTest": {
+      "properties": {
+        "WithEquals": {
+          "type": "string",
+          "pattern": "foo=bar"
+        },
+        "WithEqualsAndCommas": {
+          "type": "string",
+          "pattern": "foo,=bar"
+        }
+      },
+      "additionalProperties": false,
+      "type": "object",
+      "required": [
+        "WithEquals",
+        "WithEqualsAndCommas"
+      ]
+    }
+  }
+}

reflect.go

@@ -681,7 +681,7 @@ func (t *Schema) structKeywordsFromTags(f reflect.StructField, parent *Schema, p
 func (t *Schema) genericKeywords(tags []string, parent *Schema, propertyName string) []string { //nolint:gocyclo
 	unprocessed := make([]string, 0, len(tags))
 	for _, tag := range tags {
-		nameValue := strings.Split(tag, "=")
+		nameValue := strings.SplitN(tag, "=", 2)
 		if len(nameValue) == 2 {
 			name, val := nameValue[0], nameValue[1]
 			switch name {
@@ -804,7 +804,7 @@ func (t *Schema) booleanKeywords(tags []string) {
 // read struct tags for string type keywords
 func (t *Schema) stringKeywords(tags []string) {
 	for _, tag := range tags {
-		nameValue := strings.Split(tag, "=")
+		nameValue := strings.SplitN(tag, "=", 2)
 		if len(nameValue) == 2 {
 			name, val := nameValue[0], nameValue[1]
 			switch name {

reflect_test.go

@@ -332,6 +332,11 @@ type Expression struct {
 	Value int `json:"value" jsonschema_extras:"foo=bar=='baz'"`
 }
 
+type PatternEqualsTest struct {
+	WithEquals          string `jsonschema:"pattern=foo=bar"`
+	WithEqualsAndCommas string `jsonschema:"pattern=foo\\,=bar"`
+}
+
 func TestReflector(t *testing.T) {
 	r := new(Reflector)
 	s := "http://example.com/schema"
@@ -464,6 +469,7 @@ func TestSchemaGeneration(t *testing.T) {
 		{ArrayType{}, &Reflector{}, "fixtures/array_type.json"},
 		{SchemaExtendTest{}, &Reflector{}, "fixtures/custom_type_extend.json"},
 		{Expression{}, &Reflector{}, "fixtures/schema_with_expression.json"},
+		{PatternEqualsTest{}, &Reflector{}, "fixtures/equals_in_pattern.json"},
 	}
 
 	for _, tt := range tests {