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

fix http

Browse Source
This commit is contained in:
xvzc 2022-01-14 01:06:14 +09:00
parent 7e4cf305bf
commit 34b035f4ec
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
net/conn.go
View File

@ -14,6 +14,10 @@ type Conn struct {
conn net.Conn conn net.Conn
} }
func (c *Conn) CloseWrite() {
c.conn.(*net.TCPConn).CloseWrite()
}
func (c *Conn) Close() { func (c *Conn) Close() {
c.conn.Close() c.conn.Close()
} }
@ -70,29 +74,37 @@ func (conn *Conn) ReadBytes() ([]byte, error) {
func (lConn *Conn) HandleHttp(p packet.HttpPacket) { func (lConn *Conn) HandleHttp(p packet.HttpPacket) {
ip, err := doh.Lookup(p.Domain()) ip, err := doh.Lookup(p.Domain())
if err != nil { if err != nil {
log.Debug("[HTTPS] Error looking up for domain: ", err) log.Debug("[HTTP] Error looking up for domain: ", err)
} }
log.Debug("[HTTPS] Found ip over HTTPS: ", ip) log.Debug("[HTTP] Found ip over HTTPS: ", ip)
// Create connection to server rConn, err := Dial("tcp", ip+":80") // create connection to server
rConn, err := Dial("tcp", ip+":80")
if err != nil { if err != nil {
log.Debug("[HTTPS] ", err) log.Debug(err)
return return
} }
defer rConn.Close() defer rConn.Close()
log.Debug("[HTTP] Connected to the server.") if _, err := rConn.Write(p.Raw()); err != nil {
log.Debug("failed:", err)
go rConn.Serve(lConn, "HTTP") return
_, err = rConn.Write([]byte("HTTP/1.1 200 Connection Established\r\n\r\n"))
if err != nil {
log.Debug("[HTTP] Error sending request to the server: ", err)
} }
log.Debug("[HTTP] Sent a request to the server") defer rConn.CloseWrite()
go lConn.Serve(&rConn, "HTTP") buf, err := rConn.ReadBytes()
if err != nil {
log.Debug("failed:", err)
return
}
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) {
@ -128,7 +140,7 @@ 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.Serve(lConn, "HTTPS") go rConn.ServeHttps(lConn)
pkt := packet.NewHttpsPacket(clientHello) pkt := packet.NewHttpsPacket(clientHello)
@ -139,25 +151,26 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
} }
// Read from the client // Read from the client
lConn.Serve(&rConn, "HTTPS") lConn.ServeHttps(rConn)
} }
func (from *Conn) Serve(to *Conn, proto string) { func (from *Conn) ServeHttps(to *Conn) {
for { for {
buf, err := from.ReadBytes() buf, err := from.ReadBytes()
if err != nil { if err != nil {
log.Debug("["+proto+"] "+"Error reading from ", from.RemoteAddr()) log.Debug("[HTTPS] "+"Error reading from ", from.RemoteAddr())
log.Debug("["+proto+"] ", err) log.Debug("[HTTPS] ", err)
log.Debug("[" + proto + "] " + "Exiting Serve() method. ") log.Debug("[HTTPS] " + "Exiting Serve() method. ")
break break
} }
log.Debug("["+proto+"] ", from.RemoteAddr(), " sent data: ", len(buf), "bytes") log.Debug("[HTTPS] ", from.RemoteAddr(), " sent data: ", len(buf), "bytes")
if _, err := to.Write(buf); err != nil { if _, err := to.Write(buf); err != nil {
log.Debug("["+proto+"] "+"Error Writing to ", to.RemoteAddr()) log.Debug("[HTTPS] "+"Error Writing to ", to.RemoteAddr())
log.Debug("["+proto+"] ", err) log.Debug("[HTTPS] ", err)
log.Debug("[" + proto + "] " + "Exiting Serve() method. ") log.Debug("[HTTPS] " + "Exiting Serve() method. ")
break break
} }
defer to.CloseWrite()
} }
} }

6
net/dial.go
View File

@ -13,11 +13,11 @@ func Listen(network, address string) (Listener, error) {
return Listener{listener: l}, nil return Listener{listener: l}, nil
} }
func Dial(network, address string) (Conn, error) { func Dial(network, address string) (*Conn, error) {
conn, err := net.Dial(network, address) conn, err := net.Dial(network, address)
if err != nil { if err != nil {
return Conn{}, err return &Conn{}, err
} }
return Conn{conn: conn}, nil return &Conn{conn: conn}, nil
} }