Merge pull request #374 from v1s1t0r1sh3r3/dev

Dev to master v10.20

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,14 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
 <!--- Please, consider to contact us on Discord or IRC before opening an issue. More info and Discord invitation link here: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Contact -->
+<!--- Did you read the FAQ & Troubleshooting wiki section before asking? Maybe the answer is there: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/FAQ%20&%20Troubleshooting -->
 <!--- Answer the questions to provide maximum of info -->
 <!--- Filling this issue template is mandatory. Otherwise the issue can be directly closed -->
 <!--- Write in English only -->

.github/ISSUE_TEMPLATE/feature-request---compatibility-enhancement.md

@@ -1,10 +1,14 @@
 ---
 name: Feature request / compatibility enhancement
 about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
 <!--- Please, consider to contact us on Discord or IRC before opening an issue. More info and Discord invitation link here: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Contact -->
+<!--- Did you read the FAQ & Troubleshooting wiki section before doing this? Maybe the answer is there: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/FAQ%20&%20Troubleshooting -->
 <!--- Answer the questions to provide maximum of info -->
 <!--- Filling this issue template is mandatory. Otherwise the issue can be directly closed -->
 <!--- Write in English only -->

.github/ISSUE_TEMPLATE/general-question.md

@@ -1,10 +1,14 @@
 ---
 name: General question
 about: Ask some general question
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
 <!--- Please, consider to contact us on Discord or IRC before opening an issue. More info and Discord invitation link here: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Contact -->
+<!--- Did you read the FAQ & Troubleshooting wiki section before asking? Maybe the answer is there: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/FAQ%20&%20Troubleshooting -->
 <!--- Answer the questions to provide maximum of info -->
 <!--- Filling this issue template is mandatory. Otherwise the issue can be directly closed -->
 <!--- Write in English only -->

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 10.20
+ - Big language strings array now loaded only once and printing system changed. Speed highly improved
+ - Fixed problem for handshake detection on captured files containing only handshake (without pmkid)
+ - Missing dependencies plugin adapted to install some special (missing on repos due retirement) packages
+ - Dockerfile adapted to work flawlessly with the deprecated retired packages
+
 ### 10.11
  - Fixed error on PMKID capturing due hcxdumptool different params for different versions
  - Added feature to detect captured PMKID while capturing Handshake

Dockerfile

@@ -13,12 +13,9 @@ LABEL \
 #Env vars
 ENV AIRGEDDON_URL="https://github.com/v1s1t0r1sh3r3/airgeddon.git"
 ENV HASHCAT2_URL="https://github.com/v1s1t0r1sh3r3/hashcat2.0.git"
-ENV BETTERCAP162_URL="https://github.com/v1s1t0r1sh3r3/bettercap1.6.2.git"
+ENV PACKAGES_URL="https://github.com/v1s1t0r1sh3r3/airgeddon_deb_packages.git"
 ENV DEBIAN_FRONTEND="noninteractive"
 
-#Update repo sources
-RUN sed -i 's|parrot.sh|parrot.sh/mirrors|' /etc/apt/sources.list.d/parrot.list
-
 #Update system
 RUN apt update
 
@@ -77,7 +74,6 @@ RUN \
 	iptables \
 	nftables \
 	ettercap-text-only \
-	sslstrip \
 	isc-dhcp-server \
 	dsniff \
 	reaver \
@@ -88,19 +84,8 @@ RUN \
 	john \
 	openssl \
 	hcxtools \
-	hcxdumptool
-
-#Install needed dependencies for Bettercap and BeEF
-RUN \
-	apt -y install \
-	beef-xss \
-	bettercap \
-	ruby-packetfu \
-	ruby-colorize \
-	ruby-net-dns \
-	ruby-em-proxy \
-	ruby-network-interface \
-	net-tools
+	hcxdumptool \
+	beef-xss
 
 #Env var for display
 ENV DISPLAY=":0"
@@ -139,10 +124,37 @@ RUN \
 	cp /opt/hashcat2.0/hashcat /usr/bin/ && \
 	chmod +x /usr/bin/hashcat
 
-#Downgrade Bettercap
+#Install Bettercap and some dependencies
+RUN \
+	apt -y install \
+	ruby && \
+	gem install bettercap
+
+#Install special or deprecated packages and dependencies
 RUN \
