Fix: Hexadecimal validation in v10 validator

go-playground · Aug 19, 2022 · 5405fa3 · 5405fa3
1 parent 9e2ea40
commit 5405fa3
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 1 deletion.
diff --git a/regexes.go b/regexes.go
@@ -9,7 +9,7 @@ const (
 	alphaUnicodeNumericRegexString   = "^[\\p{L}\\p{N}]+$"
 	numericRegexString               = "^[-+]?[0-9]+(?:\\.[0-9]+)?$"
 	numberRegexString                = "^[0-9]+$"
-	hexadecimalRegexString           = "^(0[xX])?[0-9a-fA-F]+$"
+	hexadecimalRegexString           = "^$|(^(0[xX])?[0-9a-fA-F]+$)"
 	hexColorRegexString              = "^#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$"
 	rgbRegexString                   = "^rgb\\(\\s*(?:(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])|(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])%\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])%\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])%)\\s*\\)$"
 	rgbaRegexString                  = "^rgba\\(\\s*(?:(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])|(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])%\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])%\\s*,\\s*(?:0|[1-9]\\d?|1\\d\\d?|2[0-4]\\d|25[0-5])%)\\s*,\\s*(?:(?:0.[1-9]*)|[01])\\s*\\)$"

diff --git a/translations/ar/ar_test.go b/translations/ar/ar_test.go
@@ -201,6 +201,7 @@ func TestTranslations(t *testing.T) {
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
 	test.Datetime = "2008-Feb-01"
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/en/en_test.go b/translations/en/en_test.go
@@ -205,6 +205,7 @@ func TestTranslations(t *testing.T) {
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
 	test.Datetime = "2008-Feb-01"
 	test.BooleanString = "A"
+	test.HexadecimalString = "xyz"
 
 	test.Inner.RequiredIf = "abcd"
 

diff --git a/translations/es/es_test.go b/translations/es/es_test.go
@@ -190,6 +190,7 @@ func TestTranslations(t *testing.T) {
 
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/fa/fa_test.go b/translations/fa/fa_test.go
@@ -200,6 +200,7 @@ func TestTranslations(t *testing.T) {
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
 	test.Datetime = "2008-Feb-01"
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/fr/fr_test.go b/translations/fr/fr_test.go
@@ -184,6 +184,7 @@ func TestTranslations(t *testing.T) {
 	s := "toolong"
 	test.StrPtrMaxLen = &s
 	test.StrPtrLen = &s
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/id/id_test.go b/translations/id/id_test.go
@@ -184,6 +184,7 @@ func TestTranslations(t *testing.T) {
 	s := "toolong"
 	test.StrPtrMaxLen = &s
 	test.StrPtrLen = &s
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/it/it_test.go b/translations/it/it_test.go
@@ -211,6 +211,7 @@ func TestTranslations(t *testing.T) {
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
 	test.Datetime = "2008-Feb-01"
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/ja/ja_test.go b/translations/ja/ja_test.go
@@ -184,6 +184,7 @@ func TestTranslations(t *testing.T) {
 	s := "toolong"
 	test.StrPtrMaxLen = &s
 	test.StrPtrLen = &s
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/nl/nl_test.go b/translations/nl/nl_test.go
@@ -184,6 +184,7 @@ func TestTranslations(t *testing.T) {
 	s := "toolong"
 	test.StrPtrMaxLen = &s
 	test.StrPtrLen = &s
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/pt/pt_test.go b/translations/pt/pt_test.go
@@ -199,6 +199,7 @@ func TestTranslations(t *testing.T) {
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
 	test.Datetime = "2008-Feb-01"
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/pt_BR/pt_BR_test.go b/translations/pt_BR/pt_BR_test.go
@@ -186,6 +186,7 @@ func TestTranslations(t *testing.T) {
 	s := "toolong"
 	test.StrPtrMaxLen = &s
 	test.StrPtrLen = &s
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/ru/ru_test.go b/translations/ru/ru_test.go
@@ -218,6 +218,7 @@ func TestTranslations(t *testing.T) {
 
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/tr/tr_test.go b/translations/tr/tr_test.go
@@ -190,6 +190,7 @@ func TestTranslations(t *testing.T) {
 
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/vi/vi_test.go b/translations/vi/vi_test.go
@@ -200,6 +200,7 @@ func TestTranslations(t *testing.T) {
 	test.UniqueSlice = []string{"1234", "1234"}
 	test.UniqueMap = map[string]string{"key1": "1234", "key2": "1234"}
 	test.Datetime = "2008-Feb-01"
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/zh/zh_test.go b/translations/zh/zh_test.go
@@ -205,6 +205,7 @@ func TestTranslations(t *testing.T) {
 	test.UppercaseString = "abcdefg"
 
 	test.Datetime = "20060102"
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)

diff --git a/translations/zh_tw/zh_tw_test.go b/translations/zh_tw/zh_tw_test.go
@@ -187,6 +187,7 @@ func TestTranslations(t *testing.T) {
 	test.StrPtrLen = &s
 
 	test.Datetime = "2008-Feb-01"
+	test.HexadecimalString = "xyz"
 
 	err = validate.Struct(test)
 	NotEqual(t, err, nil)