aes: get secret from file

1 files changed, 9 insertions, 11 deletions

diff --git a/pkg/server/hook/auth.go b/pkg/server/hook/auth.go
index 0f70d88..9c8ca35 100644
--- a/pkg/server/hook/auth.go
+++ b/pkg/server/hook/auth.go
@@ -68,19 +68,18 @@ func hashsum(args ...string) string {
 func getpass(f *os.File, salt string, user string) string {
 	f.Seek(0, 0)
 
+	match := func(s, t string) bool {
+		if salt == "" {
+			return s == t
+		}
+		return hashsum(salt, s) == t
+	}
+
 	for scanner := bufio.NewScanner(f); scanner.Scan(); {
 		splitted := strings.SplitN(scanner.Text(), "#", 2)
 		tokens := strings.Fields(splitted[0])
-		if len(tokens) > 1 {
-			if salt == "" {
-				if tokens[0] == user {
-					return tokens[1]
-				}
-			} else {
-				if hashsum(salt, tokens[0]) == user {
-					return tokens[1]
-				}
-			}
+		if len(tokens) > 1 && match(tokens[0], user) {
+			return tokens[1]
 		}
 	}
 
@@ -226,7 +225,6 @@ func (a *auth) Close() {
 
 func (h *authHook) New(env env.Env) (interface{}, error) {
 	file := env.Value("authfile")
-
 	if file == "" {
 		return nil, errors.New("no authfile configured")
 	}