mirrors/SpoofDPI
1
0
Fork 0
mirror of https://github.com/xvzc/SpoofDPI.git synced 2024-12-22 22:36:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from xvzc/conn

Browse Source 
add go routines for handlers, fixed http handler
This commit is contained in:
Kwanghoo Park 2022-01-14 17:25:04 +09:00 committed by GitHub
commit 1b561eff3d
2 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
net/conn.go
View File

@ -78,33 +78,24 @@ func (lConn *Conn) HandleHttp(p packet.HttpPacket) {
} }
log.Debug("[HTTP] Found ip over HTTPS: ", ip) log.Debug("[HTTP] Found ip over HTTPS: ", ip)
rConn, err := Dial("tcp", ip+":80") // create connection to server // Create connection to server
rConn, err := Dial("tcp", ip+":80")
if err != nil { if err != nil {
log.Debug(err) log.Debug("[HTTPS] ", err)
return return
} }
defer rConn.Close()
if _, err := rConn.Write(p.Raw()); err != nil { log.Debug("[HTTP] Connected to the server.")
log.Debug("failed:", err)
return
}
defer rConn.CloseWrite()
buf, err := rConn.ReadBytes() go rConn.Serve(lConn, "[HTTP]")
go lConn.Serve(rConn, "[HTTP]")
_, err = rConn.Write(p.Raw())
if err != nil { if err != nil {
log.Debug("failed:", err) log.Debug("[HTTP] Error sending request to the server: ", err)
return return
} }
log.Debug("[HTTP] Sent a request to the server")
log.Debug("[HTTP] Response from the server : \n\n", string(buf))
// Write to client
if _, err = lConn.Write(buf); err != nil {
log.Debug("failed:", err)
return
}
defer lConn.CloseWrite()
} }
func (lConn *Conn) HandleHttps(p packet.HttpPacket) { func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
@ -120,7 +111,6 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
log.Debug("[HTTPS] ", err) log.Debug("[HTTPS] ", err)
return return
} }
defer rConn.Close()
log.Debug("[HTTPS] Connected to the server.") log.Debug("[HTTPS] Connected to the server.")
@ -140,37 +130,41 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
log.Debug("[HTTPS] Client "+lConn.RemoteAddr().String()+" sent hello: ", len(clientHello), "bytes") log.Debug("[HTTPS] Client "+lConn.RemoteAddr().String()+" sent hello: ", len(clientHello), "bytes")
// Generate a go routine that reads from the server // Generate a go routine that reads from the server
go rConn.ServeHttps(lConn) go rConn.Serve(lConn, "[HTTPS]")
go lConn.Serve(rConn, "[HTTPS]")
pkt := packet.NewHttpsPacket(clientHello) pkt := packet.NewHttpsPacket(clientHello)
chunks := pkt.SplitInChunks() chunks := pkt.SplitInChunks()
if _, err := rConn.WriteChunks(chunks); err != nil { if _, err := rConn.WriteChunks(chunks); err != nil {
log.Debug("[HTTPS] Error writing client hello: ", err)
return return
} }
// Read from the client
lConn.ServeHttps(rConn)
} }
func (from *Conn) ServeHttps(to *Conn) { func (from *Conn) Serve(to *Conn, proto string) {
defer from.Close()
defer to.CloseWrite()
proto += " "
for { for {
buf, err := from.ReadBytes() buf, err := from.ReadBytes()
if err != nil { if err != nil {
log.Debug("[HTTPS] "+"Error reading from ", from.RemoteAddr()) log.Debug(proto+"Error reading from ", from.RemoteAddr())
log.Debug("[HTTPS] ", err) log.Debug(proto, err)
log.Debug("[HTTPS] " + "Exiting Serve() method. ") log.Debug(proto + "Exiting Serve() method. ")
break break
} }
log.Debug("[HTTPS] ", from.RemoteAddr(), " sent data: ", len(buf), "bytes")
log.Debug(proto, from.RemoteAddr(), " sent data: ", len(buf), "bytes\n\n", string(buf))
if _, err := to.Write(buf); err != nil { if _, err := to.Write(buf); err != nil {
log.Debug("[HTTPS] "+"Error Writing to ", to.RemoteAddr()) log.Debug(proto+"Error Writing to ", to.RemoteAddr())
log.Debug("[HTTPS] ", err) log.Debug(proto, err)
log.Debug("[HTTPS] " + "Exiting Serve() method. ") log.Debug(proto + "Exiting Serve() method. ")
break break
} }
defer to.CloseWrite()
} }
} }

6
proxy/proxy.go
View File

@ -41,8 +41,6 @@ func (p *Proxy) Start() {
log.Debug("Accepted a new connection.", conn.RemoteAddr()) log.Debug("Accepted a new connection.", conn.RemoteAddr())
go func() { go func() {
defer conn.Close()
b, err := conn.ReadBytes() b, err := conn.ReadBytes()
if err != nil { if err != nil {
return return
@ -59,10 +57,10 @@ func (p *Proxy) Start() {
if pkt.IsConnectMethod() { if pkt.IsConnectMethod() {
log.Debug("[HTTPS] Start") log.Debug("[HTTPS] Start")
conn.HandleHttps(pkt) go conn.HandleHttps(pkt)
} else { } else {
log.Debug("[HTTP] Start") log.Debug("[HTTP] Start")
conn.HandleHttp(pkt) go conn.HandleHttp(pkt)
} }
}() }()
} }