Merge pull request #56 from H4xl0r/master

Https Block fix / support Https destinations

EvilPortal/api/module.php

@@ -575,6 +575,8 @@ class EvilPortal extends Module
         exec("iptables -A INPUT -s 172.16.42.1 -j ACCEPT");
         exec("iptables -A OUTPUT -s 172.16.42.1 -j ACCEPT");
 
+        //Block https till login 
+        exec("iptables -t nat -A PREROUTING -i br-lan -p tcp --dport 443 -j DNAT --to-destination 172.16.42.1:80");
         //exec("iptables -A INPUT -i br-lan -p tcp --dport 443 -j DROP");
         //exec("iptables -t nat -A PREROUTING -i br-lan -j DROP");
 
@@ -610,6 +612,7 @@ class EvilPortal extends Module
         }
 
         exec("iptables -t nat -D PREROUTING -i br-lan -p tcp --dport 80 -j DNAT --to-destination 172.16.42.1:80");
+        exec("iptables -t nat -D PREROUTING -i br-lan -p tcp --dport 443 -j DNAT --to-destination 172.16.42.1:80"); //enable https again
         exec("iptables -D INPUT -p tcp --dport 53 -j ACCEPT");
         exec("iptables -D INPUT -j DROP");
 

EvilPortal/includes/skeleton/index.php

@@ -1,5 +1,5 @@
 <?php
-$destination = "http://" . $_SERVER['HTTP_HOST'] . $_SERVER['HTTP_URI'] . "";
+$destination = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
 require_once('helper.php');
 ?>
 

EvilPortal/module.info

@@ -6,5 +6,5 @@
 	    "tetra"
 	],
 	"title": "Evil Portal",
-    "version": "3.1"
-}
+    "version": "3.2"
+}