From 30dd790216e7c25dda00434843eadd83178ef22f Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:01:38 -0400 Subject: [PATCH 1/8] Remove useless docs folder Move LICENSE to root dir where it belongs according to Github spec --- docs/LICENSE => LICENSE | 0 docs/changelog | 20 -------------------- 2 files changed, 20 deletions(-) rename docs/LICENSE => LICENSE (100%) delete mode 100644 docs/changelog diff --git a/docs/LICENSE b/LICENSE similarity index 100% rename from docs/LICENSE rename to LICENSE diff --git a/docs/changelog b/docs/changelog deleted file mode 100644 index 4f0041b..0000000 --- a/docs/changelog +++ /dev/null @@ -1,20 +0,0 @@ ------------------------ General ----------------------- -revision=1 - - ----------------------- Changelog ---------------------- - -[Version: 2 , Revision 1] - -- rewrite code -- move files - - exitmode to lib/ - - source files to language - -- improve handeling -- remove disclaimer -- remove git support -- add checkupdate function -- fix airmon file - ----------------------- Changelog ---------------------- From ee7979982877920ab65b411ca8af695ba42ddeb1 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:03:19 -0400 Subject: [PATCH 2/8] add general .gitignore mac, linux, sublime from official repo https://github.com/github/gitignore/tree/master/Global --- .gitignore | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/.gitignore b/.gitignore index b55087d..4dc51c5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,74 @@ *.cap log BullyOutput.txt + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# Cache files for Sublime Text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# Workspace files are user-specific +*.sublime-workspace + +# Project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using Sublime Text +# *.sublime-project + +# SFTP configuration file +sftp-config.json + +# Package control specific files +Package Control.last-run +Package Control.ca-list +Package Control.ca-bundle +Package Control.system-ca-bundle +Package Control.cache/ +Package Control.ca-certs/ +Package Control.merged-ca-bundle +Package Control.user-ca-bundle +oscrypto-ca-bundle.crt +bh_unicode_properties.cache + +# Sublime-github package stores a github token in this file +# https://packagecontrol.io/packages/sublime-github +GitHub.sublime-settings + +# General +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk From 3de1c36a4801dedc56936b4c3525386a82b928e2 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:09:01 -0400 Subject: [PATCH 3/8] Update readme disclimaer Removes childish language --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 859adcf..68ba97b 100644 --- a/README.md +++ b/README.md @@ -60,5 +60,8 @@ For development I use vim and tmux. Here are my [dotfiles](https://github.com/de 9. MPX4132 - Fluxion V3 ## Disclaimer +* Authors do not own the logos under the `/attacks/Captive Portal/sites/` directory. Copyright Disclaimer Under Section 107 of the Copyright Act 1976, allowance is made for "fair use" for purposes such as criticism, comment, news reporting, teaching, scholarship, and research. -***Fluxion is intended to be used for legal security purposes only, and should only be used on protected networks/hosts you own, or on networks/hosts you have permission to test on. Any other use is not the responsibility of the developer(s). Be sure that you understand and are complying with the Fluxion licenses and laws in your area. In other words, don't be stupid, don't be an asshole, and use this tool responsibly and legally.*** +* Usage of Fluxion for attacking infrastructures without prior mutual consistency can be considered as an illegal activity. It is the final user's responsibility to obey all applicable local, state and federal laws. Authors assume no liability and are not responsible for any misuse or damage caused by this program. + +Note: Be aware of sites pretending to be related with the Fluxion Project. They may be delivering malware. From f1edd0ba5bbe104a95bdee8116478168a97739db Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:10:50 -0400 Subject: [PATCH 4/8] update installation readme --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 68ba97b..5a321df 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,11 @@ sudo sh router.sh [FAQ](https://github.com/FluxionNetwork/fluxion/wiki/FAQ) ## Installation -``` git clone https://github.com/FluxionNetwork/fluxion.git``` +``` +git clone https://github.com/FluxionNetwork/fluxion.git # Download the latest revision +cd fluxion # Switch to tool's directory +./install/install.sh # Install any dependencies +``` ## Updates If you want to submit a feature, do so by labeling your issue as an "enhancement" or submit a PR. I don't have enough time to make daily changes to fluxion, sorry. From 57d3003d2246dee93e23b90d166262a336526ea1 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:12:37 -0400 Subject: [PATCH 5/8] remove updates language useless to show --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 5a321df..4c5526b 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,9 @@ sudo sh router.sh ``` git clone https://github.com/FluxionNetwork/fluxion.git # Download the latest revision cd fluxion # Switch to tool's directory -./install/install.sh # Install any dependencies +./install/install.sh # Install any dependencies ``` -## Updates -If you want to submit a feature, do so by labeling your issue as an "enhancement" or submit a PR. I don't have enough time to make daily changes to fluxion, sorry. - ## :white_check_mark: Included dependency versions 1. Aircrack : 1:1.2-0~rc4-0parrot0 2. Lighttpd : 1.439-1 From 1c5b08d41330e4c70a45c839f95ed9e415131ccf Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:14:09 -0400 Subject: [PATCH 6/8] remove html from an MD file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c5526b..4edea88 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

+![Fuxion logo](https://github.com/FluxionNetwork/fluxion/blob/master/logos/logo1.jpg?raw=true) # Fluxion is the future of MITM WPA attacks Fluxion is a remake of linset by vk496 with (hopefully) less bugs and more functionality. It's compatible with the latest release of Kali (rolling). The attack is mostly manual, but experimental versions will automatically handle most functionality from the stable releases. From 69b782c85c7682dc1930bc0b364ca56fd46c54ee Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:14:28 -0400 Subject: [PATCH 7/8] Remove more HTML from MD --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4edea88..54d6691 100644 --- a/README.md +++ b/README.md @@ -65,4 +65,4 @@ For development I use vim and tmux. Here are my [dotfiles](https://github.com/de * Usage of Fluxion for attacking infrastructures without prior mutual consistency can be considered as an illegal activity. It is the final user's responsibility to obey all applicable local, state and federal laws. Authors assume no liability and are not responsible for any misuse or damage caused by this program. -Note: Be aware of sites pretending to be related with the Fluxion Project. They may be delivering malware. +**Note**: Be aware of sites pretending to be related with the Fluxion Project. They may be delivering malware. From 61898521211bbe8619531c5ce708210d8ab9cbd2 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 14:22:19 -0400 Subject: [PATCH 8/8] add *.log files to gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4dc51c5..e9168d9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ *.swp *.swo *.cap -log +*.log BullyOutput.txt # temporary files which can be created if a process still has a handle open of a deleted file