Added Argon2 validator

baked_in.go

@@ -233,6 +233,7 @@ var (
 		"mongodb":                       isMongoDB,
 		"cron":                          isCron,
 		"spicedb":                       isSpiceDB,
+		"argon2":                        isArgon2,
 	}
 )
 
@@ -2953,3 +2954,23 @@ func isCron(fl FieldLevel) bool {
 	cronString := fl.Field().String()
 	return cronRegex.MatchString(cronString)
 }
+
+// isArgon2 is the validation function for validating if the field's value is a valid Argon2.
+func isArgon2(fl FieldLevel) bool {
+	val := fl.Field().String()
+	res := argon2Regex.MatchString(val)
+	if !res {
+		return false
+	}
+
+	sp := strings.Split(val, "$")
+	if strings.Count(sp[4], "+") > 1 || strings.Count(sp[4], "/") > 1 {
+		return false
+	}
+
+	if strings.Count(sp[5], "+") > 1 || strings.Count(sp[5], "/") > 1 {
+		return false
+	}
+
+	return true
+}

regexes.go

@@ -72,6 +72,7 @@ const (
 	spicedbIDRegexString             = `^(([a-zA-Z0-9/_|\-=+]{1,})|\*)$`
 	spicedbPermissionRegexString     = "^([a-z][a-z0-9_]{1,62}[a-z0-9])?$"
 	spicedbTypeRegexString           = "^([a-z][a-z0-9_]{1,61}[a-z0-9]/)?[a-z][a-z0-9_]{1,62}[a-z0-9]$"
+	argon2RegexString                = "^\\$argon2(?:i|d|id)\\$v=(?:16|19)\\$m=(?:[\\d]+),t=(?:[\\d]+),p=(?:[\\d]+)\\$(?:[A-Za-z0-9+/]+)\\$(?:[A-Za-z0-9+/]+)$"
 )
 
 var (
@@ -142,4 +143,5 @@ var (
 	spicedbIDRegex             = regexp.MustCompile(spicedbIDRegexString)
 	spicedbPermissionRegex     = regexp.MustCompile(spicedbPermissionRegexString)
 	spicedbTypeRegex           = regexp.MustCompile(spicedbTypeRegexString)
+	argon2Regex                = regexp.MustCompile(argon2RegexString)
 )

validator_test.go

@@ -13692,3 +13692,40 @@ func TestOmitNilAndRequired(t *testing.T) {
 		AssertError(t, err2, "OmitNil.Inner.Str", "OmitNil.Inner.Str", "Str", "Str", "required")
 	})
 }
+
+func TestArgon2Validation(t *testing.T) {
+	tests := []struct {
+		param    string
+		expected bool
+	}{
+		{"", false},
+		{"f16e171ea258bb62c7aa202ff77f9f10", false},
+		{"argon2id$v=19$m=16,t=2,p=1$YXNnYXNkZmdzZGZnc2Q$aMawMnEl0RKs+CJHr8Vd0Q", false},
+		{"$argon2$v=19$m=16,t=2,p=1$YXNnYXNkZmdzZGZnc2Q$aMawMnEl0RKs+CJHr8Vd0Q", false},
+		{"$argon2$v=19$m=8,t=2,p=1$YXNzZGZmZGdzZGZnc2Rhcw$8W4XHqJYu2LHqiAv93++fEA+", false},
+		{"$argon2d$v=19$m=16,t=2,p=1$YXNnYXNkZmdzZGZnc2Q$WcFGx+WZ5sKl//W0NOissxQ", false},
+		{"$argon2d$v=19$m=16,t=2,p=1$YXNnYXNkZmdzZGZnc2Q$WcFGx+WZ5sKl/W0NOissxQ", true},
+		{"$argon2i$v=19$m=16,t=2,p=1$YXNnYXNkZmdzZGZnc2Q$+ieRkqJkcSa6vRuzajIKsA", true},
+		{"$argon2id$v=19$m=16,t=2,p=1$YXNnYXNkZmdzZGZnc2Q$aMawMnEl0RKs+CJHr8Vd0Q", true},
+	}
+
+	validate := New()
+
+	for i, test := range tests {
+		errs := validate.Var(test.param, "argon2")
+		if test.expected {
+			if !IsEqual(errs, nil) {
+				t.Fatalf("Index: %d Argon2 failed Error: %s", i, errs)
+			}
+		} else {
+			if IsEqual(errs, nil) {
+				t.Fatalf("Index: %d Argon2 failed Error: %s", i, errs)
+			} else {
+				val := getError(errs, "", "")
+				if val.Tag() != "argon2" {
+					t.Fatalf("Index: %d Argon2 failed Error: %s", i, errs)
+				}
+			}
+		}
+	}
+}