Merge pull request #543 from v1s1t0r1sh3r3/dev

Dev to master v11.20

Author: v1s1t0rX

.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://github.com/sponsors/v1s1t0r1sh3r3', 'https://www.blockchain.com/btc/address/1NSzwqtBBdo4CrvynPZmd85xfbL7hw3Ptu', '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://airgeddon.creator-spring.com/', 'https://www.buymeacoffee.com/v1s1t0r']

CHANGELOG.md

@@ -1,3 +1,12 @@
+### 11.20
+ - Improvements and fixes on "DoS pursuit mode"
+ - Fixed bug on Evil Twin captive portal attack when relative paths used
+ - Added Consistent Network Device Naming detection check upon interface selection
+ - Fixed bug on filtered WPA scans when pure WPA3 (SAE) present
+ - Fixed WPS attacks error message appearing on some Linux distributions
+ - Fixed bug in graphics system detection for non-systemd systems
+ - Added optional advanced captive portal including vendor logos
+
 ### 11.11
  - Custom enterprise certificates creation fix (now sha256) for modern hostapd-wpe versions
  - Fixed Docker distro shown (now Kali based)
@@ -130,7 +139,7 @@
  - Added tab autocompletion for every path input
 
 ### 9.21
- - Fixed non-closing windows on some DoS pursuit mode attacks
+ - Fixed non-closing windows on some "DoS pursuit mode" attacks
  - Added retrocompatibility for mdk3, added option in .airgeddonrc file to handle it
  - Fixed bug on WEP all-in-one attack (Fake Auth) for SSIDs containing spaces
  - Fixed repeated enterprise plain passwords captured on trophy files
@@ -259,7 +268,7 @@
  - Fixed bug while changing interface mode if the destination interface name is in use
  - Removed util-linux dependency for rev use
  - The existing iptables rules before the launch of airgeddon are now restored upon exiting if modified
- - Fixed bug while checking for NetworkManager's version on some linux distributions
+ - Fixed bug while checking for NetworkManager's version on some Linux distributions
  - Tested compatibility with Kali Linux 2017.1 and Parrot 3.5
  - Dockerfile updated
 
@@ -271,7 +280,7 @@
 ### 6.21
  - Improved chipset detection, lsusb added to internal tools
  - Improved internet checking. Now more methods, not only icmp
- - Fixed error executing airgeddon after auto-update on some distros
+ - Fixed error executing airgeddon after auto-update on some Linux distributions
  - Added LICENSE.md and README.md files to Kali package
 
 ### 6.2
@@ -397,7 +406,7 @@
 ### 4.02
  - New windows sizes calculation method for better viewing even in small resolutions. Dynamic system
  - Fixed bug restarting Network Manager on Arch Linux
- - Fixed bug restarting Network Manager using debug mode on some distros
+ - Fixed bug restarting Network Manager using debug mode on some Linux distributions
  - Suggestion added about possible packet names after failing a dependency check
 
 ### 4.01
@@ -407,7 +416,7 @@
  - Evil Twin attack added: Only AP to sniff with external sniffer
  - Created under construction message for non finished menu options
  - README.md beautified
- - Screen resolution correction feature added for some distros
+ - Screen resolution correction feature added for some Linux distributions
  - Some minor improvements and bugfixes
 
 ### 3.44
@@ -445,7 +454,7 @@
 
 ### 3.34
  - Ascii art intro added on script startup (animated flying saucer!!)
- - Bug fixed after putting card in monitor mode and the card name changed on some distros
+ - Bug fixed after putting card in monitor mode and the card name changed on some Linux distributions
  - Compatibility extended to Gentoo, Fedora and Red Hat Linux
 
 ### 3.33
@@ -505,7 +514,7 @@
 
 ### 3.1
  - Restoring initial state of cards on exit feature
- - "No check kill needed" feature added while putting card in monitor mode for some distros
+ - "No check kill needed" feature added while putting card in monitor mode for some Linux distributions
  - Fixed bug checking tools
 
 ### 3.02
@@ -568,7 +577,7 @@
  - Compatibility check minor bug fixed
 
 ### 2.1
