Merge pull request #148 from v1s1t0r1sh3r3/dev

Dev to master v8.10

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 8.10
+ - WPS decrypted networks now have trophy file
+ - Tested compatibility with Kali 2018.2, Ubuntu 18.04 and Parrot 4.x
+ - Controlled error for unsupported bettercap 2.x version
+ - Automatic check added on Handshake capture (Thank you to "IwraStudios")
+ - Fixed card detection bug on some Linux
+
 ### 8.01
  - German language translation added (Thank you to "hamperfait")
  - Filters enabled on scannings based on menu or kind of attack
@@ -166,7 +173,7 @@
 
 ### 4.31
  - Now optionally on Evil Twin captive portal attack you can choose between to have internet access or to use a "dns trick"
- - Fixed bug writing handshake files on some paths
+ - Fixed bug writing Handshake files on some paths
  - Added possibility to get back to Evil Twin main menu from the internet interface selection menu
 
 ### 4.3
@@ -292,7 +299,7 @@
  - README.md beautified
 
 ### 3.22
- - Cleaning handshake files now perform some checks to avoid corruption file problem
+ - Cleaning Handshake files now perform some checks to avoid corruption file problem
  - Capture files are checked before cracking looking for Handshakes and easy targeting
  - Fixed bug checking existence of files
 

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Hi there! We are thrilled that you would like to contribute to this project. You
 
 When contributing to this repository, please first discuss the change you wish to make via issue,
 email, or any other method with the owners of this repository before making a change.
-If an issue is opened and more info is needed, `airgeddon` staff will request it. If there is no answer in 7 days, the issue will be closed.
+If an issue is opened and more info is needed, `airgeddon` staff will request it. If there is no answer in 7 days, the issue will be closed. Issues must be opened in english.
 
 Please note we have a [Code of Conduct], please follow it in all your interactions with the project.
 
@@ -13,10 +13,11 @@ Please note we have a [Code of Conduct], please follow it in all your interactio
 ## Collaborating Translators
 
 1. Update the date under shebang.
-2. Translate the strings located in `language_strings.sh`.
+2. Translate the strings located in `language_strings.sh` and the existing phrases _language_strings_handling_messages function_ in `airgeddon.sh`.
 3. Ask by mail [[email protected]] if you have any doubt. You'll be informed about how to proceed.
 4. You can be added as a collaborator on the project.
 5. Knowledge about `git` is not mandatory but is really appreciated to push directly into the project repository.
+6. If you want to create a pull request with a new language to be added, at least the 80% of the phrases must be translated and the rest must be done with at least _an automatic-translation_ system and marked with PoT (Pending of Translation) mark.
 
 ## Collaborating Developers
 

Dockerfile

@@ -13,6 +13,7 @@ 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 DEBIAN_FRONTEND="noninteractive"
 
 #Update system
@@ -83,7 +84,12 @@ RUN \
 RUN \
 	apt -y install \
 	beef-xss \
-	bettercap
+	bettercap \
+	ruby-packetfu \
+	ruby-colorize \
+	ruby-net-dns \
+	ruby-em-proxy \
+	ruby-network-interface
 
 #Env var for display
 ENV DISPLAY=":0"
@@ -119,11 +125,16 @@ RUN \
 	cp /opt/hashcat2.0/hashcat /usr/bin/ && \
 	chmod +x /usr/bin/hashcat
 
+#Downgrade Bettercap
+RUN \
+	git clone ${BETTERCAP162_URL} && \
+	dpkg -i /opt/bettercap1.6.2/bettercap_1.6.2-0parrot1_all.deb
+
 #Clean packages
 RUN \
 	apt clean && \
 	apt autoclean && \
-	apt autoremove
+	apt autoremove -y
 
 #Clean files
 RUN rm -rf /opt/airgeddon/imgs > /dev/null 2>&1 && \
@@ -135,6 +146,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 /tmp/* > /dev/null 2>&1 && \
 	rm -rf /var/lib/apt/lists/* > /dev/null 2>&1
 

README.md

@@ -21,6 +21,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
   - [Optional Tools]
 	 - [BeEF Tips]
 	 - [Hashcat Tips]
+	 - [Bettercap Tips]
   - [Update Tools]
   - [Internal Tools]
   - [Known incompatibilities]
@@ -59,6 +60,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 [Optional Tools]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Optional%20Tools
 [BeEF Tips]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/BeEF%20Tips
 [Hashcat Tips]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Hashcat%20Tips
+[Bettercap Tips]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Bettercap%20Tips
 [Update Tools]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Update%20Tools
 [Internal Tools]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Internal%20Tools
 [Known incompatibilities]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Known%20incompatibilities
@@ -76,7 +78,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-8.01-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-8.10-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!"