add tests

internal/auth.go

@@ -167,10 +167,10 @@ func useAuthDomain(r *http.Request) (bool, string) {
 // Cookie methods
 
 // MakeCookie creates an auth cookie
-func MakeCookie(r *http.Request, email string) *http.Cookie {
+func MakeCookie(r *http.Request, user string) *http.Cookie {
 	expires := cookieExpiry()
-	mac := cookieSignature(r, email, fmt.Sprintf("%d", expires.Unix()))
-	value := fmt.Sprintf("%s|%d|%s", mac, expires.Unix(), email)
+	mac := cookieSignature(r, user, fmt.Sprintf("%d", expires.Unix()))
+	value := fmt.Sprintf("%s|%d|%s", mac, expires.Unix(), user)
 
 	return &http.Cookie{
 		Name:     config.CookieName,

internal/auth_test.go

@@ -78,6 +78,12 @@ func TestAuthValidateUser(t *testing.T) {
 	v = ValidateUser("[email protected]", "default")
 	assert.True(v, "should allow user from allowed domain")
 
+	// Should block non whitelisted email address
+	config.Domains = []string{}
+	config.Whitelist = []string{"[email protected]"}
+	v = ValidateUser("[email protected]", "default")
+	assert.False(v, "should not allow user not in whitelist")
+
 	// Should allow matching whitelisted email address
 	config.Domains = []string{}
 	config.Whitelist = []string{"[email protected]"}
@@ -91,6 +97,10 @@ func TestAuthValidateUser(t *testing.T) {
 	config.Domains = []string{"example.com"}
 	config.Whitelist = []string{"[email protected]"}
 	config.MatchWhitelistOrDomain = false
+	v = ValidateUser("[email protected]", "default")
+	assert.True(v, "should allow user in whitelist")
+	v = ValidateUser("[email protected]", "default")
+	assert.False(v, "should not allow user from valid domain")
 	v = ValidateUser("[email protected]", "default")
 	assert.False(v, "should not allow user not in either")
 	v = ValidateUser("[email protected]", "default")
@@ -109,6 +119,8 @@ func TestAuthValidateUser(t *testing.T) {
 	assert.True(v, "should allow user from allowed domain")
 	v = ValidateUser("[email protected]", "default")
 	assert.True(v, "should allow user in whitelist")
+	v = ValidateUser("[email protected]", "default")
+	assert.True(v, "should allow user from valid domain")
 
 	// Rule testing
 
@@ -138,6 +150,10 @@ func TestAuthValidateUser(t *testing.T) {
 	v = ValidateUser("[email protected]", "test")
 	assert.True(v, "should allow user from allowed domain")
 
+	// Should allow comma separated email
+	config.Whitelist = []string{"[email protected]", "[email protected]"}
+	v = ValidateUser("[email protected]", "default")
+
 	// Should allow matching whitelist in rule
 	config.Domains = []string{}
 	config.Whitelist = []string{"[email protected]"}