Allow usersFile comments

This commit is contained in:
Demian
2018-11-12 17:28:04 +01:00
committed by Traefiker Bot
parent b889b0191c
commit 69585c58cd
2 changed files with 12 additions and 1 deletions

View File

@@ -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)
}
}

View File

@@ -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 {