Merge pull request #430 from v1s1t0r1sh3r3/dev

Dev to master v10.41

.airgeddonrc

@@ -25,6 +25,9 @@ AIRGEDDON_5GHZ_ENABLED=true
 #Enabled true / Disabled false - Force to use iptables instead of nftables (it has no effect if nftables are not present) - Default value false
 AIRGEDDON_FORCE_IPTABLES=false
 
+#Enabled true / Disabled false - Force to kill Network Manager before launching Evil Twin attacks - Default value true
+AIRGEDDON_FORCE_NETWORK_MANAGER_KILLING=true
+
 #Available values: mdk3, mdk4 - Define which mdk version is going to be used - Default value mdk4
 AIRGEDDON_MDK_VERSION=mdk4
 

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 10.41
+ - Fixed error on PMKID hash validation
+ - Created an option to avoid Network Manager force killing on Evil Twin attacks
+ - Code improvements to allow new kind of arguments based plugins
+ - Dsniff Evil Twin captive portal DNS black hole replaced by dnsmasq
+ - Dockerfile rollback to Parrot (Parrot Security image as base) to avoid Arch Glibc + Dockerhub automated builds problem
+
 ### 10.40
  - Removed deprecated route command
  - Fixed error on WPS PINs found in database counter

CONTRIBUTING.md

@@ -84,6 +84,12 @@ Anything can be also discussed on public [IRC] or [Discord] channel. More info a
 
 ---
 
+## Discord Server Boosting
+
+Another way to contribute is to use your Nitro Boosts on our [Discord] server. After boosting, your name will appear as a _Server Booster_ contributor there. Check [Wiki Contact Section] for more info about how to connect to it.
+
+---
+
 ## Donate
 
 If you enjoyed the script, feel free to donate. Support the project through Paypal or sending a fraction any of these cryptocurrencies. Any amount, not matter how small (1, 2, 5 $/€) is welcome:

Dockerfile

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

README.md

@@ -104,7 +104,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.40-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-10.41-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!"