mirrors/wireproxy
1
0
Fork 0
mirror of https://github.com/whyvl/wireproxy.git synced 2025-04-29 19:01:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix HTTP proxy authentication to support both preemptive and challenge-response auth

Browse source
This commit is contained in:
Luiz Henrique Gomes Palacio 2024-08-28 17:42:18 -03:00
parent cb1f39b3e5
commit 2132d15266
No known key found for this signature in database
GPG key ID: E284AFD090893FF6
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
http.go
View file

@ -31,7 +31,10 @@ func (s *HTTPServer) authenticate(req *http.Request) (int, error) {
}
auth := req.Header.Get(proxyAuthHeaderKey)
if auth != "" {
if auth == "" {
return http.StatusProxyAuthRequired, fmt.Errorf(http.StatusText(http.StatusProxyAuthRequired))
}
enc := strings.TrimPrefix(auth, "Basic ")
str, err := base64.StdEncoding.DecodeString(enc)
if err != nil {
@ -47,9 +50,6 @@ func (s *HTTPServer) authenticate(req *http.Request) (int, error) {
return http.StatusUnauthorized, fmt.Errorf("username and password not matching")
}
return http.StatusProxyAuthRequired, fmt.Errorf(http.StatusText(http.StatusProxyAuthRequired))
}
func (s *HTTPServer) handleConn(req *http.Request, conn net.Conn) (peer net.Conn, err error) {
addr := req.Host
if !strings.Contains(addr, ":") {
@ -103,7 +103,11 @@ func (s *HTTPServer) serve(conn net.Conn) {
code, err := s.authenticate(req)
if err != nil {
_ = responseWith(req, code).Write(conn)
resp := responseWith(req, code)
if code == http.StatusProxyAuthRequired {
resp.Header.Set("Proxy-Authenticate", "Basic realm=\"Proxy\"")
}
_ = resp.Write(conn)
log.Println(err)
return
}