Merge pull request #176 from P0cL4bs/beta

bum version 1.1.2 release

CHANGELOG.md

@@ -1,6 +1,29 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [Released]
+
+## [1.1.2] 
+
+### Added 
+- added improves wifideauth module for support multi targets 
+- added improves ConsoleUi and added help for command add, rm from wifideauth module 
+- added hostapd configuration file from wifipumpkin3 console
+- added new command `dhcp conf` for configure more easily than dhcp server
+
+### Changed
+- downgrade version flask 1.1.3 to 1.1.1
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- fixed set command for settings sniffkin3, pumpkinproxy, security
+- fixed ImportError: cannot import name 'json' from 'itsdangerous' 
+- fixed markupsafe==2.0.1 tos solve deprecated the JSON API.
+- fixed Werkzeug<2.0,>=0.15 is required by {'Flask'}
+
 
 ## [Released]
 

README.md

@@ -28,7 +28,7 @@
 - Credentials harvesting
 - Transparent Proxies
 - LLMNR, NBT-NS and MDNS poisoner ([Responder3](https://github.com/skelsec/Responder3)) 
-- RestFulAPI (disabled)
+- RestFulAPI (new) 
 - and **more**!
 
 ### Donation

config/app/config.ini

@@ -53,6 +53,7 @@ docker=false
 restapi=false
 
 [accesspoint]
+enable_hostapd_config=false
 enable_security=false
 wpa_algorithms=TKIP
 wpa_sharedkey=1234567890
@@ -73,6 +74,12 @@ status_ap=false
 timer_update_info=2000
 ap_max_inactivity=3600
 
+[hostapd_config]
+ieee80211n=1 #Whether IEEE 802.11n (HT) is enabled
+hw_mode=g
+ignore_broadcast_ssid=0 #AP will broadcast SSID 
+skip_inactivity_poll=1
+
 [colors_log]
 generic=light-white, #000000
 pumpkinproxy=light-red, #000000

helps/help_dhcpconf_command.txt

@@ -0,0 +1,8 @@
+set dhcpconf:
+
+ Usage: dhcpconf [id]
+ param id: ID of DHCP configuration option 
+ you can get the list using only `dhcpconf` command
+
+ Description:
+    select a config for configure DHCP Server

helps/help_hostapd_config_command.txt

@@ -0,0 +1,16 @@
+help hostapd_config
+===================
+
+ Usage: set hostapd_config.[variable] [value]
+
+ param [variable]: The key come from hostapd configuration file (hostapd.conf)
+ param [value]: The value come from hostapd configuration file (hostapd.conf
+
+you can see more options on link bellow:
+ https://w1.fi/cgit/hostap/plain/hostapd/hostapd.conf.
+
+ Description:
+    set variables hostapd configuration file 
+
+Referencies:
+   https://wifipumpkin3.github.io/docs/getting-started#core-commands

helps/help_set_command.txt

@@ -1,7 +1,7 @@
 set AP variables:
 
  Usage: set [variable] [value]
- param variable: set variables accesspoint [ssid, bssid, interface, security, channel]
+ param variable: set variables accesspoint [ssid, bssid, interface, security, channel, hostapd_config]
 
  Description:
     Change variables rogue accesspoint attack

helps/help_unset_command.txt

@@ -0,0 +1,11 @@
+unset hostapd_config variables:
+
+ Usage: unset hostapd_config.[variable]
+ param variable: unset variables for hostapd configuration file
+
+ Description:
+    Unset variables for hostapd.conf
+
+Referencies:
+   https://wifipumpkin3.github.io/docs/getting-started#core-commands
+

helps/help_wifideauth_add_command.txt

@@ -0,0 +1,11 @@
+Command add:
+
+ Usage: add [macaddress]
+ param macaddress: The MAC address or (BSSID) of target access point
+  is listed on the command `scan`.
+
+ param .: The param dot will be add all MAC address (BSSID) of target access point
+  is listed on the command `scan`.
+
+ Description:
+    add to list of target for deauth attack.

helps/help_wifideauth_rm_command.txt

@@ -0,0 +1,11 @@
+Command rm:
+
+ Usage: rm [macaddress] or [.]
+ param macaddress: The MAC address or (BSSID) of target access point
+  is listed on the command `scan`.
+
+ param .: The param dot will be remove all MAC address (BSSID) of target access point
+  is listed on the command `scan`.
+
+ Description:
+    remove from list of target for deauth attack.

requirements-dev.txt

@@ -15,12 +15,12 @@ loguru>=0.4.0
 scapy==2.4.3
 isc_dhcp_leases==0.9.1
 dnspython==1.16.0
-Flask>=1.1.1
+Flask==1.1.4
 requests>=2.18.4
 beautifulsoup4>=4.9.1
 black
 coverage==5.1
-# jwt>=1.0.0
-# Flask-RESTful==0.3.7
-# Werkzeug==1.0.1
-
+PyJWT==2.1.0
+flask-restx>=0.5.1
+markupsafe==2.0.1
+Werkzeug<2.0,>=0.15

requirements.txt

@@ -14,10 +14,11 @@ loguru>=0.4.0
 scapy>=2.4.4
 isc_dhcp_leases>=0.9.1
 dnspython==1.16.0
-Flask==1.1.1
+Flask==1.1.4
 requests>=2.18.4
 beautifulsoup4>=4.9.1
 asn1crypto>=1.0.0
-#jwt>=1.0.0
-#Flask-RESTful==0.3.7
-#Werkzeug==1.0.1
+PyJWT==2.1.0
+flask-restx>=0.5.1
+markupsafe==2.0.1
+Werkzeug<2.0,>=0.15

wifipumpkin3/__main__.py

@@ -19,7 +19,7 @@
 from os import getuid
 
 # disable RestAPI
-# from wifipumpkin3.core.servers.rest.application import RestControllerAPI
+from wifipumpkin3.core.servers.rest.application import RestControllerAPI
 import threading
 
 
@@ -38,27 +38,27 @@ def parser_args_func(parse_args, config):
                     info=True,
                 )
             )
-    # if parse_args.restmode:
-    #     if not (parse_args.password):
-    #         print(
-    #             display_messages(
-    #                 "{} \n rest mode require a valid password.".format(
-    #                     setcolor("password invalid", color="red")
-    #                 ),
-    #                 info=True,
-    #             )
-    #         )
-    #         exit(0)
-
-    #     set_nocolors()
-    #     config.set_one("ap_mode", "restapi", True)
-    #     config.set("rest_api_settings", "PASSWORD", parse_args.password)
-    #     config.set("rest_api_settings", "USERNAME", parse_args.username)
-    #     config.set("rest_api_settings", "port", parse_args.restport)
-    #     server_restapi = RestControllerAPI("wp3API", config)
-    #     thead = threading.Thread(target=server_restapi.run)
-    #     thead.setDaemon(True)
-    #     thead.start()
+    if parse_args.restmode:
+        if not (parse_args.password):
+            print(
+                display_messages(
+                    "{} \n rest mode require a valid password.".format(
+                        setcolor("password invalid", color="red")
+                    ),
+                    info=True,
+                )
+            )
+            exit(0)
+
+        set_nocolors()
+        config.set_one("ap_mode", "restapi", True)
+        config.set("rest_api_settings", "PASSWORD", parse_args.password)
+        config.set("rest_api_settings", "USERNAME", parse_args.username)
+        config.set("rest_api_settings", "port", parse_args.restport)
+        server_restapi = RestControllerAPI("wp3API", config)
+        thead = threading.Thread(target=server_restapi.run)
+        thead.setDaemon(True)
+        thead.start()
 
 
 def wp3_header():
@@ -116,31 +116,31 @@ def main():
         action="store_true",
         default=False,
     )
