Merge pull request #401 from ygj6/add_sha3_hash_validate
add sha3 hash validate
diff --git a/validator.go b/validator.go
index 5f607db..d3afd8d 100644
--- a/validator.go
+++ b/validator.go
@@ -673,11 +673,13 @@
len = "40"
} else if algo == "tiger192" {
len = "48"
- } else if algo == "sha256" {
+ } else if algo == "sha3-224" {
+ len = "56"
+ } else if algo == "sha256" || algo == "sha3-256" {
len = "64"
- } else if algo == "sha384" {
+ } else if algo == "sha384" || algo == "sha3-384" {
len = "96"
- } else if algo == "sha512" {
+ } else if algo == "sha512" || algo == "sha3-512" {
len = "128"
} else {
return false
@@ -686,6 +688,26 @@
return Matches(str, "^[a-f0-9]{"+len+"}$")
}
+// IsSHA3224 checks is a string is a SHA3-224 hash. Alias for `IsHash(str, "sha3-224")`
+func IsSHA3224(str string) bool {
+ return IsHash(str, "sha3-224")
+}
+
+// IsSHA3256 checks is a string is a SHA3-256 hash. Alias for `IsHash(str, "sha3-256")`
+func IsSHA3256(str string) bool {
+ return IsHash(str, "sha3-256")
+}
+
+// IsSHA3384 checks is a string is a SHA3-384 hash. Alias for `IsHash(str, "sha3-384")`
+func IsSHA3384(str string) bool {
+ return IsHash(str, "sha3-384")
+}
+
+// IsSHA3512 checks is a string is a SHA3-512 hash. Alias for `IsHash(str, "sha3-512")`
+func IsSHA3512(str string) bool {
+ return IsHash(str, "sha3-512")
+}
+
// IsSHA512 checks is a string is a SHA512 hash. Alias for `IsHash(str, "sha512")`
func IsSHA512(str string) bool {
return IsHash(str, "sha512")
diff --git a/validator_test.go b/validator_test.go
index c78c8ca..012c6dc 100644
--- a/validator_test.go
+++ b/validator_test.go
@@ -625,6 +625,14 @@
{"46fc0125a148788a3ac1d649566fc04eb84a746f1a6e4fa7", "tiger192", true},
{"46fc0125a148788a3ac1d649566fc04eb84a746f1a6$$%@^", "TIGER192", false},
{"46fc0125a148788a3ac1d649566fc04eb84a746f1a6$$%@^", "SOMEHASH", false},
+ {"b87f88c72702fff1748e58b87e9141a42c0dbedc29a78cb0d4a5cd81", "sha3-224", true},
+ {"b87f88c72702fff1748e58b87e9141a42c0dbedc29a78cb0d4a5cd81g", "sha3-224", false},
+ {"3338be694f50c5f338814986cdf0686453a888b84f424d792af4b9202398f392", "sha3-256", true},
+ {"3338be694f50c5f338814986cdf0686453a888b84f424d792af4b9202398f392g", "sha3-256", false},
+ {"720aea11019ef06440fbf05d87aa24680a2153df3907b23631e7177ce620fa1330ff07c0fddee54699a4c3ee0ee9d887", "sha3-384", true},
+ {"720aea11019ef06440fbf05d87aa24680a2153df3907b23631e7177ce620fa1330ff07c0fddee54699a4c3ee0ee9d88", "sha3-384", false},
+ {"75d527c368f2efe848ecf6b073a36767800805e9eef2b1857d5f984f036eb6df891d75f72d9b154518c1cd58835286d1da9a38deba3de98b5a53e5ed78a84976", "sha3-512", true},
+ {"75d527c368f2efe848ecf6b073a36767800805e9eef2b1857d5f984f036eb6df891d75f72d9b154518c1cd58835286d1da9a38deba3de98b5a53e5ed78a8497", "sha3-512", false},
}
for _, test := range tests {
actual := IsHash(test.param, test.algo)
@@ -634,6 +642,78 @@
}
}
+func TestIsSHA3224(t *testing.T) {
+ t.Parallel()
+
+ var tests = []struct {
+ param string
+ expected bool
+ }{
+ {"b87f88c72702fff1748e58b87e9141a42c0dbedc29a78cb0d4a5cd81", true},
+ {"b87f88c72702fff1748e58b87e9141a42c0dbedc29a78cb0d4a5cd81g", false},
+ }
+ for _, test := range tests {
+ actual := IsSHA3224(test.param)
+ if actual != test.expected {
+ t.Errorf("Expected IsSHA3224(%q) to be %v, got %v", test.param, test.expected, actual)
+ }
+ }
+}
+
+func TestIsSHA3256(t *testing.T) {
+ t.Parallel()
+
+ var tests = []struct {
+ param string
+ expected bool
+ }{
+ {"3338be694f50c5f338814986cdf0686453a888b84f424d792af4b9202398f392", true},
+ {"3338be694f50c5f338814986cdf0686453a888b84f424d792af4b9202398f39", false},
+ }
+ for _, test := range tests {
+ actual := IsSHA3256(test.param)
+ if actual != test.expected {
+ t.Errorf("Expected IsSHA3256(%q) to be %v, got %v", test.param, test.expected, actual)
+ }
+ }
+}
+
+func TestIsSHA3384(t *testing.T) {
+ t.Parallel()
+
+ var tests = []struct {
+ param string
+ expected bool
+ }{
+ {"720aea11019ef06440fbf05d87aa24680a2153df3907b23631e7177ce620fa1330ff07c0fddee54699a4c3ee0ee9d887", true},
+ {"720aea11019ef06440fbf05d87aa24680a2153df3907b23631e7177ce620fa1330ff07c0fddee54699a4c3ee0ee9d88", false},
+ }
+ for _, test := range tests {
+ actual := IsSHA3384(test.param)
+ if actual != test.expected {
+ t.Errorf("Expected IsSHA3384(%q) to be %v, got %v", test.param, test.expected, actual)
+ }
+ }
+}
+
+func TestIsSHA3512(t *testing.T) {
+ t.Parallel()
+
+ var tests = []struct {
+ param string
+ expected bool
+ }{
+ {"75d527c368f2efe848ecf6b073a36767800805e9eef2b1857d5f984f036eb6df891d75f72d9b154518c1cd58835286d1da9a38deba3de98b5a53e5ed78a84976", true},
+ {"75d527c368f2efe848ecf6b073a36767800805e9eef2b1857d5f984f036eb6df891d75f72d9b154518c1cd58835286d1da9a38deba3de98b5a53e5ed78a8497", false},
+ }
+ for _, test := range tests {
+ actual := IsSHA3512(test.param)
+ if actual != test.expected {
+ t.Errorf("Expected IsSHA3512(%q) to be %v, got %v", test.param, test.expected, actual)
+ }
+ }
+}
+
func TestIsExistingEmail(t *testing.T) {
t.Parallel()
