Bug fixes

Fixes #1

Author: Drewsif

secretsocks/secretsocks.py

@@ -161,7 +161,10 @@ def __init__(self):
     def new_request(self, sock, addr, client):
         # Client sends version and methods
         sock.setblocking(True)
-        ver, = struct.unpack('!B', sock.recv(1))
+        data = sock.recv(1)
+        if not data:
+            return None
+        ver, = struct.unpack('!B', data)
         if DEBUG:
             print('Version:', ver)
         if ver == 4:
@@ -224,6 +227,8 @@ def _socks5_init(self, sock, client):
         elif atyp == 3:
             size, = struct.unpack('!B', sock.recv(1))
             dstaddr = sock.recv(size)
+            if type(dstaddr) == bytes:
+                dstaddr = dstaddr.decode('utf8')
             dstport, = struct.unpack('!H', sock.recv(2))
         #TODO: ipv6 addr support
         #elif atyp = 4:

secretsocks/server.py

@@ -55,6 +55,7 @@ def _dataparse(self):
                 continue
             id, = struct.unpack('<H', data[:2])
             # ID 0 is to close a con
+            # TODO: extend this to be a command channel for opening and closing cons
             if id == 0:
                 id, = struct.unpack('<H', data[2:4])
                 if DEBUG:
@@ -64,11 +65,11 @@ def _dataparse(self):
                 data = data[4:]
             # If we dont have that conn ID open
             elif not self._id_check(id):
-                if DEBUG:
-                    print('Server requested to open', id)
                 cmd, = struct.unpack('<B', data[2:3])
                 # Connect Request
                 if cmd == 1:
+                    if DEBUG:
+                        print('Server requested to open', id)
                     port, = struct.unpack('<H', data[3:5])
                     addr = ""
                     i = 5
@@ -81,9 +82,12 @@ def _dataparse(self):
                     # Open Socket
                     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                     try:
+                        print(addr, port)
                         s.connect((addr, port))
                         s.settimeout(10)
-                    except:
+                    except Exception as e:
+                        if DEBUG:
+                            print(e)
                         s.close()
                         s = None
                         self._close_id(id)
@@ -93,6 +97,14 @@ def _dataparse(self):
                         t.daemon = True
                         t.start()
                     data = data[i+1:]
+                # Invalid commands are most likely a size for a close connection
+                else:
+                    if DEBUG:
+                        print('Garbage data received', id)
+                    if len(data) >= cmd+4:
+                        data = data[cmd+4:]
+                    else:
+                        needmore = True
             # Else we send the data
             else:
                 tosend = False