lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 17:46:58 -05:00
Code Issues Releases Wiki Activity

Merge pull request #685 from valture/ua-leak

Browse Source 
Prevent UA from being set to golang's default ones
This commit is contained in:
DarienRaymond 2017-11-05 22:30:43 +01:00 committed by GitHub
commit 71d34e7451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxy/http/server.go
View File

@ -212,6 +212,11 @@ func StripHopByHopHeaders(header http.Header) {
for _, h := range strings.Split(connections, ",") { for _, h := range strings.Split(connections, ",") {
header.Del(strings.TrimSpace(h)) header.Del(strings.TrimSpace(h))
} }
// Prevent UA from being set to golang's default ones
if len(header.Get("User-Agent")) == 0 {
header.Set("User-Agent", "")
}
} }
var errWaitAnother = newError("keep alive") var errWaitAnother = newError("keep alive")

3
proxy/http/server_test.go
View File

@ -22,7 +22,6 @@ Foo: foo
Bar: bar Bar: bar
Proxy-Connection: keep-alive Proxy-Connection: keep-alive
Proxy-Authenticate: abc Proxy-Authenticate: abc
User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; de-de) AppleWebKit/523.10.3 (KHTML, like Gecko) Version/3.0.4 Safari/523.10
Accept-Encoding: gzip Accept-Encoding: gzip
Accept-Charset: ISO-8859-1,UTF-8;q=0.7,*;q=0.7 Accept-Charset: ISO-8859-1,UTF-8;q=0.7,*;q=0.7
Cache-Control: no-cache Cache-Control: no-cache
@ -37,6 +36,7 @@ Accept-Language: de,en;q=0.7,en-us;q=0.3
assert(req.Header.Get("Connection"), Equals, "keep-alive,Foo, Bar") assert(req.Header.Get("Connection"), Equals, "keep-alive,Foo, Bar")
assert(req.Header.Get("Proxy-Connection"), Equals, "keep-alive") assert(req.Header.Get("Proxy-Connection"), Equals, "keep-alive")
assert(req.Header.Get("Proxy-Authenticate"), Equals, "abc") assert(req.Header.Get("Proxy-Authenticate"), Equals, "abc")
assert(req.Header.Get("User-Agent"), IsEmpty)
StripHopByHopHeaders(req.Header) StripHopByHopHeaders(req.Header)
assert(req.Header.Get("Connection"), IsEmpty) assert(req.Header.Get("Connection"), IsEmpty)
@ -44,4 +44,5 @@ Accept-Language: de,en;q=0.7,en-us;q=0.3
assert(req.Header.Get("Bar"), IsEmpty) assert(req.Header.Get("Bar"), IsEmpty)
assert(req.Header.Get("Proxy-Connection"), IsEmpty) assert(req.Header.Get("Proxy-Connection"), IsEmpty)
assert(req.Header.Get("Proxy-Authenticate"), IsEmpty) assert(req.Header.Get("Proxy-Authenticate"), IsEmpty)
assert(req.Header.Get("User-Agent"), IsEmpty)
} }