lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 15:36:41 -05:00
Code Issues Releases Wiki Activity

Merge pull request #758 from sunshineplan/master

Browse Source 
完善HTTP基本认证
This commit is contained in:
DarienRaymond 2017-12-05 21:32:58 +01:00 committed by GitHub
commit 82009c869e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proxy/http/server.go
View File

@ -120,12 +120,9 @@ Start:
if len(s.config.Accounts) > 0 { if len(s.config.Accounts) > 0 {
user, pass, ok := parseBasicAuth(request.Header.Get("Proxy-Authorization")) user, pass, ok := parseBasicAuth(request.Header.Get("Proxy-Authorization"))
if !ok { if !ok || !s.config.HasAccount(user, pass) {
_, err := conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\n\r\n")) _, err := conn.Write([]byte("HTTP/1.1 407 Proxy Authentication Required\r\n" +
return err "Proxy-Authenticate: Basic realm=\"V2Ray\"\r\n\r\n"))
}
if !s.config.HasAccount(user, pass) {
_, err := conn.Write([]byte("HTTP/1.1 401 UNAUTHORIZED\r\n\r\n"))
return err return err
} }
} }

2
testing/scenarios/http_test.go
View File

@ -284,7 +284,7 @@ func TestHttpBasicAuth(t *testing.T) {
setProxyBasicAuth(req, "a", "c") setProxyBasicAuth(req, "a", "c")
resp, err := client.Do(req) resp, err := client.Do(req)
assert(err, IsNil) assert(err, IsNil)
assert(resp.StatusCode, Equals, 401) assert(resp.StatusCode, Equals, 407)
} }
{ {