cy/goproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
arraykeys
2018-05-08 08:45:29 +08:00
parent cf2e6f9ff0
commit bffd5891cc
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
services/sps.go
View File

@ -312,14 +312,16 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) {
//ask parent for connect to target address
if *s.cfg.ParentServiceType == "http" {
//http parent
isHTTPS:=false
pb := new(bytes.Buffer)
if len(forwardBytes) > 0 {
pb.Write(forwardBytes)
pb.WriteString("\r\nProxy-Connection: Keep-Alive\r\n")
forwardBytes=nil
}else{
pb.Write([]byte(fmt.Sprintf("CONNECT %s HTTP/1.1\r\nProxy-Connection: Keep-Alive\r\n", address)))
if len(forwardBytes) == 0 {
isHTTPS=true
pb.Write([]byte(fmt.Sprintf("CONNECT %s HTTP/1.1", address)))
}
pb.WriteString("\r\nProxy-Connection: Keep-Alive\r\n")
s.log.Printf("before bytes:%s",string(forwardBytes))
//Proxy-Authorization:\r\n
u := ""
if *s.cfg.ParentAuth != "" {
@ -337,7 +339,22 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) {
if u != "" {
pb.Write([]byte(fmt.Sprintf("Proxy-Authorization:Basic %s\r\n", base64.StdEncoding.EncodeToString([]byte(u)))))
}
if isHTTPS{
pb.Write([]byte("\r\n"))
}else{
//do remove some headers with forwardBytes
//forwardBytes
forwardBytes=bytes.Replace(forwardBytes,[]byte("\r\n"),[]byte(pb.Bytes()),1)
pb.Reset()
pb.Write(forwardBytes)
if !bytes.Contains(forwardBytes,[]byte("\r\n\r\n\r\n")){
pb.Write([]byte("\r\n\r\n"))
}
forwardBytes=nil
}
outConn.SetDeadline(time.Now().Add(time.Millisecond * time.Duration(*s.cfg.Timeout)))
_, err = outConn.Write(pb.Bytes())
outConn.SetDeadline(time.Time{})
@ -347,6 +364,11 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) {
utils.CloseConn(&outConn)
return
}
s.log.Printf("ishttps:%v",isHTTPS)
s.log.Printf("bytes:%s",string(pb.Bytes()))
if isHTTPS{
reply := make([]byte, 1024)
outConn.SetDeadline(time.Now().Add(time.Millisecond * time.Duration(*s.cfg.Timeout)))
_, err = outConn.Read(reply)
@ -358,6 +380,7 @@ func (s *SPS) OutToTCP(inConn *net.Conn) (err error) {
return
}
//s.log.Printf("reply: %s", string(reply[:n]))
}
} else {
s.log.Printf("connect %s", address)
//socks client