diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf2bc337..975ed5018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ### 11.22 - Possibility to add manually ESSID name for selected hidden networks - Improvement on process killing on Evil Twin attacks + - Add WPS version to network selection menu for WPS networks + - Reordered networks on WPS network selection menu, now better received at the end to avoid scrolling ### 11.21 - Chinese language translation added (Thank you to "zcbxx") diff --git a/airgeddon.sh b/airgeddon.sh index bbe3ac734..82b2fc162 100755 --- a/airgeddon.sh +++ b/airgeddon.sh @@ -13394,10 +13394,10 @@ function explore_for_wps_targets_option() { manage_output "+j -bg \"#000000\" -fg \"#FFFFFF\" -geometry ${g1_topright_window} -T \"Exploring for WPS targets\"" "wash -i \"${interface}\"${wash_ifaces_already_set[${interface}]}${wash_band_modifier} | tee \"${tmpdir}wps.txt\"" "Exploring for WPS targets" "active" wait_for_process "wash -i \"${interface}\"${wash_ifaces_already_set[${interface}]}${wash_band_modifier}" "Exploring for WPS targets" - readarray -t WASH_PREVIEW < <(cat < "${tmpdir}wps.txt" 2> /dev/null) + readarray -t WASH_PREVIEW < <(cat <(head -n 2 "${tmpdir}wps.txt") <(tail -n +3 "${tmpdir}wps.txt" | sort -k3,3n 2> /dev/null)) - wash_header_found=0 - wash_line_counter=1 + local wash_header_found=0 + local wash_line_counter=1 for item in "${WASH_PREVIEW[@]}"; do if [[ ${item} =~ -{20} ]]; then wash_start_data_line="${wash_line_counter}" @@ -13451,6 +13451,7 @@ function explore_for_wps_targets_option() { expwps_bssid=$(echo "${expwps_line}" | awk '{print $1}') expwps_channel=$(echo "${expwps_line}" | awk '{print $2}') expwps_power=$(echo "${expwps_line}" | awk '{print $3}') + expwps_version=$(echo "${expwps_line}" | awk '{print $4}') expwps_locked=$(echo "${expwps_line}" | awk '{print $5}') expwps_essid=$(echo "${expwps_line//[\`\']/}" | awk -F '\t| {2,}' '{print $NF}') @@ -13499,9 +13500,9 @@ function explore_for_wps_targets_option() { wps_channels["${wash_counter}"]=${expwps_channel} wps_macs["${wash_counter}"]=${expwps_bssid} wps_lockeds["${wash_counter}"]=${expwps_locked} - echo -e "${wash_color} ${wpssp1}${wash_counter}) ${expwps_bssid} ${wpssp2}${expwps_channel} ${wpssp4}${expwps_power}% ${expwps_locked}${wpssp3} ${expwps_essid}" + echo -e "${wash_color} ${wpssp1}${wash_counter}) ${expwps_bssid} ${wpssp2}${expwps_channel} ${wpssp4}${expwps_power}% ${expwps_version} ${expwps_locked}${wpssp3} ${expwps_essid}" fi - done < "${tmpdir}wps.txt" + done < <(cat <(head -n 2 "${tmpdir}wps.txt") <(tail -n +3 "${tmpdir}wps.txt" | sort -k3,3n 2> /dev/null)) echo if [ "${wash_counter}" -eq 1 ]; then diff --git a/language_strings.sh b/language_strings.sh index 170cc0652..a5eb1f532 100644 --- a/language_strings.sh +++ b/language_strings.sh @@ -5919,19 +5919,19 @@ function initialize_language_strings() { arr["ARABIC",348]="11. معروفة PINs هجوم قائم على قاعدة بيانات (bully)" arr["CHINESE",348]="11. (bully) 基于已知 PIN 数据库的攻击" - arr["ENGLISH",349]=" N. BSSID CHANNEL PWR LOCKED ESSID" - arr["SPANISH",349]=" N. BSSID CANAL PWR LOCKED ESSID" - arr["FRENCH",349]=" N. BSSID CANAL PWR LOCKED ESSID" - arr["CATALAN",349]=" N. BSSID CANAL PWR LOCKED ESSID" - arr["PORTUGUESE",349]=" N. BSSID CANAL PWR LOCKED ESSID" - arr["RUSSIAN",349]=" N. BSSID CHANNEL PWR LOCKED ESSID" - arr["GREEK",349]=" N. BSSID CHANNEL PWR LOCKED ESSID" - arr["ITALIAN",349]=" N. BSSID CANALE PWR LOCKED ESSID" - arr["POLISH",349]=" N. BSSID KANAŁ PWR LOCKED ESSID" - arr["GERMAN",349]=" N. BSSID KANAL PWR LOCKED ESSID" - arr["TURKISH",349]=" N. BSSID KANAL PWR LOCKED ESSID" - arr["ARABIC",349]=" N. BSSID CHANNEL PWR LOCKED ESSID" - arr["CHINESE",349]=" 序号 BSSID 信道 信号强度 锁定 ESSID" + arr["ENGLISH",349]=" N. BSSID CHANNEL PWR V LOCKED ESSID" + arr["SPANISH",349]=" N. BSSID CANAL PWR V LOCKED ESSID" + arr["FRENCH",349]=" N. BSSID CANAL PWR V LOCKED ESSID" + arr["CATALAN",349]=" N. BSSID CANAL PWR V LOCKED ESSID" + arr["PORTUGUESE",349]=" N. BSSID CANAL PWR V LOCKED ESSID" + arr["RUSSIAN",349]=" N. BSSID CHANNEL PWR V LOCKED ESSID" + arr["GREEK",349]=" N. BSSID CHANNEL PWR V LOCKED ESSID" + arr["ITALIAN",349]=" N. BSSID CANALE PWR V LOCKED ESSID" + arr["POLISH",349]=" N. BSSID KANAŁ PWR V LOCKED ESSID" + arr["GERMAN",349]=" N. BSSID KANAL PWR V LOCKED ESSID" + arr["TURKISH",349]=" N. BSSID KANAL PWR V LOCKED ESSID" + arr["ARABIC",349]=" N. BSSID CHANNEL PWR V LOCKED ESSID" + arr["CHINESE",349]=" 序号 BSSID 信道 信号强度 V 锁定 ESSID" arr["ENGLISH",350]="\${blue_color}You have selected a locked WPS network \${green_color}Do you want to continue? \${normal_color}\${visual_choice}" arr["SPANISH",350]="\${blue_color}Has seleccionado una red WPS bloqueada \${green_color}¿Deseas continuar? \${normal_color}\${visual_choice}"