Merge pull request #205 from P0cL4bs/tmp-hotfix

fix pumpkinproxy error builtins.KeyError: 'host'

config/app/pumpkinproxy.ini

@@ -3,15 +3,11 @@ downloadspoof=false
 js_inject=false
 html_inject=false
 beef=false
-replaceImages=false
 no-cache=false
 
 [set_js_inject]
 url=http://example.com/foo.js
 
-[set_replaceImages]
-path=docs/logo.png
-
 [set_beef]
 url_hook=http://172.16.149.141:3000/hook.js
 

wifipumpkin3/core/wirelessmode/restapi.py

@@ -190,10 +190,10 @@ def Configure(self):
                 % (self.DHCP["subnet"], self.DHCP["netmask"], self.DHCP["router"]),
             ],
             "kill": [
-                "iptables -w --flush",
-                "iptables -w --table nat --flush",
-                "iptables -w --delete-chain",
-                "iptables -w --table nat --delete-chain",
+                "{} -w --flush".format(self.getIptablesPath),
+                "{} -w --table nat --flush".format(self.getIptablesPath),
+                "{} -w --delete-chain".format(self.getIptablesPath),
+                "{} -w --table nat --delete-chain".format(self.getIptablesPath),
                 "killall dhpcd 2>/dev/null",
                 "ifconfig {} down".format(self.ifaceHostapd),
                 "ifconfig {} up".format(self.ifaceHostapd),

wifipumpkin3/plugins/bin/sslstrip3.py

@@ -161,6 +161,7 @@ def init(argv):
     all_plugins = base.BasePumpkin.__subclasses__()
     for p in all_plugins:
         if config.get("plugins", p.getName(), format=bool):
+            print("plugin: {} [enabled]".format(p.getName()))
             plugins_manager.plugins = p
 
     reactor.run()

wifipumpkin3/plugins/external/sslstrip/ServerConnection.py

@@ -81,9 +81,9 @@ def sendPostData(self):
         print(
             self.getPostPrefix()
             + " Data ("
-            + self.headers["host"]
+            + self.headers.get("host") if self.headers.get("host") else ' '
             + "):\n"
-            + str(self.postData)
+            + str(self.postData) if self.postData else ''
         )
         self.transport.write(self.postData)
 
@@ -92,7 +92,7 @@ def connectionMade(self):
         self.sendRequest()
         self.sendHeaders()
 
-        if self.command == "POST":
+        if self.command.decode() == "POST":
             self.sendPostData()
 
     def handleStatus(self, version, code, message):
@@ -113,15 +113,15 @@ def handleHeader(self, key, value):
                 pass
 
         if key.decode().lower() == "content-encoding":
-            if value.decode().find("gzip") != -1:
+            if "gzip" in value.decode():
                 self.isCompressed = True
 
-        if key.lower() == "location":
+        if key.decode().lower() == "location":
             value = self.replaceSecureLinks(value)
             self.urlMonitor.addRedirection(self.client.uri, value)
 
-        if key.lower() == "content-type":
-            if value.find("image") != -1:
+        if key.decode().lower() == "content-type":
+            if "image" in value.decode():
                 self.isImageRequest = True
                 print("Response is image content, not scanning...")
 
@@ -185,7 +185,7 @@ def handleResponse(self, data):
         self.shutdown()
 
     def replaceSecureLinks(self, data):
-        iterator = re.finditer(ServerConnection.urlExpression, data)
+        iterator = re.finditer(ServerConnection.urlExpression, data.decode())
 
         for match in iterator:
             url = match.group()
@@ -196,7 +196,7 @@ def replaceSecureLinks(self, data):
             url = url.replace("&", "&")
             self.urlMonitor.addSecureLink(self.client.getClientIP(), url)
 
-        data = re.sub(ServerConnection.urlExplicitPort, r"http://\1/", data)
+        data = re.sub(ServerConnection.urlExplicitPort, r"http://\1/", data.decode())
         return re.sub(ServerConnection.urlType, "http://", data)
 
     def shutdown(self):