diff --git a/kali-install.sh b/kali-install.sh index 8580836..d701b40 100755 --- a/kali-install.sh +++ b/kali-install.sh @@ -21,7 +21,7 @@ fi make # Install dependencies -apt-get --yes install apache2 dsniff isc-dhcp-server macchanger \ +apt-get --yes install apache2 dsniff dnsmasq macchanger \ metasploit-framework python-dnspython python-pcapy python-scapy \ sslsplit stunnel4 tinyproxy procps iptables asleap scapy make install diff --git a/run-mana/conf/dhcpd-two.conf b/run-mana/conf/dhcpd-two.conf deleted file mode 100644 index 6f1fd85..0000000 --- a/run-mana/conf/dhcpd-two.conf +++ /dev/null @@ -1,17 +0,0 @@ -ddns-update-style none; - -default-lease-time 60; -max-lease-time 72; - -authoritative; - -log-facility local7; - -option wpad code 252 = text; -option wpad "http://wpad.example.com/wpad.dat\n"; - -subnet 10.1.0.0 netmask 255.255.255.0 { - range 10.1.0.100 10.1.0.254; - option routers 10.1.0.1; - option domain-name-servers 8.8.8.8; -} diff --git a/run-mana/conf/dhcpd.conf b/run-mana/conf/dhcpd.conf deleted file mode 100644 index f9cda44..0000000 --- a/run-mana/conf/dhcpd.conf +++ /dev/null @@ -1,17 +0,0 @@ -ddns-update-style none; - -default-lease-time 60; -max-lease-time 72; - -authoritative; - -log-facility local7; - -option wpad code 252 = text; -option wpad "http://wpad.example.com/wpad.dat\n"; - -subnet 10.0.0.0 netmask 255.255.255.0 { - range 10.0.0.100 10.0.0.254; - option routers 10.0.0.1; - option domain-name-servers 8.8.8.8; -} diff --git a/run-mana/conf/hostapd-mana-all.conf b/run-mana/conf/hostapd-mana-all.conf index a571440..25f38b9 100644 --- a/run-mana/conf/hostapd-mana-all.conf +++ b/run-mana/conf/hostapd-mana-all.conf @@ -6,6 +6,15 @@ driver=nl80211 ssid=Internet channel=6 +auth_algs=3 +# no SSID cloaking +ignore_broadcast_ssid=0 +# Put hostapd in white/black list mode +macaddr_acl=0 +# only used if you want to do filter by MAC address +#accept_mac_file=/etc/mana-toolkit/hostapd.accept +#deny_mac_file=/etc/mana-toolkit/hostapd.deny + bss=wlan0_0 ssid=InternetSecure ieee8021x=1 @@ -35,7 +44,7 @@ ap_max_inactivity=3000 auth_algs=3 # no SSID cloaking -ignore_broadcast_ssid=2 +ignore_broadcast_ssid=1 # -1 = log all messages logger_syslog=-1 diff --git a/run-mana/conf/hostapd-mana-eap.conf b/run-mana/conf/hostapd-mana-eap.conf index f3247fe..f7dabc7 100644 --- a/run-mana/conf/hostapd-mana-eap.conf +++ b/run-mana/conf/hostapd-mana-eap.conf @@ -6,6 +6,15 @@ driver=nl80211 ssid=AlwaysOn channel=6 +auth_algs=3 +# no SSID cloaking +ignore_broadcast_ssid=0 +# Put hostapd in white/black list mode +macaddr_acl=0 +# only used if you want to do filter by MAC address +#accept_mac_file=/etc/mana-toolkit/hostapd.accept +#deny_mac_file=/etc/mana-toolkit/hostapd.deny + bss=wlan0_0 ssid=AlwaysOnSecure ieee8021x=1 diff --git a/run-mana/mana-menu.sh b/run-mana/mana-menu.sh index 64e8f53..bcc5c76 100755 --- a/run-mana/mana-menu.sh +++ b/run-mana/mana-menu.sh @@ -1,4 +1,5 @@ #!/bin/bash +#This is a work in progress and not complete, don't use it upstream=eth0 phy=wlan0 diff --git a/run-mana/start-nat-full.sh b/run-mana/start-nat-full.sh index 0a13999..6fd76a2 100755 --- a/run-mana/start-nat-full.sh +++ b/run-mana/start-nat-full.sh @@ -22,7 +22,7 @@ sleep 5 ifconfig $phy 10.0.0.1 netmask 255.255.255.0 route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1 -dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy +dnsmasq -C /etc/mana-toolkit/dnsmasq-dhcpd.conf $phy echo '1' > /proc/sys/net/ipv4/ip_forward iptables --policy INPUT ACCEPT diff --git a/run-mana/start-nat-simple.sh b/run-mana/start-nat-simple.sh index 2f843e9..7cf82fb 100755 --- a/run-mana/start-nat-simple.sh +++ b/run-mana/start-nat-simple.sh @@ -16,7 +16,7 @@ sleep 5 ifconfig $phy 10.0.0.1 netmask 255.255.255.0 route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1 -dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy +dnsmasq -C /etc/mana-toolkit/dnsmasq-dhcpd.conf $phy echo '1' > /proc/sys/net/ipv4/ip_forward iptables --policy INPUT ACCEPT diff --git a/run-mana/start-noupstream-all.sh b/run-mana/start-noupstream-all.sh index fdd1d2b..4d1bb5a 100755 --- a/run-mana/start-noupstream-all.sh +++ b/run-mana/start-noupstream-all.sh @@ -32,8 +32,8 @@ route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1 ifconfig $phy0 10.1.0.1 netmask 255.255.255.0 route add -net 10.1.0.0 netmask 255.255.255.0 gw 10.1.0.1 -dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy -dhcpd -pf /var/run/dhcpd-two.pid -lf /var/lib/dhcp/dhcpd-two.leases -cf /etc/mana-toolkit/dhcpd-two.conf $phy0 +dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd.conf -i $phy -I lo +dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd-two.conf -i $phy0 -I lo dnsspoof -i $phy -f /etc/mana-toolkit/dnsspoof.conf& dnsspoof -i $phy0 -f /etc/mana-toolkit/dnsspoof.conf& service apache2 start diff --git a/run-mana/start-noupstream-eap.sh b/run-mana/start-noupstream-eap.sh index 56dd35c..27f54f8 100755 --- a/run-mana/start-noupstream-eap.sh +++ b/run-mana/start-noupstream-eap.sh @@ -32,9 +32,8 @@ route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1 ifconfig $phy0 10.1.0.1 netmask 255.255.255.0 route add -net 10.1.0.0 netmask 255.255.255.0 gw 10.1.0.1 -dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy -touch /var/lib/dhcp/dhcpd-two.leases -dhcpd -pf /var/run/dhcpd-two.pid -lf /var/lib/dhcp/dhcpd-two.leases -cf /etc/mana-toolkit/dhcpd-two.conf $phy0 +dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd.conf -i $phy -I lo +dnsmasq -z -C /etc/mana-toolkit/dnsmasq-dhcpd-two.conf -i $phy0 -I lo dnsspoof -i $phy -f /etc/mana-toolkit/dnsspoof.conf& dnsspoof -i $phy0 -f /etc/mana-toolkit/dnsspoof.conf& service apache2 start diff --git a/run-mana/start-noupstream-eaponly.sh b/run-mana/start-noupstream-eaponly.sh index b0ddcf8..e291f08 100755 --- a/run-mana/start-noupstream-eaponly.sh +++ b/run-mana/start-noupstream-eaponly.sh @@ -27,7 +27,7 @@ ifconfig $phy ifconfig $phy 10.0.0.1 netmask 255.255.255.0 route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1 -dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy +dnsmasq -C /etc/mana-toolkit/dnsmasq-dhcpd.conf $phy dnsspoof -i $phy -f /etc/mana-toolkit/dnsspoof.conf& service apache2 start stunnel4 /etc/mana-toolkit/stunnel.conf diff --git a/run-mana/start-noupstream.sh b/run-mana/start-noupstream.sh index 4f866fc..422f6b4 100755 --- a/run-mana/start-noupstream.sh +++ b/run-mana/start-noupstream.sh @@ -22,7 +22,7 @@ sleep 5 ifconfig $phy 10.0.0.1 netmask 255.255.255.0 route add -net 10.0.0.0 netmask 255.255.255.0 gw 10.0.0.1 -dhcpd -cf /etc/mana-toolkit/dhcpd.conf $phy +dnsmasq -C /etc/mana-toolkit/dnsmasq-dhcpd.conf $phy dnsspoof -i $phy -f /etc/mana-toolkit/dnsspoof.conf& service apache2 start stunnel4 /etc/mana-toolkit/stunnel.conf diff --git a/ubuntu-install.sh b/ubuntu-install.sh index e588102..1e0933a 100755 --- a/ubuntu-install.sh +++ b/ubuntu-install.sh @@ -7,7 +7,7 @@ echo [+] It assumes you are running Ubuntu 14.04 echo [+] If you are worried about that, hit Ctl-C now, or hit Enter to continue read -apt-get install libnl-dev isc-dhcp-server tinyproxy libssl-dev apache2 macchanger python-dnspython python-pcapy dsniff stunnel4 +apt-get install libnl-dev dnsmasq tinyproxy libssl-dev apache2 macchanger python-dnspython python-pcapy dsniff stunnel4 echo "deb http://http.kali.org/kali kali main non-free contrib" > /etc/apt/sources.list.d/mana-kali.list #echo """Package: sslsplit, python-scapy, metasploit-framework