Fixed bugs in Captive Portal attack.

Fixed a bug caused by outdated language identifiers.
Fixed a bug caused by a missing conditional in *set_interface function.

NOTICE: The back button appears to be bugged, but it's actually not.
NOTICE: The reason for that is that it skips subroutine steps.
This commit is contained in:
Matias Barcenas 2017-09-02 15:35:51 -05:00
parent 11a1a16d1c
commit 7c52bfe8f4
1 changed files with 10 additions and 6 deletions

View File

@ -29,6 +29,8 @@ function captive_portal_unset_interface() {
}
function captive_portal_set_interface() {
if [ "$WIAccessPoint" ]; then return 0; fi
captive_portal_unset_interface
# Gather candidate interfaces.
@ -42,7 +44,7 @@ function captive_portal_set_interface() {
local ifAlternateState=("")
local ifAlternateColor=("$CClr")
interface_prompt "$FLUXIONVLine $FLUXIONInterfaceQuery" InterfaceListWireless[@] \
interface_prompt "$FLUXIONVLine $CaptivePortalInterfaceQuery" InterfaceListWireless[@] \
ifAlternate[@] ifAlternateInfo[@] ifAlternateState[@] ifAlternateColor[@]
# If the monitor interface is also the AP interface,
@ -83,13 +85,16 @@ function captive_portal_run_interface() {
local wiAccessPointDevice="$InterfacePhysical"
# Create the new virtual interface with the generated identifier.
echo -e "$FLUXIONVLine $FLUXIONStartingWIAccessPointNotice"
echo -e "$FLUXIONVLine $CaptivePortalStartingInterfaceNotice"
if ! iw phy $wiAccessPointDevice interface add $wiAccessPoint type monitor 2> $FLUXIONOutputDevice; then
echo -e "$FLUXIONCannotStartWIAccessPointError"
echo -e "$FLUXIONVLine $CaptivePortalCannotStartInterfaceError"
sleep 5
return 3
fi
echo -e "$FLUXIONVLine $CaptivePortalStartedInterfaceNotice"
sleep 3
CaptivePortalRunInterface="$wiAccessPoint"
}
@ -106,7 +111,7 @@ function captive_portal_unset_auth() {
# section by taking that one option, so we unset the previous
# phase along with this one to take the user properly back.
if [ ${#CaptivePortalAuthenticationMethods[@]} -le 1 ]; then
unset_ap_service
captive_portal_unset_interface
fi
}
@ -138,7 +143,6 @@ function captive_portal_set_auth() {
APRogueAuthMode="${IOQueryFormatFields[0]}"
if [[ "$APRogueAuthMode" = "$FLUXIONGeneralBackOption" ]]; then
unset_ap_service
captive_portal_unset_auth
return 1
fi
@ -240,7 +244,7 @@ function captive_portal_set_site() {
fluxion_header
echo -e "$FLUXIONVLine $CaptivePortalInterfaceQuery"
echo -e "$FLUXIONVLine $CaptivePortalUIQuery"
echo