fix: revert to old validation regex and add more test cases

Author: fira42073

regexes.go

@@ -68,7 +68,7 @@ const (
 	hTMLRegexString                  = `<[/]?([a-zA-Z]+).*?>`
 	jWTRegexString                   = "^[A-Za-z0-9-_]+\\.[A-Za-z0-9-_]+\\.[A-Za-z0-9-_]*$"
 	splitParamsRegexString           = `'[^']*'|\S+`
-	bicRegexString                   = `^(?:[A-Z]{4}|[A-Z][0-9]{3})[A-Z]{2}[A-Z0-9]{2}(?:[A-Z0-9]{3})?$`
+	bicRegexString                   = `^[A-Z0-9]{4}[A-Z]{2}[A-Z0-9]{2}(?:[A-Z0-9]{3})?$`
 	semverRegexString                = `^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$` // numbered capture groups https://semver.org/
 	dnsRegexStringRFC1035Label       = "^[a-z]([-a-z0-9]*[a-z0-9])?$"
 	cveRegexString                   = `^CVE-(1999|2\d{3})-(0[^0]\d{2}|0\d[^0]\d{1}|0\d{2}[^0]|[1-9]{1}\d{3,})$` // CVE Format Id https://cve.mitre.org/cve/identifiers/syntaxchange.html

validator_test.go

@@ -13214,11 +13214,44 @@ func TestBicIsoFormatValidation(t *testing.T) {
 		{"SBICKEN1YYP", "bic", true},
 		{"E097AEXX", "bic", true}, // valid under https://www.iso.org/standard/84108.html
 		{"SBIC23NXXX", "bic", false},
-		{"S23CKENXXXX", "bic", false},
+		{"S23CKENXXXX", "bic", true},
 		{"SBICKENXX", "bic", false},
 		{"SBICKENXX9", "bic", false},
 		{"SBICKEN13458", "bic", false},
 		{"SBICKEN", "bic", false},
+		{"DEUTDEFF", "bic", true},         // 8-char classic (Germany)
+		{"DEUTDEFF500", "bic", true},      // 11-char with numeric branch
+		{"A1B2US33", "bic", true},         // digits allowed in 4!c (bank code)
+		{"1234US33", "bic", true},         // all digits in 4!c (2022)
+		{"ZZZ1USAA", "bic", true},         // mixed alnum bank + alnum location
+		{"AB12AE00", "bic", true},         // UAE 8-char
+		{"AB12AE009Z9", "bic", true},      // UAE 11-char with mixed branch
+		{"WG11US335AB", "bic", true},      // example-style with digits in branch
+		{"BNPAFRPP", "bic", true},         // France (BNP Paribas style)
+		{"BOFAUS3NXXX", "bic", true},      // US with default XXX branch
+		{"HSBCHKHHXXX", "bic", true},      // Hong Kong, default branch
+		{"NEDSZAJJ", "bic", true},         // South Africa 8-char
+		{"BARCGB22", "bic", true},         // GB 8-char
+		{"BARCGB22XXX", "bic", true},      // GB 11-char with XXX branch
+		{"0000GB00", "bic", true},         // 4!c all digits + 2!c all digits (allowed)
+		{"A1B2GB00XXX", "bic", true},      // valid 11-char with numeric location and XXX
+		{"TATRAEBX", "bic", true},         // UAE 8-char
+		{"TATRSABX", "bic", true},         // Saudi 8-char
+		{"TATREGBX", "bic", true},         // Egypt 8-char
+		{"TATRBHBX", "bic", true},         // Bahrain 8-char
+		
+		{"DEUTDEFFF", "bic", false},       // 9-char (invalid length)
+		{"DEUTDEFF5", "bic", false},       // 9-char (invalid length)
+		{"DEUTDE", "bic", false},          // 6-char (invalid length)
+		{"DEUTDEFF50", "bic", false},      // 10-char (invalid length)
+		{"DEUTDEFF5000", "bic", false},    // 12-char (invalid length)
+		{"deUTDEFF", "bic", false},        // lowercase not allowed
+		{"DEUTDEfF", "bic", false},        // lowercase in location
+		{"DEU@DEFF", "bic", false},        // special char in bank
+		{"ABCD12FF", "bic", false},        // digits in 2!a country (invalid)
+		{"ABCDDE1-", "bic", false},        // hyphen in location
+		{"ABCDDE1_", "bic", false},        // underscore in location
+		{"ABCDDE١٢", "bic", false},        // non-ASCII digits in location
 	}
 
 	validate := New()