Merge pull request #94 from v1s1t0r1sh3r3/dev

Dev to master v7.1

CHANGELOG.md

@@ -1,9 +1,16 @@
+### 7.1
+ - Added default choice for some yes/no question. Regexp improved
+ - Tested compatibility with Backbox 4.7 and Parrot 3.6
+ - Improved curl and wget methods. Now autodetect if http proxy is set and needed
+ - WPS Reaver attacks modified. Removed --auto (-a) argument causing problems on some Reaver versions
+ - Dockerfile updated
+
 ### 7.02
  - Improved internet checking. Now ip address and host based methods
  - Internet checking function splitted. Now separated from repository access
  - Fixed error shown when handling interfaces without MAC address
  - Tested compatibility with Ubuntu 17.04
- 
+
 ### 7.01
  - Fixed bug while changing interface mode if the destination interface name is in use
  - Removed util-linux dependency for rev use

Dockerfile

@@ -12,12 +12,10 @@ LABEL \
 
 #Url env vars
 ENV AIRGEDDON_URL="https://github.com/v1s1t0r1sh3r3/airgeddon.git"
-ENV BULLY_URL="https://github.com/v1s1t0r1sh3r3/bully.git"
 ENV HASHCAT2_URL="https://github.com/v1s1t0r1sh3r3/hashcat2.0.git"
 
 #Update system
-RUN \
-	apt-get update
+RUN apt-get update
 
 #Set locales
 RUN \
@@ -49,6 +47,7 @@ RUN \
 	apt-get -y install \
 	ethtool \
 	pciutils \
+	usbutils \
 	rfkill \
 	x11-utils \
 	wget
@@ -86,74 +85,42 @@ RUN \
 #Env var for display
 ENV DISPLAY=":0"
 
-#Create dir for external files
-RUN \
-	mkdir /io
+#Create volume dir for external files
+RUN mkdir /io
+VOLUME /io
 
 #Set workdir
 WORKDIR /opt/
 
 #airgeddon install method 1 (only one method can be used, other must be commented)
-#Install airgeddon (Dockerhub automated build process)
-RUN \
-	mkdir airgeddon
-COPY \
-	. /opt/airgeddon
+#Install airgeddon (Docker Hub automated build process)
+RUN mkdir airgeddon
+COPY . /opt/airgeddon
 
 #airgeddon install method 2 (only one method can be used, other must be commented)
 #Install airgeddon (manual image build)
-#Uncomment one of them to select branch (master->latest, dev->beta)
+#Uncomment git clone line and one of the ENV vars to select branch (master->latest, dev->beta)
 #ENV BRANCH="master"
 #ENV BRANCH="dev"
-#RUN \
-#	git clone -b ${BRANCH} ${AIRGEDDON_URL}
+#RUN git clone -b ${BRANCH} ${AIRGEDDON_URL}
 
 #Remove auto update
-RUN \
-	sed -i 's|auto_update=1|auto_update=0|' airgeddon/airgeddon.sh
+RUN sed -i 's|auto_update=1|auto_update=0|' airgeddon/airgeddon.sh
 
 #Make bash script files executable
-RUN \
-	chmod +x airgeddon/*.sh
-
-#Prepare packages to upgrade Bully
-RUN \
-	apt-get -y install \
-	build-essential \
-	libpcap-dev
-
-#Upgrade Bully
-RUN \
-	git clone ${BULLY_URL} && \
-	cd /opt/bully/src && \
-	make && \
-	make install && \
-	cp /usr/local/bin/bully /usr/bin/ && \
-	chmod +x /usr/bin/bully
+RUN chmod +x airgeddon/*.sh
 
 #Downgrade Hashcat
 RUN \
 	git clone ${HASHCAT2_URL} && \
 	cp /opt/hashcat2.0/hashcat /usr/bin/ && \
 	chmod +x /usr/bin/hashcat
 
-#Install wireless drivers
-RUN \
-	apt-get -y install \
-	firmware-brcm80211 \
-	firmware-libertas \
-	firmware-realtek \
-	firmware-samsung \
-	firmware-iwlwifi \
-	firmware-linux \
-	firmware-linux-nonfree \
-	firmware-linux-free
-
 #Clean packages
 RUN \
-	apt-get autoremove && \
 	apt-get clean && \
-	apt-get autoclean
+	apt-get autoclean && \
+	apt-get autoremove
 
 #Clean files
 RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
@@ -162,12 +129,11 @@ RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
 	rm -rf /opt/airgeddon/pindb_checksum.txt > /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/bully > /dev/null 2>&1 && \
 	rm -rf /opt/hashcat2.0 > /dev/null 2>&1 && \
 	rm -rf /tmp/* > /dev/null 2>&1
 
 #Expose BeEF control panel port
 EXPOSE 3000
 
 #Entrypoint
-CMD ["bash", "-c", "/opt/airgeddon/airgeddon.sh"]
+CMD ["/bin/bash", "-c", "/opt/airgeddon/airgeddon.sh"]

README.md

@@ -74,7 +74,7 @@ All the needed info about how to install|use|enjoy `airgeddon` is present at [Gi
 [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-7.02-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-7.1-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/automated/v1s1t0r1sh3r3/airgeddon.svg?style=flat-square&colorA=273133&colorB=f9ff5a "Docker rules!"