- - Compatibility check at beginning to support more distros
+ - Compatibility check at beginning to support more Linux distributions
  - Changelog file added to project
 
 ### 2.03

CONTRIBUTING.md

@@ -11,19 +11,19 @@ Please note we have a [Code of Conduct], please follow it in all your interactio
 
 ## Issue Creation Policy
 
-1. Please, consider to contact us on [IRC] or [Discord] channel before opening an issue. More info at [Wiki Contact Section]
+1. Please, consider to contact us on [IRC] channel or [Discord] server before opening an issue. More info at [Wiki Contact Section]
 2. Filling the issue template with *ALL* the requested info is mandatory. Otherwise, the issue can be marked as "invalid" and closed immediately.
 3. Issues must be opened in English.
 4. If an issue is opened and more info is needed, `airgeddon` staff will request it. If there is no answer in 7 days or the OP is not collaborating, the issue will be closed.
 5. If the issue is not related to airgeddon or the root cause is out of scope, it will be closed. `airgeddon` staff is not a helpdesk support service.
 6. Try to be sure that your problem is related to airgeddon and that is not a driver issue. A good practice is always to try to perform the same operation without using `airgeddon` in order to see if the problem or the behavior can be reproduced. In that case, probably the issue should not be created.
-7. Don't talk or mention references to other tools. If you want to talk about other similar tools you can do it on their pages/github. `airgeddon` issues are to talk about `airgeddon`.
+7. Don't talk or mention references to other tools. If you want to talk about other similar tools you can do it on their pages/GitHub. `airgeddon` issues are to talk about `airgeddon`.
 
 ## Collaborating Translators
 
-1. Ask ALWAYS before start a translation to add a new language (by mail at [[email protected]], by Twitter at [@OscarAkaElvis], by [IRC] or [Discord] channel). Contact to the development team in order to know what are you going to do. You'll be informed about how to proceed.
+1. Ask ALWAYS before start a translation to add a new language (by mail at [[email protected]], by Twitter at [@OscarAkaElvis], by [IRC] channel or [Discord] server). Contact to the development team in order to know what are you going to do. You'll be informed about how to proceed.
 2. Translate the strings located in `language_strings.sh`, the existing strings of _language_strings_handling_messages_ function in `airgeddon.sh` and the strings of _missing_dependencies_text_ function in `missing_dependencies.sh` (this last file is in plugins dir).
-3. 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.
+3. 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. Anyway, always ask first.
 4. Remember that pull requests done over master branch will be rejected. Read the git workflow policy first.
 5. After verification of and acceptation of the pull request, you can be added as a collaborator on the project to push directly on the repository instead of submitting pull requests.
 6. Knowledge about `git` is mandatory (at least basic commands) to push directly into the project repository.
@@ -36,7 +36,7 @@ Please note we have a [Code of Conduct], please follow it in all your interactio
 2. Tweak *"AIRGEDDON_DEVELOPMENT_MODE"* variable to "true" for faster development skipping intro and initial checks or change *"AIRGEDDON_DEBUG_MODE"* variable for verbosity.
 3. Respect the **4 width tab indentation**, code style and the **UTF-8 encoding**.
 4. Use **LF** (Unix) line break type (not CR or CRLF).
-5. Use [Shellcheck] to search for errors and warnings on code. (Thanks [xtonousou] for the tip :wink:). To avoid false positive warnings you must launch shellcheck using `-x` argument to follow source files and from the directory where `airgeddon.sh` is. For example: `~# cd /path/to/airgeddon && shellcheck -x airgeddon.sh`
+5. Use [Shellcheck] to search for errors and warnings on code. (Thanks [xtonousou] for the tip :wink:). To avoid false positive warnings you must launch shellcheck using `-a -x` arguments to follow source files and from the directory where `airgeddon.sh` is. For example: `~# cd /path/to/airgeddon && shellcheck -a -x airgeddon.sh`
 6. Increase the version numbers in `airgeddon.sh`, in [Readme] and in [Changelog] to the new version that the script represents. The versioning scheme we use is *X.YZ*. Where:
   - *X* is a major release with a new menu (e.g. WPS menu)
   - *Y* is a minor release with a new feature for an existing menu or a new submenu for an existing feature
