Merge pull request #475 from v1s1t0r1sh3r3/dev

Dev to master v11.0

.gitattributes

@@ -3,6 +3,7 @@
 
 # Text files and source code
 *.txt text
+*.yml text
 *.sh text
 *.md text
 *.db text
@@ -12,4 +13,4 @@
 *.xz binary
 
 # Binary image formats
-*.png binary
+*.png binary

.github/workflows/dev.yml

@@ -0,0 +1,38 @@
+#Workflow for docker autobuild in dev branch
+
+name: 'Docker CI dev'
+
+on:
+  push:
+    branches: dev
+    paths:
+      - '**.md'
+      - '**.sh'
+      - '**.txt'
+      - '**.db'
+      - '.airgeddonrc'
+      - 'Dockerfile'
+
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Hub login
+        uses: docker/login-action@v1
+        with:
+          username: v1s1t0r1sh3r3
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          logout: true
+
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          tags: v1s1t0r1sh3r3/airgeddon:beta
+          context: .
+          no-cache: true
+          push: true

.github/workflows/master.yml

@@ -0,0 +1,38 @@
+#Workflow for docker autobuild in master branch
+
+name: 'Docker CI master'
+
+on:
+  push:
+    branches: master
+    paths:
+      - '**.md'
+      - '**.sh'
+      - '**.txt'
+      - '**.db'
+      - '.airgeddonrc'
+      - 'Dockerfile'
+
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Hub login
+        uses: docker/login-action@v1
+        with:
+          username: v1s1t0r1sh3r3
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          logout: true
+
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          tags: v1s1t0r1sh3r3/airgeddon:latest
+          context: .
+          no-cache: true
+          push: true

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 11.0
+ - Improvements in plugins system
+ - GPU support for hashcat
+ - Keep compatibility for hashcat -m 2500 on new hashcat versions
+ - Improvement for busy ports checkings on Evil Twin attacks, now show conflicting process
+ - Fixed error on captive portal trophy file path when only dir (no file) specified
+ - Added CI files to be used in Github actions for Docker automated building
+
 ### 10.42
  - Changed airmon compatibility check to fit same method used by airmon
  - VIF support check added before launching Evil Twin attacks

Dockerfile

@@ -1,7 +1,7 @@
 #airgeddon Dockerfile
 
 #Base image
-FROM archstrike/archstrike:latest
+FROM kalilinux/kali-rolling:latest
 
 #Credits & Data
 LABEL \
@@ -13,16 +13,29 @@ 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 \
@@ -34,24 +47,24 @@ RUN \
 
 #Install airgeddon internal tools
 RUN \
-	pacman -S --noconfirm \
+	apt -y install \
 	ethtool \
 	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,9 @@ RUN \
 	lighttpd \
 	iptables \
 	nftables \
-	ettercap \
+	ettercap-text-only \
 	bettercap \
-	dhcp \
+	isc-dhcp-server \
 	dnsmasq \
 	reaver \
 	bully \
@@ -73,8 +86,8 @@ RUN \
 	openssl \
 	hcxtools \
 	hcxdumptool \
-	beef-git \
-	wireshark-cli
+	beef-xss \
+	tshark
 
 #Env var for display
 ENV DISPLAY=":0"
@@ -115,9 +128,11 @@ RUN \
 
 #Clean packages
 RUN \
-	yes | pacman -Sccc --noconfirm
+	apt clean && \
+	apt autoclean && \
+	apt autoremove -y
 
-#Clean and remove useless files
+#Clean files
 RUN \
 	rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/.github > /dev/null 2>&1 && \
@@ -129,7 +144,8 @@ 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 /tmp/* > /dev/null 2>&1 && \
+	rm -rf /var/lib/apt/lists/* > /dev/null 2>&1
 
 #Expose BeEF control panel port
 EXPOSE 3000

README.md

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