-	git clone ${BETTERCAP162_URL} && \
-	dpkg -i /opt/bettercap1.6.2/bettercap_1.6.2-0parrot1_all.deb
+	git clone ${PACKAGES_URL} && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-attr_19.3.0-2_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-six_1.14.0-2_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-automat_0.8.0-1_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-constantly_15.1.0-1_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-hamcrest_1.9.0-2_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-idna_2.6-2_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-hyperlink_19.0.0-1_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-incremental_16.10.1-3.1_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-ipaddress_1.0.17-1_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/libffi6_3.2.1-9_amd64.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-cffi-backend_1.13.2-1_amd64.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-enum34_1.1.6-2_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-cryptography_2.8-3+b1_amd64.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-openssl_19.0.0-1_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-pyasn1_0.4.2-3_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-pyasn1-modules_0.2.1-0.2_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-service-identity_18.1.0-5_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-zope.interface_4.7.1-1+b1_amd64.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-twisted-bin_18.9.0-10_amd64.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-twisted-core_18.9.0-10_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/python-twisted-web_18.9.0-10_all.deb && \
+	dpkg -i /opt/airgeddon_deb_packages/amd64/sslstrip_0.9-1kali3_all.deb
 
 #Clean packages
 RUN \
@@ -160,7 +172,7 @@ RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/Dockerfile > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/binaries > /dev/null 2>&1 && \
 	rm -rf /opt/hashcat2.0 > /dev/null 2>&1 && \
