1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-27 20:45:28 -05:00

fix http basic auth. fix #659

This commit is contained in:
Darien Raymond
2017-10-28 14:25:22 +02:00
parent 02685094d3
commit 100391fdb7
2 changed files with 27 additions and 3 deletions

View File

@@ -3,6 +3,7 @@ package http
import (
"bufio"
"context"
"encoding/base64"
"io"
"net/http"
"runtime"
@@ -69,6 +70,23 @@ func isTimeout(err error) bool {
return ok && nerr.Timeout()
}
func parseBasicAuth(auth string) (username, password string, ok bool) {
const prefix = "Basic "
if !strings.HasPrefix(auth, prefix) {
return
}
c, err := base64.StdEncoding.DecodeString(auth[len(prefix):])
if err != nil {
return
}
cs := string(c)
s := strings.IndexByte(cs, ':')
if s < 0 {
return
}
return cs[:s], cs[s+1:], true
}
func (s *Server) Process(ctx context.Context, network net.Network, conn internet.Connection, dispatcher dispatcher.Interface) error {
reader := bufio.NewReaderSize(conn, 2048)
@@ -85,7 +103,7 @@ Start:
}
if len(s.config.Accounts) > 0 {
user, pass, ok := request.BasicAuth()
user, pass, ok := parseBasicAuth(request.Header.Get("Proxy-Authorization"))
if !ok || !s.config.HasAccount(user, pass) {
_, err := conn.Write([]byte("HTTP/1.1 401 UNAUTHORIZED\r\n\r\n"))
return err