From 57b5d94f931fde6b9c498da7dac45dbd0ce0fa72 Mon Sep 17 00:00:00 2001 From: Tomas Vanagas Date: Tue, 18 Jul 2017 18:31:54 +0000 Subject: [PATCH 1/5] Small fixes Added "revolver" directory remover in case user needs to run it more then once. --- install/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/install.sh b/install/install.sh index 41f162c..0d59014 100755 --- a/install/install.sh +++ b/install/install.sh @@ -61,7 +61,7 @@ function mostrarheader(){ conditional_clear echo -e "$red[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]" echo -e "$red[ ]" - echo -e "$red[ $red FLUXION $version" "${yellow} ${red} < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture > " ${blue}" ]" + echo -e "$red[ $red FLUXION $version" "${yellow} ${red} < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture > "${blue}"]" echo -e "$blue[ ]" echo -e "$blue[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]""$transparent" echo @@ -361,6 +361,7 @@ sleep 0.025 xterm $HOLD -title "Remove repositories" -e python remove.py +rm -rf revolver git clone https://github.com/molovo/revolver revolver chmod u+x revolver/revolver mv revolver/revolver /usr/local/bin From 8f17a4a4173f097acee7068ee5021909a824d28f Mon Sep 17 00:00:00 2001 From: Tomas Vanagas Date: Tue, 18 Jul 2017 18:33:31 +0000 Subject: [PATCH 2/5] Small fixes --- install/arch-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/arch-install.sh b/install/arch-install.sh index e969ee3..f9ce5b2 100755 --- a/install/arch-install.sh +++ b/install/arch-install.sh @@ -58,7 +58,7 @@ function mostrarheader(){ conditional_clear echo -e "$red[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]" echo -e "$red[ ]" - echo -e "$red[ $red FLUXION $version" "${yellow} ${red} < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture > " ${blue}" ]" + echo -e "$red[ $red FLUXION $version" "${yellow} ${red} < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture > "${blue}"]" echo -e "$blue[ ]" echo -e "$blue[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]""$transparent" echo @@ -267,7 +267,7 @@ else fi sleep 0.025 ############################## -echo -ne "Php-cgi........" +echo -ne "Php-cgi........." if ! hash php-cgi 2>/dev/null; then echo -e "\e[1;31mInstalling ..."$transparent"" xterm $HOLD -title "Installing php-cgi" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S php-cgi @@ -328,7 +328,7 @@ echo -ne "Unzip..........." sleep 0.025 ############################## -echo -ne "strings.........." +echo -ne "strings........." if ! hash strings 2>/dev/null; then echo -e "\e[1;31mInstalling ..."$transparent"" xterm $HOLD -title "Installing binutils" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S binutils @@ -337,7 +337,7 @@ else fi sleep 0.025 ############################# -echo -ne "fuser............" +echo -ne "fuser..........." if ! hash fuser 2>/dev/null; then echo -e "\e[1;31mInstalling ..."$transparent"" xterm $HOLD -title "Installing psmisc" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S psmisc From d69f89c6ce54ae64a59f61094492e2998578840a Mon Sep 17 00:00:00 2001 From: Tomas Vanagas Date: Tue, 18 Jul 2017 20:04:57 +0000 Subject: [PATCH 3/5] Path autocomplete Enabled path autocomplete when asked for handshake location --- fluxion.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fluxion.sh b/fluxion.sh index b719ed8..b369b3b 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -948,10 +948,9 @@ function handshakelocation { echo -e "handshake location (Example: $red$WORK_DIR.cap$transparent)" echo -e "Press ${yellow}ENTER$transparent to skip" echo - echo -ne "Path: " if [ "$FLUX_AUTO" = "0" ];then - read handshakeloc + read -e -p "Path: " handshakeloc fi fi From 88e6d357432079aebf897325a1db55280988d57c Mon Sep 17 00:00:00 2001 From: Tomas Vanagas Date: Tue, 18 Jul 2017 21:17:02 +0000 Subject: [PATCH 4/5] "CHANNEL" in line 1849 I'm not sure what this part of script is doing, but it looks like this if statement never gets "true". --- fluxion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluxion.sh b/fluxion.sh index b369b3b..285ba11 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -1846,7 +1846,7 @@ fi function preattack { # Check if channel is negative - if [ "CHANNEL" = "" ];then + if [ "$CHANNEL" = "" ];then CHANNEL=1 fi # Config HostAPD From 9784622443f6c189ed68bd4549365ecc9d1e4399 Mon Sep 17 00:00:00 2001 From: Tomas Vanagas Date: Wed, 19 Jul 2017 06:03:03 +0100 Subject: [PATCH 5/5] Site selection page split in two columns --- fluxion.sh | 116 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 47 deletions(-) diff --git a/fluxion.sh b/fluxion.sh index 285ba11..6cb18da 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -1350,53 +1350,75 @@ function ConnectionRESET { echo echo -e ""$red"["$yellow"2"$red"]"$transparent" $header_ConnectionRESET" echo - echo -e " "$red"["$yellow"$n"$red"]"$transparent" English [ENG] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" German [GER] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Russian [RUS] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Italian [IT] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Spanish [ESP] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Portuguese [POR] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Chinese [CN] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" French [FR] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Turkish [TR] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Romanian [RO] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Hungarian [HU] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Arabic [ARA] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Greek [GR] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Czech [CZ] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Norwegian [NO] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Bulgarian [BG] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Serbian [SRB] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Polish [PL] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Indonesian [ID] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Dutch [NL] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Danish [DAN] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Hebrew [HE] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Thai [TH] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Portuguese [BR] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Slovenian [SVN] (NEUTRA)";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Belkin [ENG]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Netgear [ENG]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Huawei [ENG]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Verizon [ENG]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Netgear [ESP]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Arris [ESP]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Vodafone [ESP]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" TP-Link [ENG]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Ziggo [NL]";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" KPN [NL]";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Ziggo2016 [NL]";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" FRITZBOX [DE] ";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" FRITZBOX [ENG] ";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" FRITZBOX [IT]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" GENEXIS_DE [DE] ";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Login-Netgear[Login-Netgear] ";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Login-Xfinity[Login-Xfinity] ";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Telekom ";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" Google";n=` expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent" MOVISTAR [ESP]";n=`expr $n + 1` - echo -e " "$red"["$yellow"$n"$red"]"$transparent"\e[1;31m $general_back"$transparent"" - echo + totallines=46 # number of selection lines to print + itemprinted=0 + + for line in $( seq 1 $((totallines/2+1)) ); do + for column in {0..1}; do + n=$line + if (( $column == 1 )); then + n=$((line+(totallines+1)/2)) + fi + + if (( $itemprinted < $totallines )); then + echo -e -n " "$red"["$yellow"$n"$red"]" + case $n in + 1 ) echo -e -n $transparent" English [ENG] (NEUTRA) ";; + 2 ) echo -e -n $transparent" German [GER] (NEUTRA) ";; + 3 ) echo -e -n $transparent" Russian [RUS] (NEUTRA) ";; + 4 ) echo -e -n $transparent" Italian [IT] (NEUTRA) ";; + 5 ) echo -e -n $transparent" Spanish [ESP] (NEUTRA) ";; + 6 ) echo -e -n $transparent" Portuguese [POR] (NEUTRA) ";; + 7 ) echo -e -n $transparent" Chinese [CN] (NEUTRA) ";; + 8 ) echo -e -n $transparent" French [FR] (NEUTRA) ";; + 9 ) echo -e -n $transparent" Turkish [TR] (NEUTRA) ";; + 10 ) echo -e -n $transparent" Romanian [RO] (NEUTRA) ";; + 11 ) echo -e -n $transparent" Hungarian [HU] (NEUTRA) ";; + 12 ) echo -e -n $transparent" Arabic [ARA] (NEUTRA) ";; + 13 ) echo -e -n $transparent" Greek [GR] (NEUTRA) ";; + 14 ) echo -e -n $transparent" Czech [CZ] (NEUTRA) ";; + 15 ) echo -e -n $transparent" Norwegian [NO] (NEUTRA) ";; + 16 ) echo -e -n $transparent" Bulgarian [BG] (NEUTRA) ";; + 17 ) echo -e -n $transparent" Serbian [SRB] (NEUTRA) ";; + 18 ) echo -e -n $transparent" Polish [PL] (NEUTRA) ";; + 19 ) echo -e -n $transparent" Indonesian [ID] (NEUTRA) ";; + 20 ) echo -e -n $transparent" Dutch [NL] (NEUTRA) ";; + 21 ) echo -e -n $transparent" Danish [DAN] (NEUTRA) ";; + 22 ) echo -e -n $transparent" Hebrew [HE] (NEUTRA) ";; + 23 ) echo -e -n $transparent" Thai [TH] (NEUTRA) ";; + 24 ) echo -e -n $transparent" Portuguese [BR] (NEUTRA) ";; + 25 ) echo -e -n $transparent" Slovenian [SVN] (NEUTRA) ";; + 26 ) echo -e -n $transparent" Belkin [ENG] ";; + 27 ) echo -e -n $transparent" Netgear [ENG] ";; + 28 ) echo -e -n $transparent" Huawei [ENG] ";; + 29 ) echo -e -n $transparent" Verizon [ENG] ";; + 30 ) echo -e -n $transparent" Netgear [ESP] ";; + 31 ) echo -e -n $transparent" Arris [ESP] ";; + 32 ) echo -e -n $transparent" Vodafone [ESP] ";; + 33 ) echo -e -n $transparent" TP-Link [ENG] ";; + 34 ) echo -e -n $transparent" Ziggo [NL] ";; + 35 ) echo -e -n $transparent" KPN [NL] ";; + 36 ) echo -e -n $transparent" Ziggo2016 [NL] ";; + 37 ) echo -e -n $transparent" FRITZBOX [DE] ";; + 38 ) echo -e -n $transparent" FRITZBOX [ENG] ";; + 39 ) echo -e -n $transparent" FRITZBOX [IT] ";; + 40 ) echo -e -n $transparent" GENEXIS_DE [DE] ";; + 41 ) echo -e -n $transparent" Login-Netgear[Login-Netgear] ";; + 42 ) echo -e -n $transparent" Login-Xfinity[Login-Xfinity] ";; + 43 ) echo -e -n $transparent" Telekom ";; + 44 ) echo -e -n $transparent" Google ";; + 45 ) echo -e -n $transparent" MOVISTAR [ESP] ";; + 46 ) echo -e -n $transparent"\e[1;31m $general_back"$transparent"";; + esac + + itemprinted=$((itemprinted+1)) + fi + done + echo + done + + + echo echo -n "#? " read webconf