Merge pull request #454 from v1s1t0r1sh3r3/dev

Dev to master v10.42

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7ELM486P7XKKG', 'https://www.blockchain.com/btc/address/1NSzwqtBBdo4CrvynPZmd85xfbL7hw3Ptu', 'https://www.blockchain.com/eth/address/0xf88107ba5e10776a37ec089a7ed2bac57638eea7', 'https://www.buymeacoffee.com/v1s1t0r']
+custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7ELM486P7XKKG', 'https://github.com/sponsors/v1s1t0r1sh3r3', 'https://www.blockchain.com/btc/address/1NSzwqtBBdo4CrvynPZmd85xfbL7hw3Ptu', 'https://www.buymeacoffee.com/v1s1t0r']

CHANGELOG.md

@@ -1,3 +1,12 @@
+### 10.42
+ - Changed airmon compatibility check to fit same method used by airmon
+ - VIF support check added before launching Evil Twin attacks
+ - airgeddon version shown in title at main menu
+ - Fixed arabic scrambled strings and added missing arabic strings to missing dependencies plugin
+ - Fixed debug mode malfunction
+ - Added busy ports checkings on Evil Twin attacks
+ - Dockerfile rollback to Arch (ArchStrike image as base) due to Parrot repos problems
+
 ### 10.41
  - Fixed error on PMKID hash validation
  - Created an option to avoid Network Manager force killing on Evil Twin attacks

Dockerfile

@@ -1,7 +1,7 @@
 #airgeddon Dockerfile
 
 #Base image
-FROM parrotsec/security:latest
+FROM archstrike/archstrike:latest
 
 #Credits & Data
 LABEL \
@@ -13,58 +13,45 @@ LABEL \
 #Env vars
 ENV AIRGEDDON_URL="https://github.com/v1s1t0r1sh3r3/airgeddon.git"
 ENV HASHCAT2_URL="https://github.com/v1s1t0r1sh3r3/hashcat2.0.git"
-ENV DEBIAN_FRONTEND="noninteractive"
 
-#Update system
-RUN apt update
+#Clear cache
+RUN yes | pacman -Scc --noconfirm
 
-#Set locales
-RUN \
-	apt -y install \
-	locales && \
-	locale-gen en_US.UTF-8 && \
-	sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-	echo 'LANG="en_US.UTF-8"' > /etc/default/locale && \
-	dpkg-reconfigure --frontend=noninteractive locales && \
-	update-locale LANG=en_US.UTF-8
-
-#Env vars for locales
-ENV LANG="en_US.UTF-8"
-ENV LANGUAGE="en_US:en"
-ENV LC_ALL="en_US.UTF-8"
+#Update system
+RUN pacman -Syyu --noconfirm
 
 #Install airgeddon essential tools
 RUN \
-	apt -y install \
+	pacman -S --noconfirm \
 	gawk \
 	iw \
 	aircrack-ng \
 	xterm \
 	iproute2 \
+	pciutils \
 	procps \
 	tmux
 
 #Install airgeddon internal tools
 RUN \
-	apt -y install \
+	pacman -S --noconfirm \
 	ethtool \
-	pciutils \
 	usbutils \
 	rfkill \
-	x11-utils \
+	xorg-xdpyinfo \
 	wget \
 	ccze \
-	x11-xserver-utils
+	xorg-xset
 
-#Install update tools
+#Install airgeddon update tools
 RUN \
-	apt -y install \
+	pacman -S --noconfirm \
 	curl \
 	git
 
 #Install airgeddon optional tools
 RUN \
-	apt -y install \
+	pacman -S --noconfirm \
 	crunch \
 	hashcat \
 	mdk3 \
@@ -73,9 +60,9 @@ RUN \
 	lighttpd \
 	iptables \
 	nftables \
-	ettercap-text-only \
+	ettercap \
 	bettercap \
-	isc-dhcp-server \
+	dhcp \
 	dnsmasq \
 	reaver \
 	bully \
@@ -86,8 +73,8 @@ RUN \
 	openssl \
 	hcxtools \
 	hcxdumptool \
-	beef-xss \
-	tshark
+	beef-git \
+	wireshark-cli
 
 #Env var for display
 ENV DISPLAY=":0"
@@ -128,11 +115,9 @@ RUN \
 
 #Clean packages
 RUN \
-	apt clean && \
-	apt autoclean && \
-	apt autoremove -y
+	yes | pacman -Sccc --noconfirm
 
-#Clean files
+#Clean and remove useless files
 RUN \
 	rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/.github > /dev/null 2>&1 && \
@@ -144,8 +129,7 @@ RUN \
 	rm -rf /opt/airgeddon/binaries > /dev/null 2>&1 && \
 	rm -rf /opt/hashcat2.0 > /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
+	rm -rf /tmp/* > /dev/null 2>&1
 
 #Expose BeEF control panel port
 EXPOSE 3000

README.md

@@ -1,4 +1,6 @@
-# airgeddon [![Version-shield]](https://raw.githubusercontent.com/v1s1t0r1sh3r3/airgeddon/master/CHANGELOG.md) [![Bash4.2-shield]](http://tldp.org/LDP/abs/html/bashver4.html#AEN21220) [![License-shield]](https://raw.githubusercontent.com/v1s1t0r1sh3r3/airgeddon/master/LICENSE.md) [![Docker-shield]](https://hub.docker.com/r/v1s1t0r1sh3r3/airgeddon/)
+# airgeddon
+[![Version-shield]](https://raw.githubusercontent.com/v1s1t0r1sh3r3/airgeddon/master/CHANGELOG.md) [![Bash4.2-shield]](http://tldp.org/LDP/abs/html/bashver4.html#AEN21220) [![License-shield]](https://raw.githubusercontent.com/v1s1t0r1sh3r3/airgeddon/master/LICENSE.md) [![Docker-shield]](https://hub.docker.com/r/v1s1t0r1sh3r3/airgeddon/) [![Discord-shield]](https://discord.gg/sQ9dgt9)
+
 [![Paypal-shield]](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7ELM486P7XKKG) [![Cryptocurrencies-shield]](https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Contributing-&-Code-of-Conduct)
 
 
@@ -104,10 +106,11 @@ 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.41-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-10.42-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!"
+[Discord-shield]: https://img.shields.io/discord/629812069964840991.svg?style=flat-square&colorA=273133&colorB=CBA317&logo=discord&label=Discord%20chat
 [Paypal-shield]: https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&colorA=273133&colorB=b008bb "Paypal"
 [Cryptocurrencies-shield]: https://img.shields.io/badge/donate-cryptocurrencies-blue.svg?style=flat-square&colorA=273133&colorB=f7931a "Cryptocurrencies"