Fixed path bugs & incremented revision.
Fixed bugs with the Captive Portal attack caused by incorrectly set paths. Incremented revision to reflect significant changes to path handling.
This commit is contained in:
parent
0bf7a399a0
commit
cacae7aa4c
|
@ -144,7 +144,7 @@ function captive_portal_set_ap_service() {
|
||||||
if [ "$CaptivePortalAPService" ]; then
|
if [ "$CaptivePortalAPService" ]; then
|
||||||
if ! type -t ap_service_start; then
|
if ! type -t ap_service_start; then
|
||||||
# AP Service: Load the service's helper routines.
|
# AP Service: Load the service's helper routines.
|
||||||
source "lib/ap/$CaptivePortalAPService.sh"
|
source "$FLUXIONLibPath/ap/$CaptivePortalAPService.sh"
|
||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
@ -189,7 +189,7 @@ function captive_portal_set_ap_service() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# AP Service: Load the service's helper routines.
|
# AP Service: Load the service's helper routines.
|
||||||
source "lib/ap/$CaptivePortalAPService.sh"
|
source "$FLUXIONLibPath/ap/$CaptivePortalAPService.sh"
|
||||||
}
|
}
|
||||||
|
|
||||||
captive_portal_unset_authenticator() {
|
captive_portal_unset_authenticator() {
|
||||||
|
@ -459,17 +459,17 @@ captive_portal_set_user_interface() {
|
||||||
local sites=()
|
local sites=()
|
||||||
|
|
||||||
# Attempt adding generic portals only if the directory exists.
|
# Attempt adding generic portals only if the directory exists.
|
||||||
if [ -d attacks/Captive\ Portal/generic/languages ]; then
|
if [ -d "$FLUXIONPath/attacks/Captive Portal/generic/languages" ]; then
|
||||||
# Normalize the names of the generic portals for presentation.
|
# Normalize the names of the generic portals for presentation.
|
||||||
for site in attacks/Captive\ Portal/generic/languages/*.lang; do
|
for site in "$FLUXIONPath/attacks/Captive Portal/generic/languages/"*.lang; do
|
||||||
sites+=("${CaptivePortalGenericInterfaceOption}_$(basename "${site%.lang}")")
|
sites+=("${CaptivePortalGenericInterfaceOption}_$(basename "${site%.lang}")")
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Attempt adding custom portals only if the directory exists.
|
# Attempt adding custom portals only if the directory exists.
|
||||||
if [ -d attacks/Captive\ Portal/sites ]; then
|
if [ -d "$FLUXIONPath/attacks/Captive Portal/sites" ]; then
|
||||||
# Retrieve available portal sites and strip the .portal extension.
|
# Retrieve available portal sites and strip the .portal extension.
|
||||||
for site in attacks/Captive\ Portal/sites/*.portal; do
|
for site in "$FLUXIONPath/attacks/Captive Portal/sites/"*.portal; do
|
||||||
sites+=("$(basename "${site%.portal}")")
|
sites+=("$(basename "${site%.portal}")")
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -22,7 +22,7 @@ readonly FLUXIONNoiseFloor=-90
|
||||||
readonly FLUXIONNoiseCeiling=-60
|
readonly FLUXIONNoiseCeiling=-60
|
||||||
|
|
||||||
readonly FLUXIONVersion=4
|
readonly FLUXIONVersion=4
|
||||||
readonly FLUXIONRevision=10
|
readonly FLUXIONRevision=11
|
||||||
|
|
||||||
# Declare window ration bigger = smaller windows
|
# Declare window ration bigger = smaller windows
|
||||||
FLUXIONWindowRatio=4
|
FLUXIONWindowRatio=4
|
||||||
|
|
|
@ -45,8 +45,8 @@ io_input_enumerated_choice() {
|
||||||
IOInputEnumeratedChoice=${__io_input_enumerated_choice__choices[$IOInputChoice]}
|
IOInputEnumeratedChoice=${__io_input_enumerated_choice__choices[$IOInputChoice]}
|
||||||
}
|
}
|
||||||
|
|
||||||
# This outputs formatted lines of fields.
|
# This function outputs formatted lines of fields.
|
||||||
# The takes an output file (like stdout),
|
# The function takes an output file (like stdout),
|
||||||
# a "printf format string," and a variable number
|
# a "printf format string," and a variable number
|
||||||
# of indirect-expansion passed arrays (reference).
|
# of indirect-expansion passed arrays (reference).
|
||||||
# NOTICE: At least the first array must be passed!
|
# NOTICE: At least the first array must be passed!
|
||||||
|
|
Loading…
Reference in New Issue