mirror of
https://github.com/steveiliop56/tinyauth.git
synced 2025-10-28 04:35:40 +00:00
fix: ignore new lines in password file
This commit is contained in:
@@ -2,7 +2,6 @@ package cmd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
cmd "tinyauth/cmd/user"
|
cmd "tinyauth/cmd/user"
|
||||||
"tinyauth/internal/api"
|
"tinyauth/internal/api"
|
||||||
"tinyauth/internal/auth"
|
"tinyauth/internal/auth"
|
||||||
@@ -48,7 +47,7 @@ var rootCmd = &cobra.Command{
|
|||||||
log.Info().Msg("Reading users from file")
|
log.Info().Msg("Reading users from file")
|
||||||
usersFromFile, readErr := utils.GetUsersFromFile(config.UsersFile)
|
usersFromFile, readErr := utils.GetUsersFromFile(config.UsersFile)
|
||||||
HandleError(readErr, "Failed to read users from file")
|
HandleError(readErr, "Failed to read users from file")
|
||||||
usersFromFileParsed := strings.Join(strings.Split(usersFromFile, "\n"), ",")
|
usersFromFileParsed := utils.ParseFileToLine(usersFromFile)
|
||||||
if usersString != "" {
|
if usersString != "" {
|
||||||
usersString = usersString + "," + usersFromFileParsed
|
usersString = usersString + "," + usersFromFileParsed
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -59,3 +59,18 @@ func GetUsersFromFile(usersFile string) (string, error) {
|
|||||||
|
|
||||||
return string(data), nil
|
return string(data), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ParseFileToLine(content string) string {
|
||||||
|
lines := strings.Split(content, "\n")
|
||||||
|
users := make([]string, 0)
|
||||||
|
|
||||||
|
for _, line := range lines {
|
||||||
|
if strings.TrimSpace(line) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
users = append(users, line)
|
||||||
|
}
|
||||||
|
|
||||||
|
return strings.Join(users, ",")
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user