-	rm -rf /opt/bettercap1.6.2 > /dev/null 2>&1 && \
+	rm -rf /opt/airgeddon_deb_packages > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/plugins/* > /dev/null 2>&1 && \
 	rm -rf /tmp/* > /dev/null 2>&1 && \
 	rm -rf /var/lib/apt/lists/* > /dev/null 2>&1

README.md

@@ -40,6 +40,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 	 - [Mac OSX]
 	 - [Windows]
   - [Other Sources]
+  - [FAQ & Troubleshooting]
 
 
 - *IV. Project & Development*
@@ -85,6 +86,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 [Mac OSX]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Docker%20Mac%20OSX
 [Windows]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Docker%20Windows
 [Other Sources]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Other%20Sources
+[FAQ & Troubleshooting]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/FAQ%20&%20Troubleshooting
 [Plugins system]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Plugins%20System
 [Plugins development]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Plugins%20Development
 [Plugins Hall of Fame]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Plugins%20Hall%20of%20Fame
@@ -96,7 +98,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 [Hat Tip To]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Hat%20Tip%20To
 [Inspiration]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Inspiration
 
-[Version-shield]: https://img.shields.io/badge/version-10.11-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-10.20-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
 [Bash4.2-shield]: https://img.shields.io/badge/bash-4.2%2B-blue.svg?style=flat-square&colorA=273133&colorB=00db00 "Bash 4.2 or later"
 [License-shield]: https://img.shields.io/badge/license-GPL%20v3%2B-blue.svg?style=flat-square&colorA=273133&colorB=bd0000 "GPL v3+"
 [Docker-shield]: https://img.shields.io/docker/cloud/automated/v1s1t0r1sh3r3/airgeddon.svg?style=flat-square&colorA=273133&colorB=a9a9a9 "Docker rules!"

airgeddon.sh

@@ -2,7 +2,7 @@
 #Title........: airgeddon.sh
 #Description..: This is a multi-use bash script for Linux systems to audit wireless networks.
 #Author.......: v1s1t0r
-#Version......: 10.11
+#Version......: 10.20
 #Usage........: bash airgeddon.sh
 #Bash Version.: 4.2 or later
 
@@ -126,8 +126,8 @@ declare -A possible_alias_names=(
 								)
 
 #General vars
-airgeddon_version="10.11"
-language_strings_expected_version="10.11-1"
+airgeddon_version="10.20"
+language_strings_expected_version="10.20-1"
 standardhandshake_filename="handshake-01.cap"
 standardpmkid_filename="pmkid_hash.txt"
 timeout_capture_handshake="20"
@@ -734,12 +734,15 @@ function special_text_missed_optional_tool() {
 		done
 	fi
 
+	local message
+	message=$(replace_string_vars "${@}")
+
 	if [ ${allowed_menu_option} -eq 1 ]; then
-		last_echo "${arr[${1},${2}]}" "${normal_color}"
+		last_echo "${message}" "${normal_color}"
 	else
-		[[ ${arr[${1},${2}]} =~ ^([0-9]+)\.(.*)$ ]] && forbidden_options+=("${BASH_REMATCH[1]}")
+		[[ ${message} =~ ^([0-9]+)\.(.*)$ ]] && forbidden_options+=("${BASH_REMATCH[1]}")
 		tools_needed=${tools_needed:: -1}
-		echo_red_slim "${arr[${1},${2}]} (${tools_needed})"
+		echo_red_slim "${message} (${tools_needed})"
 	fi
 }
 
@@ -2164,6 +2167,7 @@ function language_menu() {
 			invalid_language_selected
 		;;
 	esac
+	initialize_language_strings
 
 	language_menu
 }
@@ -6959,7 +6963,7 @@ function check_bssid_in_captured_file() {
 		get_aircrack_version
 		if compare_floats_greater_or_equal "${aircrack_version}" "${aircrack_pmkid_version}"; then
 			local nets_from_file2
-			nets_from_file2=$(echo "1" | aircrack-ng "${1}" 2> /dev/null | grep -E "handshake, with PMKID" | awk '{ saved = $1; $1 = ""; print substr($0, 2) }')
+			nets_from_file2=$(echo "1" | aircrack-ng "${1}" 2> /dev/null | grep -E "WPA \([1-9][0-9]? handshake|handshake, with PMKID" | awk '{ saved = $1; $1 = ""; print substr($0, 2) }')
 		fi
 	fi
 
@@ -7082,7 +7086,7 @@ function select_wpa_bssid_target_from_captured_file() {
 	if [ "${2}" = "only_handshake" ]; then
 		nets_from_file=$(echo "1" | aircrack-ng "${1}" 2> /dev/null | grep -E "WPA \([1-9][0-9]? handshake" | awk '{ saved = $1; $1 = ""; print substr($0, 2) }')
 	else
-		nets_from_file=$(echo "1" | aircrack-ng "${1}" 2> /dev/null | grep -E "handshake, with PMKID" | awk '{ saved = $1; $1 = ""; print substr($0, 2) }')
+		nets_from_file=$(echo "1" | aircrack-ng "${1}" 2> /dev/null | grep -E "WPA \([1-9][0-9]? handshake|handshake, with PMKID" | awk '{ saved = $1; $1 = ""; print substr($0, 2) }')
 	fi
 
 	echo
@@ -9910,6 +9914,11 @@ function set_enterprise_control_script() {
 
 			echo -ne "\033[K\033[u"
 			sleep 0.3
+			current_window_size="$(tput cols)x$(tput lines)"
+			if [ "${current_window_size}" != "${stored_window_size}" ]; then
+				stored_window_size="${current_window_size}"
+				clear
+			fi
 		done
 
 		if [ "${enterprise_heredoc_mode}" = "smooth" ]; then
@@ -10191,6 +10200,11 @@ function set_et_control_script() {
 			fi
 			echo -ne "\033[K\033[u"
 			sleep 0.3
+			current_window_size="$(tput cols)x$(tput lines)"
+			if [ "${current_window_size}" != "${stored_window_size}" ]; then
+				stored_window_size="${current_window_size}"
+				clear
+			fi
 		done
 	EOF
 
@@ -12292,7 +12306,7 @@ function explore_for_wps_targets_option() {
 
 			if [[ ${expwps_power} -lt 0 ]]; then
 				if [[ ${expwps_power} -eq -1 ]]; then
-					exp_power=0
+					expwps_power=0
 				else
 					expwps_power=$((expwps_power + 100))
 				fi
@@ -14632,7 +14646,7 @@ function print_configuration_vars_issues() {
 			if [ -z "${!error_var_state}" ]; then
 				error_var_default_value="${errors_on_configuration_vars[${item},"${error_var_state}"]}"
 				stop_on_var_errors=1
-				if [ "${error_var_state}" = "missing_var"  ]; then
+				if [ "${error_var_state}" = "missing_var" ]; then
 					echo
 					language_strings "${language}" 614 "yellow"
 				else
@@ -15569,6 +15583,7 @@ function main() {
 	fi
 
 	check_language_strings
+	initialize_language_strings
 	iptables_nftables_detection
 	set_mdk_version
 	dependencies_modifications

known_pins.db

@@ -500,6 +500,7 @@ function set_pin_database() {
 	PINDB["F8E1CF"]="12345670"
 	PINDB["F8ED80"]="12345670"
 	PINDB["F8F111"]="71031811 11212256 46518408 08114419"
+	PINDB["F8F739"]="12345670"
 	PINDB["F8FB53"]="12345670"
 	PINDB["F8FB56"]="12345670"
 	PINDB["FC7516"]="46264848"