sad (#510)

go/controller/validator.go

@@ -110,25 +110,24 @@ func ValidateEmail(
 		if len(parts) != 2 { //nolint:gomnd
 			return false
 		}
-
 		domain := parts[1]
 
-		if slices.Contains(blockedEmailDomains, domain) {
+		if slices.Contains(blockedEmails, email) {
 			return false
 		}
 
-		if slices.Contains(blockedEmails, email) {
-			return false
+		if slices.Contains(allowedEmails, email) {
+			return true
 		}
 
-		if len(allowedEmailDomains) > 0 && !slices.Contains(allowedEmailDomains, domain) {
+		if slices.Contains(blockedEmailDomains, domain) {
 			return false
 		}
 
-		if len(allowedEmails) > 0 && !slices.Contains(allowedEmails, email) {
-			return false
+		if slices.Contains(allowedEmailDomains, domain) {
+			return true
 		}
 
-		return true
+		return len(allowedEmailDomains) == 0 && len(allowedEmails) == 0
 	}
 }

go/controller/validator_test.go

@@ -258,6 +258,69 @@ func TestValidateEmail(t *testing.T) {
 			email:          "[email protected]",
 			expected:       false,
 		},
+		{
+			name:           "precedence - unrelated",
+			blockedDomains: []string{"blocked.com"},
+			blockedEmails:  []string{"[email protected]"},
+			allowedDomains: []string{"acme.com"},
+			allowedEmails:  []string{"[email protected]"},
+			email:          "[email protected]",
+			expected:       false,
+		},
+		{
+			name:           "precedence - allowed email",
+			blockedDomains: []string{"blocked.com"},
+			blockedEmails:  []string{"[email protected]"},
+			allowedDomains: []string{"acme.com"},
+			allowedEmails:  []string{"[email protected]"},
+			email:          "[email protected]",
+			expected:       true,
+		},
+		{
+			name:           "precedence - blocked email",
+			blockedDomains: []string{"blocked.com"},
+			blockedEmails:  []string{"[email protected]"},
+			allowedDomains: []string{"acme.com"},
+			allowedEmails:  []string{"[email protected]"},
+			email:          "[email protected]",
+			expected:       false,
+		},
+		{
+			name:           "precedence - blocked domain",
+			blockedDomains: []string{"blocked.com"},
+			blockedEmails:  []string{"[email protected]"},
+			allowedDomains: []string{"acme.com"},
+			allowedEmails:  []string{"[email protected]"},
+			email:          "[email protected]",
+			expected:       false,
+		},
+		{
+			name:           "precedence - allowed domain",
+			blockedDomains: []string{"blocked.com"},
+			blockedEmails:  []string{"[email protected]"},
+			allowedDomains: []string{"acme.com"},
+			allowedEmails:  []string{"[email protected]"},
+			email:          "[email protected]",
+			expected:       true,
+		},
+		{
+			name:           "blocking take precedence over allowing",
+			blockedDomains: []string{"acme.com"},
+			blockedEmails:  []string{"[email protected]"},
+			allowedDomains: []string{"acme.com"},
+			allowedEmails:  []string{"[email protected]"},
+			email:          "[email protected]",
+			expected:       false,
+		},
+		{
+			name:           "blocking take precedence over allowing",
+			blockedDomains: []string{"acme.com"},
+			blockedEmails:  []string{"[email protected]"},
+			allowedDomains: []string{"acme.com"},
+			allowedEmails:  []string{"[email protected]"},
+			email:          "[email protected]",
+			expected:       false,
+		},
 	}
 
 	for _, tc := range cases {