Skip to content

udp support for csharp templates #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

udp support for csharp templates #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
233 changes: 176 additions & 57 deletions neoreg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,27 @@ def parseSocks5(self, sock):
if cmd == b"\x02": # BIND
raise SocksCmdNotImplemented("Socks5 - BIND not implemented")
elif cmd == b"\x03": # UDP
raise SocksCmdNotImplemented("Socks5 - UDP not implemented")
self.cmd = "UDP"
try:
serverIp = inet_aton(target)
except:
# Forged temporary address 0.0.0.0
serverIp = inet_aton('0.0.0.0')
mark = self.setupUDPRelay(target, targetPortNum)
if mark:
self.udpSocket = socket(AF_INET, SOCK_DGRAM)
self.udpSocket.bind(('', 0)) # !
self.udpClientAddr = self.pSocket.getpeername()[0]
self.udpClientPort = None

sock.sendall(VER + SUCCESS + b"\x00" + b"\x01" + inet_aton(self.udpSocket.getsockname()[0]) + self.udpSocket.getsockname()[1].to_bytes(2, 'big'))
return True
else:
sock.sendall(VER + REFUSED + b"\x00" + b"\x01" + serverIp + targetPort)
return False

elif cmd == b"\x01": # CONNECT
self.cmd = "CONNECT"
try:
serverIp = inet_aton(target)
except:
Expand Down Expand Up @@ -478,6 +497,32 @@ def setupRemoteSession(self, target, port):
else:
return False

def setupUDPRelay(self, target, port):
self.mark = self.session_mark()
self.target = target.encode()
self.port = port

info = {'CMD': 'UDP', 'MARK': self.mark, 'IP': self.target, 'PORT': str(self.port)}

if ( '.php' in self.connectURLs[0] or PHPSERVER ) and not GOSERVER:
try:
rinfo = self.neoreg_request(info, timeout=PHPTIMEOUT)
except:
log.info("[UDP] [%s:%d] Session mark (%s)" % (self.target, self.port, self.mark))
return self.mark
else:
log.debug("[DEBUG] setupUDPRelay, info: " + str(info))
rinfo = self.neoreg_request(info)
log.debug("[DEBUG] setupUDPRelay, rinfo: " + str(rinfo))

status = rinfo["STATUS"]
log.debug("[DEBUG] setupUDPRelay, status: " + str(status))
log.debug("[DEBUG] setupUDPRelay, data: " + str(rinfo["DATA"]))
if status == "OK":
log.info("[UDP] [%s:%d] Session mark: %s" % (self.target, self.port, self.mark))
return self.mark
else:
return False

def closeRemoteSession(self):
if not self.connect_closed:
Expand All @@ -500,69 +545,143 @@ def closeRemoteSession(self):


def reader(self):
try:
info = {'CMD': 'READ', 'MARK': self.mark}
n = 0
while True:
try:
if self.connect_closed or self.pSocket.fileno() == -1:
break
rinfo = self.neoreg_request(info)
if rinfo['STATUS'] == 'OK':
data = rinfo['DATA']
data_len = len(data)

if data_len == 0:
sleep(READINTERVAL)
elif data_len > 0:
n += 1
transferLog.info("[%s:%d] [%s] No.%d <<<< [%d byte]" % (self.target, self.port, self.mark, n, data_len))
while data:
writed_size = self.pSocket.send(data)
data = data[writed_size:]
if data_len < 500:
if self.cmd == "CONNECT":
try:
info = {'CMD': 'READ', 'MARK': self.mark}
n = 0
while True:
try:
if self.connect_closed or self.pSocket.fileno() == -1:
break
rinfo = self.neoreg_request(info)
if rinfo['STATUS'] == 'OK':
data = rinfo['DATA']
data_len = len(data)

if data_len == 0:
sleep(READINTERVAL)
else:
break
elif data_len > 0:
n += 1
transferLog.info("[%s:%d] [%s] No.%d <<<< [%d byte]" % (self.target, self.port, self.mark, n, data_len))
while data:
writed_size = self.pSocket.send(data)
data = data[writed_size:]
if data_len < 500:
sleep(READINTERVAL)
else:
break

