From 79ebf9071357b028a253ce4a3b8397079cbf2243 Mon Sep 17 00:00:00 2001 From: r4ulcl Date: Sun, 21 Jul 2024 09:11:32 +0100 Subject: [PATCH] Add ESSID_ var, remove test user --- APs/config/mgt/hostapd_wpe.conf.tmp | 2 +- APs/config/mgt/hostapd_wpe.eap_user | 2 +- APs/config/mgt/hostapd_wpe2.conf.tmp | 2 +- APs/config/mgt/hostapd_wpe_relay.conf.tmp | 2 +- APs/config/mgt/hostapd_wpe_relay.eap_user | 2 +- .../mgt/hostapd_wpe_relay_tablets.conf.tmp | 2 +- .../mgt/hostapd_wpe_relay_tablets.eap_user | 2 +- APs/config/mgt/hostapd_wpe_tls.conf.tmp | 2 +- APs/config/mgt/hostapd_wpe_tls.eap_user | 2 +- APs/config/open/hostapd_open.conf.tmp | 2 +- APs/config/open/hostapd_open_hidden.conf.tmp | 2 +- APs/config/psk/hostapd_other0.conf.tmp | 2 +- APs/config/psk/hostapd_other1.conf.tmp | 2 +- APs/config/psk/hostapd_other2.conf.tmp | 2 +- APs/config/psk/hostapd_other3.conf.tmp | 2 +- APs/config/psk/hostapd_wpa.conf.tmp | 2 +- APs/config/wep/hostapd_wep.conf.tmp | 2 +- APs/config/wlan_config_aps | 33 ++++++++++++++++--- APs/config/wpa3/hostapd_bruteforce.conf.tmp | 2 +- APs/config/wpa3/hostapd_downgrade.conf.tmp | 2 +- 20 files changed, 47 insertions(+), 24 deletions(-) diff --git a/APs/config/mgt/hostapd_wpe.conf.tmp b/APs/config/mgt/hostapd_wpe.conf.tmp index 5001e37..bbc6ae5 100755 --- a/APs/config/mgt/hostapd_wpe.conf.tmp +++ b/APs/config/mgt/hostapd_wpe.conf.tmp @@ -12,7 +12,7 @@ private_key_passwd=whatever #dh_file=/etc/hostapd-wpe/dh # 802.11 Options -ssid=wifi-corp +ssid=$ESSID_MGT channel=44 # WPE Options - Dont need to change these to make it all work diff --git a/APs/config/mgt/hostapd_wpe.eap_user b/APs/config/mgt/hostapd_wpe.eap_user index 004a52f..ef21549 100644 --- a/APs/config/mgt/hostapd_wpe.eap_user +++ b/APs/config/mgt/hostapd_wpe.eap_user @@ -107,7 +107,7 @@ #"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] * PEAP,TTLS,TLS,FAST [ver=1] -"t" GTC,TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "password" [2] +#"t" GTC,TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "password" [2] "CONTOSO\Administrator" GTC "SuperSecure@!@" [2] "CONTOSO\juan.tr" MSCHAPV2 "bulldogs1234" [2] diff --git a/APs/config/mgt/hostapd_wpe2.conf.tmp b/APs/config/mgt/hostapd_wpe2.conf.tmp index a4e9f0b..8ad66c4 100755 --- a/APs/config/mgt/hostapd_wpe2.conf.tmp +++ b/APs/config/mgt/hostapd_wpe2.conf.tmp @@ -12,7 +12,7 @@ private_key_passwd=whatever #dh_file=/etc/hostapd-wpe/dh # 802.11 Options -ssid=wifi-corp +ssid=$ESSID_MGT2 channel=44 # WPE Options - Dont need to change these to make it all work diff --git a/APs/config/mgt/hostapd_wpe_relay.conf.tmp b/APs/config/mgt/hostapd_wpe_relay.conf.tmp index e3360d7..b343c4b 100755 --- a/APs/config/mgt/hostapd_wpe_relay.conf.tmp +++ b/APs/config/mgt/hostapd_wpe_relay.conf.tmp @@ -12,7 +12,7 @@ private_key_passwd=whatever #dh_file=/etc/hostapd-wpe/dh # 802.11 Options -ssid=wifi-regional +ssid=$ESSID_MGTRELAY channel=44 # WPE Options - Dont need to change these to make it all work diff --git a/APs/config/mgt/hostapd_wpe_relay.eap_user b/APs/config/mgt/hostapd_wpe_relay.eap_user index 1ea0487..a253131 100644 --- a/APs/config/mgt/hostapd_wpe_relay.eap_user +++ b/APs/config/mgt/hostapd_wpe_relay.eap_user @@ -107,7 +107,7 @@ #"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] * PEAP,TTLS,TLS,FAST [ver=1] -"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] +#"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] #"t" GTC,TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "password" [2] diff --git a/APs/config/mgt/hostapd_wpe_relay_tablets.conf.tmp b/APs/config/mgt/hostapd_wpe_relay_tablets.conf.tmp index d9257ea..bc98f16 100755 --- a/APs/config/mgt/hostapd_wpe_relay_tablets.conf.tmp +++ b/APs/config/mgt/hostapd_wpe_relay_tablets.conf.tmp @@ -12,7 +12,7 @@ private_key_passwd=whatever #dh_file=/etc/hostapd-wpe/dh # 802.11 Options -ssid=wifi-regional-tablets +ssid=$ESSID_MGTRELAY_TABLETS channel=44 # WPE Options - Dont need to change these to make it all work diff --git a/APs/config/mgt/hostapd_wpe_relay_tablets.eap_user b/APs/config/mgt/hostapd_wpe_relay_tablets.eap_user index 0feec11..bfbbe43 100644 --- a/APs/config/mgt/hostapd_wpe_relay_tablets.eap_user +++ b/APs/config/mgt/hostapd_wpe_relay_tablets.eap_user @@ -107,7 +107,7 @@ #"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] * PEAP,TTLS,TLS,FAST [ver=1] -"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] +#"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] #"t" GTC,TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "password" [2] diff --git a/APs/config/mgt/hostapd_wpe_tls.conf.tmp b/APs/config/mgt/hostapd_wpe_tls.conf.tmp index bd4b934..f2b41e8 100755 --- a/APs/config/mgt/hostapd_wpe_tls.conf.tmp +++ b/APs/config/mgt/hostapd_wpe_tls.conf.tmp @@ -12,7 +12,7 @@ private_key_passwd=whatever #dh_file=/etc/hostapd-wpe/dh # 802.11 Options -ssid=wifi-global +ssid=$ESSID_MGTTLS channel=44 # WPE Options - Dont need to change these to make it all work diff --git a/APs/config/mgt/hostapd_wpe_tls.eap_user b/APs/config/mgt/hostapd_wpe_tls.eap_user index 5ef2ca5..cf7bb9c 100644 --- a/APs/config/mgt/hostapd_wpe_tls.eap_user +++ b/APs/config/mgt/hostapd_wpe_tls.eap_user @@ -105,7 +105,7 @@ # WPE - DO NOT REMOVE - These entries are specifically in here #* PEAP,TTLS,TLS,FAST #* TLS -"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] +#"t" TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2 "t" [2] * TLS diff --git a/APs/config/open/hostapd_open.conf.tmp b/APs/config/open/hostapd_open.conf.tmp index 1b11fab..5a36c8f 100644 --- a/APs/config/open/hostapd_open.conf.tmp +++ b/APs/config/open/hostapd_open.conf.tmp @@ -3,7 +3,7 @@ driver=nl80211 hw_mode=g channel=6 -ssid=wifi-guest +ssid=$ESSID_OPN wpa=0 diff --git a/APs/config/open/hostapd_open_hidden.conf.tmp b/APs/config/open/hostapd_open_hidden.conf.tmp index e7c87af..7bde891 100644 --- a/APs/config/open/hostapd_open_hidden.conf.tmp +++ b/APs/config/open/hostapd_open_hidden.conf.tmp @@ -3,7 +3,7 @@ driver=nl80211 hw_mode=g channel=11 -ssid=wifi-free +ssid=$ESSID_OPN_HIDDEN wpa=0 diff --git a/APs/config/psk/hostapd_other0.conf.tmp b/APs/config/psk/hostapd_other0.conf.tmp index 710e55f..286a219 100644 --- a/APs/config/psk/hostapd_other0.conf.tmp +++ b/APs/config/psk/hostapd_other0.conf.tmp @@ -3,7 +3,7 @@ driver=nl80211 hw_mode=g channel=3 -ssid=MOVISTAR_JYG2 +ssid=$ESSID_OTHER0 wpa=2 wpa_key_mgmt=WPA-PSK diff --git a/APs/config/psk/hostapd_other1.conf.tmp b/APs/config/psk/hostapd_other1.conf.tmp index e84a28f..c243b5b 100644 --- a/APs/config/psk/hostapd_other1.conf.tmp +++ b/APs/config/psk/hostapd_other1.conf.tmp @@ -3,7 +3,7 @@ driver=nl80211 hw_mode=g channel=6 -ssid=WIFI-JUAN +ssid=$ESSID_OTHER1 wpa=2 wpa_key_mgmt=WPA-PSK diff --git a/APs/config/psk/hostapd_other2.conf.tmp b/APs/config/psk/hostapd_other2.conf.tmp index 68499d8..fa0493a 100644 --- a/APs/config/psk/hostapd_other2.conf.tmp +++ b/APs/config/psk/hostapd_other2.conf.tmp @@ -3,7 +3,7 @@ driver=nl80211 hw_mode=g channel=9 -ssid=vodafone7123 +ssid=$ESSID_OTHER2 wpa=2 wpa_key_mgmt=WPA-PSK diff --git a/APs/config/psk/hostapd_other3.conf.tmp b/APs/config/psk/hostapd_other3.conf.tmp index b6dc461..2aa4fc7 100644 --- a/APs/config/psk/hostapd_other3.conf.tmp +++ b/APs/config/psk/hostapd_other3.conf.tmp @@ -3,7 +3,7 @@ driver=nl80211 hw_mode=g channel=6 -ssid=MiFibra-5-D6G3 +ssid=$ESSID_OTHER3 wpa=2 wpa_key_mgmt=WPA-PSK diff --git a/APs/config/psk/hostapd_wpa.conf.tmp b/APs/config/psk/hostapd_wpa.conf.tmp index 8982694..588c56a 100644 --- a/APs/config/psk/hostapd_wpa.conf.tmp +++ b/APs/config/psk/hostapd_wpa.conf.tmp @@ -3,7 +3,7 @@ driver=nl80211 hw_mode=g channel=6 -ssid=wifi-mobile +ssid=$ESSID_PSK wpa=2 wpa_key_mgmt=WPA-PSK diff --git a/APs/config/wep/hostapd_wep.conf.tmp b/APs/config/wep/hostapd_wep.conf.tmp index eb95708..8d0eed2 100644 --- a/APs/config/wep/hostapd_wep.conf.tmp +++ b/APs/config/wep/hostapd_wep.conf.tmp @@ -4,7 +4,7 @@ driver=nl80211 hw_mode=g channel=3 -ssid=wifi-old +ssid=$ESSID_WEP #wpa=2 #wpa_key_mgmt=WPA-PSK #wpa_pairwise=CCMP TKIP diff --git a/APs/config/wlan_config_aps b/APs/config/wlan_config_aps index 8a27093..8814a9d 100644 --- a/APs/config/wlan_config_aps +++ b/APs/config/wlan_config_aps @@ -1,16 +1,20 @@ #SET WLAN AND IP FOR EVERYTHING +ESSID_OPN='wifi-guest' WLAN_OPN=wlan10 IP_OPN='192.168.10' MAC_OPN='F0:9F:C2:71:22:10' +ESSID_WEP='wifi-old' WLAN_WEP=wlan11 IP_WEP='192.168.1' MAC_WEP='F0:9F:C2:71:22:11' +ESSID_PSK='wifi-mobile' WLAN_PSK=wlan12 IP_PSK='192.168.2' MAC_PSK='F0:9F:C2:71:22:12' +# ------------------------------------------ WLAN_WPS=wlan13 IP_WPS='192.168.3' MAC_WPS='F0:9F:C2:71:22:13' @@ -19,63 +23,82 @@ WLAN_KRACK=wlan14 IP_KRACK='192.168.4' MAC_KRACK='F0:9F:C2:71:22:14' +# ------------------------------------------ + +ESSID_MGT='wifi-corp' WLAN_MGT=wlan15 IP_MGT='192.168.5' MAC_MGT='F0:9F:C2:71:22:15' +ESSID_MGT2='wifi-corp' WLAN_MGT2=wlan16 IP_MGT2='192.168.6' MAC_MGT2='F0:9F:C2:71:22:1A' +ESSID_MGTRELAY='wifi-regional' WLAN_MGTRELAY=wlan17 IP_MGTRELAY='192.168.7' MAC_MGTRELAY='F0:9F:C2:71:22:16' +ESSID_MGTTLS='wifi-global' WLAN_MGTTLS=wlan18 IP_MGTTLS='192.168.8' MAC_MGTTLS='F0:9F:C2:71:22:17' +# ------------------------------------------ WLAN_PMKID=wlan19 IP_PMKID='192.168.9' MAC_PMKID='F0:9F:C2:72:33:19' +# ------------------------------------------ +ESSID_OTHER0='MOVISTAR_JYG2' WLAN_OTHER0=wlan20 IP_OTHER0='192.168.30' -MAC_OTHER0='' +MAC_OTHER0='88:15:44:AA:3A:10' +ESSID_OTHER1='WIFI-JUAN' WLAN_OTHER1=wlan21 IP_OTHER1='192.168.11' -MAC_OTHER1='' +MAC_OTHER1='88:15:44:BC:FA:C1' +ESSID_OTHER2='vodafone7123' WLAN_OTHER2=wlan22 IP_OTHER2='192.168.12' -MAC_OTHER2='' +MAC_OTHER2='88:15:44:BF:99:A2' +ESSID_OTHER3='MiFibra-5-D6G3' WLAN_OTHER3=wlan23 IP_OTHER3='192.168.13' -MAC_OTHER3='' +MAC_OTHER3='88:15:44:78:8A:F3' +ESSID_BRUTEFORCE='wifi-management' WLAN_BRUTEFORCE=wlan24 IP_BRUTEFORCE='192.168.14' MAC_BRUTEFORCE='F0:9F:C2:11:0A:24' - +ESSID_DOWNGRADE='wifi-IT' WLAN_DOWNGRADE=wlan25 IP_DOWNGRADE='192.168.15' MAC_DOWNGRADE='F0:9F:C2:1A:CA:25' +ESSID_OPN_HIDDEN='wifi-free' WLAN_OPN_HIDDEN=wlan26 IP_OPN_HIDDEN='192.168.16' MAC_OPN_HIDDEN='F0:9F:C2:6A:88:26' +# ------------------------------------------ WLAN_MGT_LEGACY=wlan27 IP_MGT_LEGACY='192.168.17' MAC_MGT_LEGACY='F0:9F:CB:3F:AA:17' +# ------------------------------------------ +ESSID_MGTRELAY_TABLETS='wifi-regional-tablets' WLAN_MGTRELAY_TABLETS=wlan28 IP_MGTRELAY_TABLETS='192.168.18' MAC_MGTRELAY_TABLETS='F0:9F:C2:7A:33:28' +# ------------------------------------------ WLAN_=wlan30 IP_='192.168.20' MAC_='' +# ------------------------------------------ \ No newline at end of file diff --git a/APs/config/wpa3/hostapd_bruteforce.conf.tmp b/APs/config/wpa3/hostapd_bruteforce.conf.tmp index 53f60f0..73fe927 100644 --- a/APs/config/wpa3/hostapd_bruteforce.conf.tmp +++ b/APs/config/wpa3/hostapd_bruteforce.conf.tmp @@ -8,7 +8,7 @@ logger_stdout=-1 logger_stdout_level=2 ctrl_interface=/var/run/hostapd ctrl_interface_group=0 -ssid=wifi-management +ssid=$ESSID_BRUTEFORCE hw_mode=g channel=11 beacon_int=100 diff --git a/APs/config/wpa3/hostapd_downgrade.conf.tmp b/APs/config/wpa3/hostapd_downgrade.conf.tmp index 692da94..326b966 100644 --- a/APs/config/wpa3/hostapd_downgrade.conf.tmp +++ b/APs/config/wpa3/hostapd_downgrade.conf.tmp @@ -6,7 +6,7 @@ logger_stdout=-1 logger_stdout_level=2 ctrl_interface=/var/run/hostapd ctrl_interface_group=0 -ssid=wifi-IT +ssid=$ESSID_DOWNGRADE hw_mode=g channel=11 beacon_int=100