-    # parser.add_argument(
-    #     "--rest",
-    #     dest="restmode",
-    #     help="Run the Wp3 RESTful API.",
-    #     action="store_true",
-    #     default=False,
-    # )
-    # parser.add_argument(
-    #     "--restport",
-    #     dest="restport",
-    #     help="Port to run the Wp3 RESTful API on. default is 1337",
-    #     default=1337,
-    # )
-    # parser.add_argument(
-    #     "--username",
-    #     dest="username",
-    #     help="Start the RESTful API with the specified username instead of pulling from wp3.db",
-    #     default="wp3admin",
-    # )
-    # parser.add_argument(
-    #     "--password",
-    #     dest="password",
-    #     help="Start the RESTful API with the specified password instead of pulling from wp3.db",
-    #     default=None,
-    # )
+    parser.add_argument(
+        "--rest",
+        dest="restmode",
+        help="Run the Wp3 RESTful API.",
+        action="store_true",
+        default=False,
+    )
+    parser.add_argument(
+        "--restport",
+        dest="restport",
+        help="Port to run the Wp3 RESTful API on. default is 1337",
+        default=1337,
+    )
+    parser.add_argument(
+        "--username",
+        dest="username",
+        help="Start the RESTful API with the specified username instead of pulling from wp3.db",
+        default="wp3admin",
+    )
+    parser.add_argument(
+        "--password",
+        dest="password",
+        help="Start the RESTful API with the specified password instead of pulling from wp3.db",
+        default=None,
+    )
     parser.add_argument(
         "-v",
         "--version",

wifipumpkin3/_version.py

@@ -1,3 +1,3 @@
-__version__ = "1.0.9"
-__codename__ = "Guaraci"
+__version__ = "1.1.2"
+__codename__ = "Yorixiriamori"
 __branch__ = "dev"