From 0fb985026f1084534b924d7e65085cdd94c047b2 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@jpi.io>
Date: Fri, 29 Sep 2023 19:14:05 +0000
Subject: [PATCH] htpasswd: clean up parser

Signed-off-by: Alejandro Mery <amery@jpi.io>
---
 htpasswd/htpasswd.go | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/htpasswd/htpasswd.go b/htpasswd/htpasswd.go
index dd402a5..3706236 100644
--- a/htpasswd/htpasswd.go
+++ b/htpasswd/htpasswd.go
@@ -2,7 +2,6 @@
 package htpasswd
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"strings"
@@ -36,29 +35,29 @@ func Parse(htpasswdBytes []byte) (Passwds, error) {
 	var err error
 
 	for lineNumber, line := range lines {
-		line = strings.Trim(line, " ")
+		line = strings.TrimSpace(line)
 		if len(line) == 0 {
 			// skipping empty lines
 			continue
 		}
 
-		parts := strings.Split(line, ":")
-		if ok, err := validLine(parts, lineNumber, line); !ok {
+		user, password, err := splitLine(line, lineNumber)
+		if err != nil {
 			return passwords, err
 		}
 
-		parts = trimParts(parts)
-		_, exists := passwords[parts[0]]
-
+		_, exists := passwords[user]
 		if exists {
 			err = &UserError{
-				Name: parts[0],
+				Name: user,
 				Err:  ErrExists,
 			}
 			return passwords, err
 		}
-		passwords[parts[0]] = parts[1]
+
+		passwords[user] = password
 	}
+
 	return passwords, err
 }
 
@@ -218,20 +217,18 @@ func identifyHash(h string) Hasher {
 	}
 }
 
-func validLine(parts []string, lineNumber int, line string) (bool, error) {
-	var err error
-	if len(parts) != 2 {
-		err = errors.New(fmt.Sprintln("invalid line", lineNumber+1,
-			"unexpected number of parts split by", ":", len(parts),
-			"instead of 2 in\"", line, "\""))
-		return false, err
+func splitLine(line string, lineNumber int) (user, password string, err error) {
+	user, password, ok := strings.Cut(line, ":")
+	if !ok {
+		return "", "", fmt.Errorf("invalid line %v", lineNumber+1)
 	}
-	return true, nil
-}
 
-func trimParts(parts []string) []string {
-	for i, part := range parts {
-		parts[i] = strings.Trim(part, " ")
+	user = strings.TrimSpace(user)
+	password = strings.TrimSpace(password)
+
+	if h := identifyHash(password); h != nil {
+		return "", "", fmt.Errorf("invalid algorithm on line %v", lineNumber+1)
 	}
-	return parts
+
+	return user, password, nil
 }