except error: # python2 socket.send error
pass
except Exception as ex:
log.exception(ex)
break
finally:
self.closeRemoteSession()
except error: # python2 socket.send error
pass
except Exception as ex:
log.exception(ex)
break
finally:
self.closeRemoteSession()
elif self.cmd == "UDP":
try:
info = {'CMD': 'READ', 'MARK': self.mark}
n = 0
while True:
try:
if self.udpClientPort == None:
continue
if self.connect_closed or self.pSocket.fileno() == -1:
break
rinfo = self.neoreg_request(info)
if rinfo['STATUS'] == 'OK':
data = rinfo['DATA']
data_len = len(data)

if data_len == 0:
sleep(READINTERVAL)
elif data_len > 0:
n += 1
transferLog.info("[%s:%d] [%s] No.%d <<<< [%d byte]" % (self.target, self.port, self.mark, n, data_len))
header = b"\x00\x00" + b"\x00" + b"\x01" + inet_aton(str(rinfo['IP'])) + int(str(rinfo['PORT'])).to_bytes(2, 'big')
while data:
writed_size = self.udpSocket.sendto(header + data, (self.udpClientAddr, self.udpClientPort))
data = data[writed_size:]
if data_len < 500:
sleep(READINTERVAL)
else:
break

except error: # python2 socket.send error
pass
except Exception as ex:
log.exception(ex)
break
finally:
self.closeRemoteSession()

def writer(self):
try:
info = {'CMD': 'FORWARD', 'MARK': self.mark}
n = 0
while True:
try:
raw_data = self.pSocket.recv(READBUFSIZE)
if not raw_data:
if self.cmd == "CONNECT":
try:
info = {'CMD': 'FORWARD', 'MARK': self.mark}
n = 0
while True:
try:
raw_data = self.pSocket.recv(READBUFSIZE)
if not raw_data:
break
info['DATA'] = raw_data
rinfo = self.neoreg_request(info)
if rinfo['STATUS'] != "OK":
break
n += 1
transferLog.info("[%s:%d] [%s] No.%d >>>> [%d byte]" % (self.target, self.port, self.mark, n, len(raw_data)))
if len(raw_data) < READBUFSIZE:
sleep(WRITEINTERVAL)
except timeout:
continue
except error:
break
info['DATA'] = raw_data
rinfo = self.neoreg_request(info)
if rinfo['STATUS'] != "OK":
except OSError:
break
n += 1
transferLog.info("[%s:%d] [%s] No.%d >>>> [%d byte]" % (self.target, self.port, self.mark, n, len(raw_data)))
if len(raw_data) < READBUFSIZE:
sleep(WRITEINTERVAL)
except timeout:
continue
except error:
break
except OSError:
break
except Exception as ex:
log.exception(ex)
break
finally:
self.closeRemoteSession()

except Exception as ex:
log.exception(ex)
break
finally:
self.closeRemoteSession()
elif self.cmd == "UDP":
try:
info = {'CMD': 'FORWARD', 'MARK': self.mark}
n = 0
while True:
try:
raw_data, address = self.udpSocket.recvfrom(READBUFSIZE)
if address[0] != self.udpClientAddr:
log.error("[UDP Relay] packet from non client")
continue

if self.udpClientPort == None:
self.udpClientPort = address[1]

if not raw_data:
break
info['IP'] = str(int(raw_data[4])) + "." + str(int(raw_data[5])) + "." + str(int(raw_data[6])) + "." + str(int(raw_data[7]))
info['PORT'] = str(int.from_bytes(raw_data[8:10]))
info['DATA'] = raw_data[10:]
data_len = len(info['DATA'])
rinfo = self.neoreg_request(info)
if rinfo['STATUS'] != "OK":
break
n += 1
transferLog.info("[%s:%d] [%s] No.%d >>>> [%d byte]" % (self.target, self.port, self.mark, n, data_len))
if data_len < READBUFSIZE:
sleep(WRITEINTERVAL)
except timeout:
continue
except error:
break
except OSError:
break
except Exception as ex:
log.exception(ex)
break
finally:
self.closeRemoteSession()

def run(self):
try:
Expand Down
Loading