@@ -56,7 +56,7 @@ Please note we have a [Code of Conduct], please follow it in all your interactio
 
 We also have a private Telegram group for *trusted collaborators* for more agile discussion about developments, improvements, etc. 
 To be added on it, you must prove first you are a *trusted collaborator* with your contributions.
-Anything can be also discussed on public [IRC] or [Discord] channel. More info at [Wiki Contact Section].
+Anything can be also discussed on public [IRC] channel or [Discord] server. More info at [Wiki Contact Section].
 
 ## WPS PIN Database Collaborators
 
@@ -70,7 +70,7 @@ Anything can be also discussed on public [IRC] or [Discord] channel. More info a
 ## Beta Testers
 
 1. Download the main version from the [Master] branch or the beta testing version from the development branch called [Dev]. Temporary branches may be existing for specific features that can also be tested.
-2. Report any issues or bugs by Twitter at [@OscarAkaElvis], mail [[email protected]], on [IRC] or [Discord] channel or submit Github issue requests [Here] reading first the Issue Creation Policy.
+2. Report any issues or bugs by Twitter at [@OscarAkaElvis], mail [[email protected]], on [IRC] channel, [Discord] server or submit GitHub issue requests [Here] reading first the Issue Creation Policy.
 
 ## Git Workflow Policy
 
@@ -83,15 +83,11 @@ 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 or buy merchandising
 
----
+If you enjoyed the script, feel free to donate. Support the project through PayPal or sending a fraction any of the cryptocurrencies listed below. Any amount, not matter how small (1, 2, 5 $/€) is welcome.
 
-## 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:
+Another way to contribute is buying some merchandising (mugs, T-shirts, etc.). A little portion of each payment (after deducting material, printing and shipping) will be to support the project. Check the [merchandising-online-shop].
 
 <table>
   <tr>
@@ -165,6 +161,12 @@ If you enjoyed the script, feel free to donate. Support the project through PayP
   </table>
 </div>
 
+---
+
+## Discord Server Boosting
+
+You can also contribute using 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 join to it.
+
 <!-- MDs -->
 [Readme]: README.md
 [Changelog]: CHANGELOG.md
@@ -186,3 +188,4 @@ If you enjoyed the script, feel free to donate. Support the project through PayP
 [@OscarAkaElvis]: https://twitter.com/OscarAkaElvis
 [Discord]: https://discord.gg/sQ9dgt9
 [IRC]: https://web.libera.chat/
+[merchandising-online-shop]: https://airgeddon.creator-spring.com/

README.md

@@ -53,6 +53,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 	 - [Plugins Hall of Fame]
   - [Supported Languages]
   - [Contributing & Code of Conduct]
+  - [Merchandising Online Shop]
   - [Changelog]
   - [Disclaimer & License]
   - [Contact]
@@ -64,8 +65,6 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 
 ---
 
-![Hits-badge]
-
 [Banner]: https://raw.githubusercontent.com/v1s1t0r1sh3r3/airgeddon/master/imgs/banners/airgeddon_banner.png "We will conquer the earth!!"
 [Github's Wiki]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki
 
@@ -100,18 +99,17 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 [Plugins Hall of Fame]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Plugins%20Hall%20of%20Fame
 [Supported Languages]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Supported%20Languages
 [Contributing & Code of Conduct]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Contributing-&-Code-of-Conduct
+[Merchandising Online Shop]: https://airgeddon.creator-spring.com/
 [Changelog]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Changelog
 [Disclaimer & License]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Disclaimer%20&%20License
 [Contact]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Contact
 [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-11.11-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-11.20-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!"
+[Docker-shield]: https://img.shields.io/docker/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"
-
-[Hits-badge]: https://hitcounter.pythonanywhere.com/count/tag.svg?url=https%3A%2F%2Fgithub.com%2Fv1s1t0r1sh3r3%2Fairgeddon "v1s1t0rs"