Merge pull request #416 from yudevan/master

Merged all the modularity feature. version 0.8.7 is out 👍

.gitignore

@@ -1,13 +1,15 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Python template
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
-*.pyc
+*$py.class
+.idea
 # C extensions
 *.so
 
 # Distribution / packaging
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -19,10 +21,14 @@ lib64/
 parts/
 sdist/
 var/
+wheels/
 *.egg-info/
 .installed.cfg
 *.egg
 
+=======
+core/config/app/config.ini
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -41,24 +47,126 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
+.hypothesis/
 
 # Translations
 *.mo
 *.pot
 
 # Django stuff:
 *.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
 
 # Sphinx documentation
 docs/_build/
 
 # PyBuilder
 target/
 
-# DEB
-deb_tmp/
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+### Linux template
+*~
+
+# 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*
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
 
-# IDE
-# PyCharm
-.idea/
+.gitignore
+templates/fakeupdate/Adobe_Update/
+logs/

README.md

@@ -2,8 +2,22 @@
 
 [![build](https://travis-ci.org/P0cL4bs/WiFi-Pumpkin.svg)](https://travis-ci.org/P0cL4bs/WiFi-Pumpkin/)
 
-WiFi-Pumpkin - Framework for Rogue Wi-Fi Access Point Attack
+WiFi-Pumpkin - Framework for Rogue Wi-Fi Access Point Attack with modularized proxy
 ### Description
+This fork is an improved wifi pumpkin in term of the ease to add new proxy, plugins, and also page on the main page.but I can assure that the functionality is still the same, except you are introducing new proxy method and attack. there are so many cchange I have been made on this fork, naming some of those change made are:
+
+* Modularized and auto loaded proxy package, this has been a hard work segregating proxy into its own file. the proxy now can be added or removed just like plugin. it is located inside core/server/proxy/packages. user can create theier own proxy by following the existing example and focus on their new proxy without need to worry how it will be loaded into the program.
+
+* Modularized and autoloaded plugins which is located inside core/server/http_handler/proxyhandler
+* Modularized the wireless mode, it is now easy to add new wireless mode (hostapd), this to facilitate the other type of hostapd available out there (karma, mana) mode. the mode implementation are located under core/wirelessmode
+* The main tab (Home, Settings, Station, Activity Monitor) now segregated into its own file, if you want to add new tab, you will just need to subclass a base class which will load your new ui automatically. all this pages are located under core/widgets/defaults
+* The setting tab it is now generated automatically, this done if you subclassing CoreSettings class, the CoreSettings class is located in core/default/uimodel.py . after you subclassing the CoreSettings then you can generate your own user interface and it will be loaded in the Settings page
+* Same as Setting page, the home page will also now automatically generated if you make subclass of HomeDisplay class which is located inside core/default/uimodel.py
+* Moved the progrress bar display to the status bar next to the client counter. 
+* Made an easy refference for the FSettings by  calling FSettings.getInstance()
+* The FSettings call now located on the QApplication method instead of WifiPumpkin method.
+* More implementation is coming...
+
 WiFi-Pumpkin is a very complete framework for auditing Wi-Fi security. The main feature is the ability to create a fake AP and make Man In The Middle attack, but the list of features is quite broad.
 
 ![screenshot](https://i.imgur.com/bNTOHLq.png)

core/config/app/config.ini

@@ -1,45 +1,67 @@
 [settings]
 themes=themes/themeDefault
-scapy_deauth=true
-mdk3_deauth=false
+scapy_deauth=false
+mdk3_deauth=true
 scan_scapy=true
 scan_airodump=false
 scanner_rangeIP=0-255
 mdk3=a -a m -t
 redirect_port=10000
 show_dashboard_info=true
 
+[Mana]
+Mana_hostapd_path=./plugins/bin/hostapd-mana/hostapd
+enable_mana=true
+mana_loud=false
+mana_macl=false
+
+[Karma]
+Karma_hostapd_path=./plugins/bin/hostapd-karma/hostapd
+
+[Static]
+Static_hostapd_path=/usr/sbin/hostapd
+
 [accesspoint]
-hostapd_path=0
+hostapd_path=/usr/sbin/hostapd
+Mana_path=plugins/external/hostapd
 hostapd_custom=false
 statusAP=false
 dhcpd_server=false
 pydhcp_server=true
-pydns_server=true
-dnsproxy_server=false
+pydns_server=false
+dnsproxy_server=true
 channel=11
-ssid=PumpAP
-bssid=BC:F6:85:03:36:5B
-interfaceAP=None
+ssid=Internet
+bssid=BC:F6:85:21:26:0B
+interfaceAP=wlxc83a35cef744
 sessions={}
 persistNetwokManager=true
 checkConnectionWifi=true
 check_support_ap_mode=true
 enable_Security=false
 WPA_SharedKey=1234567890
-WPA_Algorithms=TKIP
+WPA_Algorithms=TKIP + CCMP
 WPA_type=2
 timer_update_info=5000
+Karma%20SSID%20Mode=true
+Static%20SSID%20Mode=false
+Karma%20AP%20Mode=false
+Static%20AP%20Mode=true
+Static=true
+Karma=false
+Mana=false
 
 [dhcp]
-classtype=A
+classtype=B
 leasetimeDef=600
 leasetimeMax=7200
-subnet=10.0.0.0
-router=10.0.0.1
-netmask=255.0.0.0
-broadcast=10.0.0.255
-range=10.0.0.20/10.0.0.50
+subnet=172.16.0.0
+router=172.16.0.1
+netmask=255.240.0.0
+broadcast=172.16.0.255
+range=172.16.0.100/172.16.0.150
+PyDHCP=false
+ISCDHCP=true
 
 [Class-A-Address]
 leasetimeDef=600
@@ -79,24 +101,32 @@ range=10.0.0.20/10.0.0.50
 
 [dockarea]
 advanced=true
-dock_credencials=true
-dock_urlmonitor=true
+dock_credencials=false
+dock_urlmonitor=false
 dock_bdfproxy=false
 dock_dns2proxy=false
 dock_responder=false
 dock_PumpkinProxy=false
 dock_tcpproxy=true
 
 [plugins]
-noproxy=false
-tcpproxy_plugin=true
-dns2proxy_plugin=false
-sergioproxy_plugin=false
-bdfproxy_plugin=false
-responder_plugin=false
-pumpkinproxy_plugin=true
+noproxy=true
 bdfproxy_config=plugins/external/BDFProxy-ng/bdfproxy.cfg
 responder_config=plugins/external/Responder/Responder.conf
+MITMPump=true
+tcpproxy_plugin=false
+pumpkinproxy_plugin=false
+sergioproxy_plugin=false
+dns2proxy_plugin=false
+bdfproxy_plugin=false
+SSLStrip%2BDNS2Proxy=false
+disableproxy=true
+Mana%20Mode=false
+SSLStrip%2BSergio=false
+Pumpkin%20Proxy=true
+BDF%20Proxy=false
+No%20Proxy=false
+TCP%20Proxy=true
 
 [iptables]
 iptables_0_masq=iptables -P FORWARD ACCEPT
@@ -105,3 +135,28 @@ iptables_B_forward="iptables -A FORWARD -i $inet --out-interface $wlan -j ACCEPT
 iptables_C_foracept=iptables -A FORWARD -i $wlan --out-interface $inet -j ACCEPT
 iptables_D_accept=iptables -A OUTPUT --out-interface $inet -j ACCEPT
 iptables_E_accpet=iptables -A INPUT --in-interface $wlan -j ACCEPT
+
+[mitmhandler]
+Responder=false
+TCP%20Proxy=true
+Net%20Credentials=false
+Image%20Capture=false
+URLMonitor=true
+Firelamb=false
+Credentials=true
+CredMonitor=true
+
+[runningconfig]
+totalthread=7
+
+[dhcpserver]
+PyDHCP=true
+ISCDHCP=false
+DNSMASQ=false
+
+[DNSServer]
+PyDNS=false
+DNS2Proxy=false
+DNSChef=false
+DNSMasq=true
+DNSSpoof=false

core/config/app/proxy.ini

@@ -6,13 +6,13 @@ stickycookie=false
 downloadspoof=false
 js_inject=false
 html_inject=false
-dump_post_data=false
+dump_post_data=true
 upsidedownternet=false
 beef=false
-replaceImages=false
-inverted_internet=false
+replaceImages=true
+inverted_internet=true
 shakepage=false
-no-cache=false
+no-cache=true
 
 [set_dnsspoof]
 domain_0={'another.com':'10.0.0.1'}

core/config/commits/Lcommits.cfg

@@ -51,16 +51,6 @@ master:
   { changelog : 'fixed small bug with Table when add new users' },
   { changelog : 'added new icon WiFi-Pumpkin' },
   { changelog : 'fixed group all object PyQt4 [QtGui,QtCore]' },
-  { changelog : 'fixed except when try import QtGui' },
-  { changelog : 'fixed detect if range ip class is same the [DHCP Server] #285' },
-  { changelog : 'fixed import QtGui thanks @Brain2000 #282' },
-  { changelog : 'fixed redirect Traffic from all domain [dns spoof] #296' },
-  { changelog : 'added run WP without mitmproxy packager #309' },
-  { changelog : 'fixed cryptography kali 2017.3 thanks @yudevan #315' },
-  { changelog : 'fixed import Queue module from multiprocessing #357' },
-  { changelog : 'fixed bug module Queue #357' },
-  { changelog : 'fixed renamed module Queue to queue [modules func]' },
-  { changelog : 'fixed struct.error: argument for 's' must be a string [ARP poisoner] #326' },
 ]
 
 WiFiPumpkin084: