From e360eaf6f1ffa0fe6f7a0b0f5a855e4f2aefb23d Mon Sep 17 00:00:00 2001
From: Cyber-Scream <cyberscream@proton.me>
Date: Mon, 26 Aug 2024 13:09:00 +0200
Subject: [PATCH] Python3 support added

---
 client.py | 76 +++++++++++++++++++++++++++----------------------------
 relay.py  | 30 +++++++++++-----------
 server.py | 62 ++++++++++++++++++++++-----------------------
 3 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/client.py b/client.py
index ce35cf5..9ef0d4c 100644
--- a/client.py
+++ b/client.py
@@ -19,7 +19,7 @@
 
 
 def key_by_value(my_dict, value):
-    for k, v in my_dict.iteritems():
+    for k, v in my_dict.items():
         if v == value:
             return k
     return None
@@ -80,11 +80,11 @@ def run(self):
                 logger.info('SIGINT received. Closing relay and exiting')
                 self.send_remote_cmd(self.bc_sock, relay.CLOSE_RELAY)
                 self.shutdown()
-            except select.error as (code, msg):
-                logger.debug('Select error on select. Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            except select.error as e:
+                logger.debug('Select error on select. Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
                 self.shutdown()
-            except socket.error as (code, msg):
-                logger.debug('Socket error on select. Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            except socket.error as e:
+                logger.debug('Socket error on select. Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
                 self.shutdown()
 
             for sock in outputready:
@@ -92,9 +92,9 @@ def run(self):
                 logger.debug('Establishing connection with channel id {0}'.format(channel_id))
                 try:
                     sock.recv(0)
-                except socket.error as (code, err_msg):
-                    if code == errno.ECONNREFUSED or code == errno.ETIMEDOUT:
-                        logger.debug('Connection {0}'.format(errno.errorcode[code]))
+                except socket.error as e:
+                    if e.errno == errno.ECONNREFUSED or e.errno == errno.ETIMEDOUT:
+                        logger.debug('Connection {0}'.format(e.errno))
 
                         if sock in inputready:
                             inputready.remove(sock)
@@ -104,9 +104,9 @@ def run(self):
                         self.send_remote_cmd(self.bc_sock, relay.FORWARD_CONNECTION_FAILURE, channel_id)
                         sock.close()
                         continue
-                    elif code == errno.EAGAIN:
+                    elif e.errno == errno.EAGAIN:
                         logger.debug('Recv(0) return errno.EAGAIN for socket {0} on channel {1}. Connection established.'.format(sock, channel_id))
-                    elif code == 10035:
+                    elif e.errno == 10035:
                         logger.debug('Recv(0) raised windows-specific exception 10035. Connection established.')
                     else:
                         raise
@@ -131,7 +131,7 @@ def run(self):
                     self.manage_forward_socket(self.selected_input_socket)
 
     def handle_remote_cmd(self, data):
-        cmd = data[0]
+        cmd = data[0].to_bytes(1, 'big')
         logger.debug('Received cmd data from remote side. Cmd: {0}'.format(relay.cmd_names[cmd]))
         if cmd == relay.CHANNEL_CLOSE_CMD:
             channel_id = unpack('<H', data[1:3])[0]
@@ -168,9 +168,9 @@ def get_channel_data(self, sock):
             tlv_header = relay.recvall(sock, 4)
             channel_id, tlv_data_len = unpack('<HH', tlv_header)
             data = relay.recvall(sock, tlv_data_len)
-        except socket.error as (code, msg):
+        except socket.error as e:
             logger.debug('Exception on receiving tlv message from remote side. Exiting')
-            logger.debug('Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            logger.debug('Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
             raise relay.RelayError
 
         return channel_id, data
@@ -188,7 +188,7 @@ def manage_remote_socket(self, sock):
         elif channel_id in self.channel:
             relay_to_sock = self.channel[channel_id]
             logger.debug('Got data to relay from remote side. Channel id {0}. Data length: {1}'.format(channel_id, len(data)))
-            logger.debug('Data contents: {0}'.format(data.encode('hex')))
+            logger.debug('Data contents: {0}'.format(data))
             self.relay(data, relay_to_sock)
         else:
                 logger.debug('Relay from socket {0} with channel {1} not possible. Channel does not exist'.format(sock, channel_id))
@@ -206,9 +206,9 @@ def manage_forward_socket(self, sock):
         #logger.debug('Readable socket {0} with channel id {1}'.format(sock, channel_id))
         try:
             data = sock.recv(relay.buffer_size)
-        except socket.error as (code, msg):
+        except socket.error as e:
             logger.debug('Exception on receiving data from socket {0} with channel id {1}'.format(sock, channel_id))
-            logger.debug('Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            logger.debug('Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
             logger.debug('Closing socket {0} with channel id {1}'.format(sock, channel_id))
             self.close_forward_connection(sock)
             return
@@ -220,8 +220,8 @@ def manage_forward_socket(self, sock):
             channel_id = self.id_by_socket[sock]
             tlv_header = pack('<HH', channel_id, len(data))
             logger.debug('Got data to relay from app side. Channel id {0}. Data length: {1}'.format(channel_id, len(data)))
-            logger.debug('Preparing tlv header: {0}'.format(tlv_header.encode('hex')))
-            logger.debug('Data contents: {0}'.format(data.encode('hex')))
+            logger.debug('Preparing tlv header: {0}'.format(tlv_header))
+            logger.debug('Data contents: {0}'.format(data))
             self.relay(tlv_header + data, self.bc_sock)
 
     def close_forward_connection(self, sock):
@@ -250,8 +250,8 @@ def send_remote_cmd(self, sock, cmd, *args):
             tlv_header = pack('<HH', relay.COMMAND_CHANNEL, len(cmd_buffer))
         try:
             sock.send(tlv_header + cmd_buffer)
-        except socket.error as (code, cmd):
-            logger.error('Socket error on sending command to remote side. Code {0}. Msg {1}'.format(code, cmd))
+        except socket.error as e:
+            logger.error('Socket error on sending command to remote side. Code {0}. Msg {1}'.format(e.errno, e.strerror))
 
     def set_channel(self, sock, channel_id):
         self.channel[channel_id] = sock
@@ -267,8 +267,8 @@ def establish_forward_socket(self, channel_id, host, port):
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             sock.setblocking(0)
             sock.connect_ex((host, port))
-        except socket.error as (code, msg):
-            logger.debug("Caught exception socket.error during establishing forward connection. Code {0}. Msg {1}".format(code, msg))
+        except socket.error as e:
+            logger.debug("Caught exception socket.error during establishing forward connection. Code {0}. Msg {1}".format(e.errno, e.strerror))
             self.send_remote_cmd(self.bc_sock, relay.FORWARD_CONNECTION_FAILURE, channel_id)
             return
         logger.debug('Adding new pending forward connection with channel id {0} and socket {1}'.format(channel_id, sock))
@@ -279,9 +279,9 @@ def relay(self, data, to_socket):
             return
         try:
             to_socket.send(data)
-        except socket.error as (code, msg):
+        except socket.error as e:
             logger.debug('Exception on relaying data to socket {0}'.format(to_socket))
-            logger.debug('Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            logger.debug('Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
             if to_socket == self.bc_sock:
                 raise relay.RelayError
             else:
@@ -330,15 +330,15 @@ def connect(self, host_port):
             self._sock.connect((self._proxy_ip, self._proxy_port))
             self._sock.send(NtlmProxyContext.negotiate_request.format(host, str(port), negotiate_message))
             resp = self._sock.recv(4096)
-        except socket.error as (code, msg):
-            logger.error("Caught socket error trying to establish connection to proxy. Code {0}. Msg {1}".format(code, msg))
+        except socket.error as e:
+            logger.error("Caught socket error trying to establish connection to proxy. Code {0}. Msg {1}".format(e.errno, e.strerror))
             raise
 
         try:
             chal_msg = NtlmProxyContext.get_challenge(resp)
             ntlm_context.parse_challenge_message(chal_msg)
         except TypeError:
-            logger.error("Couldn't parse proxy challenge. Code {0}. Msg {1}".format(code, msg))
+            logger.error("Couldn't parse proxy challenge. Code {0}. Msg {1}".format(e.errno, e.strerror))
             if resp is not None:
                 logger.error("Challenge contents: {0}".format(resp))
             else:
@@ -356,8 +356,8 @@ def connect(self, host_port):
         try:
             self._sock.send(NtlmProxyContext.authenticate_request.format(host, str(port), authenticate_message))
             resp = self._sock.recv(4096)
-        except socket.error as (code, msg):
-            logger.error("Caught socket error trying to send challenge response connection to proxy. Code {0}. Msg {1}".format(code, msg))
+        except socket.error as e:
+            logger.error("Caught socket error trying to send challenge response connection to proxy. Code {0}. Msg {1}".format(e.errno, e.strerror))
             self._sock.close()
             raise
 
@@ -421,7 +421,7 @@ def main():
 
     cmd_options = parser.parse_args()[0]
     if cmd_options.server_ip is None:
-        print 'Server IP required'
+        print('Server IP required')
         sys.exit()
     logger = logging.getLogger('root')
     logger.setLevel(logging.DEBUG)
@@ -466,21 +466,21 @@ def main():
                     bc_sock = ntlm_con
                 bc_sock.connect((backconnect_host, backconnect_port))
                 break
-            except socket.error as (code, msg):
-                logger.info('Unable to connect to {0} port: {1}. Caught socket error trying to establish connection with RPIVOT server. Code {2}. Msg {3}'.format(cmd_options.server_ip, cmd_options.server_port, code, msg))
+            except socket.error as e:
+                logger.info('Unable to connect to {0} port: {1}. Caught socket error trying to establish connection with RPIVOT server. Code {2}. Msg {3}'.format(cmd_options.server_ip, cmd_options.server_port, e.errno, e.strerror))
                 logger.info('Retrying')
                 time.sleep(5)
 
         try:
-            bc_sock.send(relay.banner)
-            banner_reponse_rcv = bc_sock.recv(4096)
+            bc_sock.send(relay.banner.encode('UTF-8'))
+            banner_reponse_rcv = bc_sock.recv(4096).decode('UTF-8')
             if banner_reponse_rcv != relay.banner_response:
                 logger.error("Wrong banner response {0} from server. Retrying".format(repr(banner_reponse_rcv)))
                 bc_sock.close()
                 time.sleep(5)
                 continue
-        except socket.error as (code, msg):
-            logger.error("Caught socket error trying to establish connection with RPIVOT server. Code {0}. Msg {1}".format(code, msg))
+        except socket.error as e:
+            logger.error("Caught socket error trying to establish connection with RPIVOT server. Code {0}. Msg {1}".format(e.errno, e.strerror))
             bc_sock.close()
             time.sleep(5)
             continue
@@ -488,9 +488,9 @@ def main():
         socks_relayer = SocksRelay(bc_sock)
         try:
             socks_relayer.run()
-        except socket.error as (code, msg):
+        except socket.error as e:
             logger.debug('Exception in socks_relayer.run(). Restarting relay')
-            logger.debug('Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            logger.debug('Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
             bc_sock.close()
             continue
         time.sleep(10)
diff --git a/relay.py b/relay.py
index ab19fe6..30e2fdb 100644
--- a/relay.py
+++ b/relay.py
@@ -4,28 +4,28 @@
 
 buffer_size = 4096
 delay = 0.0001
-socks_server_reply_success = '\x00\x5a\xff\xff\xff\xff\xff\xff'
-socks_server_reply_fail = '\x00\x5b\xff\xff\xff\xff\xff\xff'
+socks_server_reply_success = b'\x00\x5a\xff\xff\xff\xff\xff\xff'
+socks_server_reply_fail = b'\x00\x5b\xff\xff\xff\xff\xff\xff'
 relay_timeout = 60
 banner = 'RPIVOT'
 banner_response = 'TUNNELRDY'
 
 COMMAND_CHANNEL = 0
 
-CHANNEL_CLOSE_CMD = '\xcc'
-CHANNEL_OPEN_CMD = '\xdd'
-FORWARD_CONNECTION_SUCCESS = '\xee'
-FORWARD_CONNECTION_FAILURE = '\xff'
-CLOSE_RELAY = '\xc4'
-PING_CMD = '\x70'
+CHANNEL_CLOSE_CMD = b'\xcc'
+CHANNEL_OPEN_CMD = b'\xdd'
+FORWARD_CONNECTION_SUCCESS = b'\xee'
+FORWARD_CONNECTION_FAILURE = b'\xff'
+CLOSE_RELAY = b'\xc4'
+PING_CMD = b'\x70'
 
 cmd_names = {
-    '\xcc': 'CHANNEL_CLOSE_CMD',
-    '\xdd': 'CHANNEL_OPEN_CMD',
-    '\xee': 'FORWARD_CONNECTION_SUCCESS',
-    '\xff': 'FORWARD_CONNECTION_FAILURE',
-    '\xc4': 'CLOSE_RELAY',
-    '\x70': 'PING_CMD'
+    b'\xcc': 'CHANNEL_CLOSE_CMD',
+    b'\xdd': 'CHANNEL_OPEN_CMD',
+    b'\xee': 'FORWARD_CONNECTION_SUCCESS',
+    b'\xff': 'FORWARD_CONNECTION_FAILURE',
+    b'\xc4': 'CLOSE_RELAY',
+    b'\x70': 'PING_CMD'
 }
 
 
@@ -38,7 +38,7 @@ class RelayError(Exception):
 
 
 def recvall(sock, data_len):
-    buf = ''
+    buf = b''
     while True:
         buf += sock.recv(data_len - len(buf))
         if len(buf) == data_len:
diff --git a/server.py b/server.py
index de7edd9..6a46f96 100644
--- a/server.py
+++ b/server.py
@@ -36,8 +36,8 @@ def __init__(self, host, port, socket_with_server):
         try:
             self.server.bind((host, port))
             self.server.listen(2000)
-        except socket.error as (code, msg):
-            logger.error('Error binding socks proxy. {0}'.format(msg))
+        except socket.error as e:
+            logger.error('Error binding socks proxy. {0}'.format(e.strerror))
             logger.error('Closing relay')
             socket_with_server.close()
             raise
@@ -57,8 +57,8 @@ def ping_worker(self):
             logger.debug('Sending ping')
             try:
                 self.send_remote_cmd(self.socket_with_server, relay.PING_CMD)
-            except socket.error as (code, msg):
-                logger.debug('Ping thread got socket exception {0} {1}. Closing socket with remote side'.format(code, msg))
+            except socket.error as e:
+                logger.debug('Ping thread got socket exception {0} {1}. Closing socket with remote side'.format(e.errno, e.strerror))
                 self.socket_with_server.close()
                 return
             except relay.RelayError:
@@ -79,8 +79,8 @@ def main_loop(self):
             try:
                 logger.debug("Active channels: {0}".format(self.channel.keys()))
                 inputready, outputready, exceptready = select.select(self.input_list, [], [])
-            except socket.error as (code, msg):
-                logger.debug('Socket error on select. Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            except socket.error as e:
+                logger.debug('Socket error on select. Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
                 return
             except KeyboardInterrupt:
                 logger.info('SIGINT received. Closing relay and exiting')
@@ -138,9 +138,9 @@ def get_channel_data(self, sock):
             tlv_header = relay.recvall(sock, 4)
             channel_id, tlv_data_len = unpack('<HH', tlv_header)
             data = relay.recvall(sock, tlv_data_len)
-        except socket.error as (code, msg):
+        except socket.error as e:
             logger.debug('Exception on receiving tlv message from remote side. Exiting')
-            logger.debug('Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            logger.debug('Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
             raise relay.RelayError
         return channel_id, data
 
@@ -151,7 +151,7 @@ def manage_remote_socket(self, sock):
         elif channel_id in self.channel:
             relay_to_sock = self.channel[channel_id]
             logger.debug('Got data to relay from remote side. Channel id {0}. Data length: {1}'.format(channel_id, len(data)))
-            logger.debug('Data contents: {0}'.format(data.encode('hex')))
+            logger.debug('Data contents: {0}'.format(data))
             self.relay(data, relay_to_sock)
         else:
             logger.debug('Relay from socket {0} with channel {1} not possible. Channel does not exist'.format(sock, channel_id))
@@ -160,9 +160,9 @@ def manage_remote_socket(self, sock):
     def manage_socks_client_socket(self, sock):
         try:
             data = sock.recv(relay.buffer_size)
-        except socket.error as (code, msg):
+        except socket.error as e:
             logger.debug('Exception on reading socket {0} with channel id {1}'.format(sock, self.id_by_socket[sock]))
-            logger.debug('Details: {0}, {1}'.format(errno.errorcode[code], msg))
+            logger.debug('Details: {0}, {1}'.format(e.errno, e.strerror))
             self.close_socks_connection(sock)
             return
         data_len = len(data)
@@ -173,12 +173,12 @@ def manage_socks_client_socket(self, sock):
             channel_id = self.id_by_socket[sock]
             tlv_header = pack('<HH', channel_id, len(data))
             logger.debug('Got data to relay from app side. Channel id {0}. Data length: {1}'.format(channel_id, len(data)))
-            logger.debug('Preparint tlv header: {0}'.format(tlv_header.encode('hex')))
-            logger.debug('Data contents: {0}'.format(data.encode('hex')))
+            logger.debug('Preparint tlv header: {0}'.format(tlv_header))
+            logger.debug('Data contents: {0}'.format(data))
             self.relay(tlv_header + data, self.socket_with_server)
 
     def handle_remote_cmd(self, data):
-        cmd = data[0]
+        cmd = data[0].to_bytes(1, 'big')
         logger.debug('Received cmd from remote side. Cmd: {0}'.format(relay.cmd_names[cmd]))
         if cmd == relay.CHANNEL_CLOSE_CMD:
             channel_id = unpack('<H', data[1:3])[0]
@@ -199,8 +199,8 @@ def handle_remote_cmd(self, data):
                 sock = self.channel[channel_id]
                 try:
                     sock.send(relay.socks_server_reply_success)
-                except socket.error as (code, msg):
-                    logger.error('Socket error on replying SUCCESS to socks client. Code {0}. Msg {1}'.format(code, cmd))
+                except socket.error as e:
+                    logger.error('Socket error on replying SUCCESS to socks client. Code {0}. Msg {1}'.format(e.errno, e.strerror))
                     logger.debug('Closing client socket and sending channel close cmd to remote side')
                     sock = self.channel[channel_id]
                     self.input_list.remove(sock)
@@ -220,8 +220,8 @@ def handle_remote_cmd(self, data):
                 sock = self.channel[channel_id]
                 try:
                     sock.send(relay.socks_server_reply_fail)
-                except socket.error as (code, msg):
-                    logger.error('Socket error on replying  FAILURE to socks client. Code {0}. Msg {0}'.format(code, cmd))
+                except socket.error as e:
+                    logger.error('Socket error on replying  FAILURE to socks client. Code {0}. Msg {0}'.format(e.errno, e.strerror))
                 self.input_list.remove(sock)
                 self.unset_channel(channel_id)
                 try:
@@ -255,8 +255,8 @@ def send_remote_cmd(self, sock, cmd, *args):
             tlv_header = pack('<HH', relay.COMMAND_CHANNEL, len(cmd_buffer))
         try:
             sock.send(tlv_header + cmd_buffer)
-        except socket.error as (code, cmd):
-            logger.error('Socket error on sending command to remote side. Code {0}. Msg {1}'.format(code, cmd))
+        except socket.error as e:
+            logger.error('Socket error on sending command to remote side. Code {0}. Msg {1}'.format(e.errno, e.strerror))
             raise relay.RelayError
 
     def on_accept(self):
@@ -277,11 +277,11 @@ def handle_new_socks_connection(self, sock):
             if len(data) != 9:
                 logger.debug('Error receiving socks header: corrupted header')
                 raise relay.RelayError
-            if data[-1] != '\x00':
+            if data[-1].to_bytes(1, 'big') != b'\x00':
                 logger.debug('Error receiving socks header: corrupted header')
                 raise relay.RelayError
-        except socket.error as (code, msg):
-            logger.debug('Error receiving socks header {0} {1}'.format(errno.errorcode[code], msg))
+        except socket.error as e:
+            logger.debug('Error receiving socks header {0} {1}'.format(e.errno, e.strerror))
             raise relay.RelayError
         if len(data) == 0:
             logger.debug('Socks client prematurely ended connection')
@@ -320,9 +320,9 @@ def relay(self, data, to_socket):
             return
         try:
             to_socket.send(data)
-        except socket.error as (code, msg):
+        except socket.error as e:
             logger.debug('Exception on relaying data to socket {0}'.format(to_socket))
-            logger.debug('Errno: {0} Msg: {1}'.format(errno.errorcode[code], msg))
+            logger.debug('Errno: {0} Msg: {1}'.format(e.errno, e.strerror))
             if to_socket == self.socket_with_server:
                 raise relay.RelayError
             else:
@@ -355,20 +355,20 @@ def run_server(host, port):
         serversock.close()
 
         try:
-            banner_rcv = socket_with_remote_side.recv(4096)
+            banner_rcv = socket_with_remote_side.recv(4096).decode('UTF-8')
             if banner_rcv != relay.banner:
                 logger.error("Wrong banner {0} from client. Closing connection".format(repr(banner_rcv)))
                 socket_with_remote_side.close()
                 continue
-            socket_with_remote_side.send(relay.banner_response)
-        except socket.error as (code, msg):
-            logger.error("Caught socket error trying to establish connection with RPIVOT client. Code {0}. Msg {1}".format(code, msg))
+            socket_with_remote_side.send(relay.banner_response.encode('UTF-8'))
+        except socket.error as e:
+            logger.error("Caught socket error trying to establish connection with RPIVOT client. Code {0}. Msg {1}".format(e.errno, e.strerror))
             continue
 
         try:
             server = RelayServer(cmd_options.proxy_ip, int(cmd_options.proxy_port), socket_with_remote_side)
 
-        except socket.error as (code, msg):
+        except socket.error:
             logger.info('Error on running relay server. Restarting')
             continue
         try:
@@ -379,7 +379,7 @@ def run_server(host, port):
             continue
 
         except KeyboardInterrupt:
-            print "Ctrl C - Stopping server"
+            print("Ctrl C - Stopping server")
             sys.exit(1)