From 69585c58cd58163eebd9d594603b69ec413f4c72 Mon Sep 17 00:00:00 2001 From: Demian Date: Mon, 12 Nov 2018 17:28:04 +0100 Subject: [PATCH] Allow usersFile comments --- middlewares/auth/authenticator.go | 2 +- middlewares/auth/authenticator_test.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/middlewares/auth/authenticator.go b/middlewares/auth/authenticator.go index 8e2491605..8b1c63bf3 100644 --- a/middlewares/auth/authenticator.go +++ b/middlewares/auth/authenticator.go @@ -134,7 +134,7 @@ func getLinesFromFile(filename string) ([]string, error) { var filteredLines []string for _, rawLine := range rawLines { line := strings.TrimSpace(rawLine) - if line != "" { + if line != "" && !strings.HasPrefix(line, "#") { filteredLines = append(filteredLines, line) } } diff --git a/middlewares/auth/authenticator_test.go b/middlewares/auth/authenticator_test.go index 360148600..cb58203a5 100644 --- a/middlewares/auth/authenticator_test.go +++ b/middlewares/auth/authenticator_test.go @@ -45,6 +45,17 @@ func TestAuthUsersFromFile(t *testing.T) { return parserDigestUsers(digest) }, }, + { + authType: "basic", + usersStr: "#Comment\ntest:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/\ntest2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0\n", + userKeys: []string{"test", "test2"}, + parserFunc: func(fileName string) (map[string]string, error) { + basic := &types.Basic{ + UsersFile: fileName, + } + return parserBasicUsers(basic) + }, + }, } for _, test := range tests {