Resolved issue with exploit (threat9#766) (threat9#767)

GH0st3rs · Sep 18, 2024 · 7f30fe3 · 7f30fe3
1 parent 32c2acd
commit 7f30fe3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/routersploit/libs/apiros/apiros_client.py b/routersploit/libs/apiros/apiros_client.py
@@ -145,7 +145,7 @@ def readStr(self, length):
         ret = ''
         while len(ret) < length:
             s = self.sk.recv(length - len(ret))
-            if s == '':
+            if s is None or s == '':
                 raise RuntimeError("connection closed by remote end")
 
             ret += s.decode('UTF-8', 'replace')

diff --git a/routersploit/modules/creds/routers/mikrotik/api_ros_default_creds.py b/routersploit/modules/creds/routers/mikrotik/api_ros_default_creds.py
@@ -51,7 +51,7 @@ def target_function(self, running, creds):
 
                 tcp_client = self.tcp_create()
                 tcp_sock = tcp_client.connect()
-                apiros = ApiRosClient(tcp_sock)
+                apiros = ApiRosClient(tcp_client)
 
                 output = apiros.login(username, password)
 
@@ -65,6 +65,9 @@ def target_function(self, running, creds):
                     print_error("Authentication Failed - Username: '{}' Password: '{}'".format(username, password), verbose=self.verbosity)
 
                 tcp_client.close()
+
+            except RuntimeError:
+                print_error("Connection closed by remote end")
 
             except StopIteration:
                 break