htpasswd: implement routines for working with .htpasswd

Signed-off-by: Nagy Károly Gábriel <k@jpi.io>

htpasswd/htpasswd.go

@@ -142,26 +142,20 @@ func DeleteUser(file, user string) error {
 }
 
 // VerifyUser will check if the given user and password are matching
-// with the content of the given file
+// with the contect of the given file
 func VerifyUser(file, user, passwd string) error {
 	pp, err := ParseHtpasswdFile(file)
 	if err != nil {
 		return err
 	}
-	return pp.Verify(user, passwd)
+	if _, ok := pp[user]; !ok {
-}
-
-// Verify will check if the given user and password are matching
-// with the given Passwd object content
-func (pp *Passwds) Verify(user, passwd string) error {
-	if _, ok := (*pp)[user]; !ok {
 		return fmt.Errorf("user %s does not exist", user)
 	}
-	alg, err := identifyHash((*pp)[user])
+	alg, err := identifyHash(pp[user])
 	if err != nil {
 		return fmt.Errorf("cannot identify algo %v", alg)
 	}
-	return verifyPass(passwd, (*pp)[user], alg)
+	return verifyPass(passwd, pp[user], alg)
 }
 
 func verifyPass(pass, hash string, alg HashAlgorithm) error {
@@ -245,8 +239,7 @@ func (pp *Passwds) toByte() []byte {
 
 func identifyHash(h string) (HashAlgorithm, error) {
 	switch {
-	case strings.HasPrefix(h, "$2a$"), strings.HasPrefix(h, "$2y$"),
+	case strings.HasPrefix(h, "$2a$"), strings.HasPrefix(h, "$2y$"), strings.HasPrefix(h, "$2x$"), strings.HasPrefix(h, "$2b$"):
-		strings.HasPrefix(h, "$2x$"), strings.HasPrefix(h, "$2b$"):
 		return HashBCrypt, nil
 	case strings.HasPrefix(h, "$apr1$"):
 		return HashAPR1, nil

htpasswd/htpasswd_test.go

@@ -72,19 +72,3 @@ func TestVerifyPassword(t *testing.T) {
 		}
 	}
 }
-
-func TestVerify(t *testing.T) {
-	f, err := os.Stat("htpasswd_testdata")
-	if err != nil {
-		TestCreateUser(t)
-	}
-
-	pp, err := ParseHtpasswdFile(f.Name())
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = pp.Verify("bcrypt", "123456@")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-}