From 2258cd248bc8b8cb1ca2ac8018841d43b91078ea Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Sun, 8 Oct 2023 11:39:32 +0800
Subject: [PATCH] chore: improve naive auth logical

---
 inbound/naive.go | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/inbound/naive.go b/inbound/naive.go
index 7542ae0c..6fcc1717 100644
--- a/inbound/naive.go
+++ b/inbound/naive.go
@@ -2,7 +2,6 @@ package inbound
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/binary"
 	"io"
 	"math/rand"
@@ -139,16 +138,13 @@ func (n *Naive) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 		n.badRequest(ctx, request, E.New("missing naive padding"))
 		return
 	}
-	var authOk bool
-	var userName string
-	authorization := request.Header.Get("Proxy-Authorization")
-	if strings.HasPrefix(authorization, "BASIC ") || strings.HasPrefix(authorization, "Basic ") {
-		userPassword, _ := base64.URLEncoding.DecodeString(authorization[6:])
-		userPswdArr := strings.SplitN(string(userPassword), ":", 2)
-		userName = userPswdArr[0]
-		authOk = n.authenticator.Verify(userPswdArr[0], userPswdArr[1])
+	// HACK: reuse go builtin basic auth parsing
+	request.Header.Set("Authorization", request.Header.Get("Proxy-Authorization"))
+	userName, password, ok := request.BasicAuth()
+	if ok {
+		ok = n.authenticator.Verify(userName, password)
 	}
-	if !authOk {
+	if !ok {
 		rejectHTTP(writer, http.StatusProxyAuthRequired)
 		n.badRequest(ctx, request, E.New("authorization failed"))
 		return