pwn 0.5.327 → 0.5.328

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0843f0e4e3ed905cafcb9ca071cedac0f2bd5707f1b087ddb9720d4bbea12bd2'
-  data.tar.gz: 8587c3be1cffbeda6c0f46d2e513a2570bd0339995172bf9d5c0ff0c2c4146c8
+  metadata.gz: 61a3e4aadc72123a14b01bdeaf00d0f989920b903d8dd7564b0f845c20dcbc05
+  data.tar.gz: 434ba38914fec8d955e2ba33e6e7fd70df019316700208a262bf99323a719457
 SHA512:
-  metadata.gz: 6e1cab51e4759e9409203f465575f9359f1f4baa19d1149bfaf3e5fe57e32f2d03b16d14ceeaee79fdb4a9420dbf409f7084560b5847505dd0623d9fe9b7b6d2
-  data.tar.gz: 50cc81e0012b45ec88821d0b129cefd02dca8123c261f2f88cab3b49ce418ee3b07f47a92bc3ef6255663db1846dba9dc795d48da30ea6b1e16dc7f5d7da8f75
+  metadata.gz: 5526a4ffc3f9380f1ec6b94c05812f8cebd3c5c5e36411c0e4a8378afa2039b9152c11f2ab5af179349872334296fa87833cedb914a172617bc12edf8d32ef5f
+  data.tar.gz: d381fc4450897918b52e0af2faf1625ef9af46c483bb4ecc3ee34d854807c0015f0a08d93a91437c36af611bbc477fa0cee220a98bfe05ff4b46326b109b771a

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.327]:001 >>> PWN.help
+pwn[v0.5.328]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.4.4@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.5.327]:001 >>> PWN.help
+pwn[v0.5.328]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.4.4@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.5.327]:001 >>> PWN.help
+pwn[v0.5.328]:001 >>> PWN.help
 ```
 
 PWN periodically upgrades to the latest version of Ruby which is reflected in `/opt/pwn/.ruby-version`.  The easiest way to upgrade to the latest version of Ruby from a previous PWN installation is to run the following script:

data/bin/pwn_burp_suite_pro_active_scan

@@ -33,10 +33,6 @@ OptionParser.new do |options|
   options.on('-iURL', '---in_scope=URL', '<Optional - URL to add include in scope (Defaults to value of --target_url)>') do |s|
     opts[:in_scope] = s
   end
-
-  options.on('-cFILE', '--target-config=FILE', '<Optional - Path to Target Config JSON File>') do |c|
-    opts[:target_config] = c
-  end
 end.parse!
 
 if opts.empty?
@@ -56,7 +52,6 @@ begin
   raise 'Invalid path to browser instructions.  Please check your spelling and try again.' unless File.exist?(navigation_instruct)
 
   in_scope = opts[:in_scope] ||= target_url
-  target_config = opts[:target_config]
 
   # ------
   # Open Burp
@@ -64,14 +59,12 @@ begin
     burp_obj = PWN::Plugins::BurpSuite.start(
       burp_jar_path: burp_jar_path,
       headless: true,
-      browser_type: :headless,
-      target_config: target_config
+      browser_type: :headless
     )
   else
     burp_obj = PWN::Plugins::BurpSuite.start(
       burp_jar_path: burp_jar_path,
-      browser_type: :chrome,
-      target_config: target_config
+      browser_type: :chrome
     )
   end
 

data/lib/pwn/plugins/burp_suite.rb

@@ -44,8 +44,7 @@ module PWN
       # burp_obj = PWN::Plugins::BurpSuite.start(
       #   burp_jar_path: 'options - path of burp suite pro jar file (defaults to /opt/burpsuite/burpsuite_pro.jar)',
       #   headless: 'optional - run burp headless if set to true',
-      #   browser_type: 'optional - defaults to :firefox. See PWN::Plugins::TransparentBrowser.help for a list of types',
-      #   target_config: 'optional - path to burp suite pro target config JSON file'
+      #   browser_type: 'optional - defaults to :firefox. See PWN::Plugins::TransparentBrowser.help for a list of types'
       # )
 
       public_class_method def self.start(opts = {})
@@ -60,16 +59,9 @@ module PWN
                          opts[:browser_type]
                        end
 
-        target_config = opts[:target_config]
-
-        if opts[:headless]
-          # burp_cmd_string = "java -Xmx4G -Djava.awt.headless=true -classpath #{burp_root}/burpbuddy.jar:#{burp_jar_path} burp.StartBurp"
-          burp_cmd_string = "java -Xmx4G -Djava.awt.headless=true -classpath #{burp_root}/burpbuddy.jar -jar #{burp_jar_path}"
-        else
-          # burp_cmd_string = "java -Xmx4G -classpath #{burp_root}/burpbuddy.jar:#{burp_jar_path} burp.StartBurp"
-          burp_cmd_string = "java -Xmx4G -classpath #{burp_root}/burpbuddy.jar -jar #{burp_jar_path}"
-        end
-        burp_cmd_string = "#{burp_cmd_string} --config-file=#{target_config}" if target_config && File.exist?(target_config)
+        burp_cmd_string = "java -Xmx4G -jar #{burp_jar_path}"
+        burp_cmd_string = "java -Xmx4G -Djava.awt.headless=true -jar #{burp_jar_path}" if opts[:headless]
+        # burp_cmd_string = "#{burp_cmd_string} --user-config-file=#{user_config}" if File.exist?(user_config)
 
         # Construct burp_obj
         burp_obj = {}
@@ -78,10 +70,11 @@ module PWN
         rest_browser = browser_obj1[:browser]
 
         # random_mitm_port = PWN::Plugins::Sock.get_random_unused_port
-        # random_bb_port = random_mitm_port
-        # random_bb_port = PWN::Plugins::Sock.get_random_unused_port while random_bb_port == random_mitm_port
-        burp_obj[:mitm_proxy] = '127.0.0.1:8080'
-        burp_obj[:burpbuddy_api] = '127.0.0.1:8001'
+        random_mitm_port = 8080
+        # random_bb_port = PWN::Plugins::Sock.get_random_unused_port
+        random_bb_port = 8001
+        burp_obj[:mitm_proxy] = "127.0.0.1:#{random_mitm_port}"
+        burp_obj[:burpbuddy_api] = "127.0.0.1:#{random_bb_port}"
         burp_obj[:rest_browser] = rest_browser
 
         # Proxy always listens on localhost...use SSH tunneling if remote access is required
@@ -94,7 +87,7 @@ module PWN
 
         # Wait for TCP 8001 to open prior to returning burp_obj
         loop do
-          s = TCPSocket.new('127.0.0.1', 8001)
+          s = TCPSocket.new('127.0.0.1', random_bb_port)
           s.close
           break
         rescue Errno::ECONNREFUSED
@@ -401,15 +394,10 @@ module PWN
 
       public_class_method def self.help
         puts "USAGE:
-          # PLEASE NOTE: IF RUNNING THIS MODULE THE FIRST TIME, YOU HAVE TO MANUALLY LOAD
-          # /opt/burpsuite/burpsuite_pro.jar INTO THE BURP SUITE PRO UI IN ORDER FOR
-          # THIS TO WORK PROPERLY MOVING FORWARD.  THIS SHOULD ONLY BE NECESSARY TO
-          # DO ONCE.
           burp_obj = #{self}.start(
             burp_jar_path: 'required - path of burp suite pro jar file (defaults to /opt/burpsuite/burpsuite_pro.jar)',
             headless: 'optional - run headless if set to true',
-            browser_type: 'optional - defaults to :firefox. See PWN::Plugins::TransparentBrowser.help for a list of types',
-            target_config: 'optional - path to burp suite pro target config JSON file'
+            browser_type: 'optional - defaults to :firefox. See PWN::Plugins::TransparentBrowser.help for a list of types'
           )
 
           uri_in_scope_bool = #{self}.uri_in_scope(

data/lib/pwn/plugins/owasp_zap.rb

@@ -426,6 +426,41 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # PWN::Plugins::OwaspZap.import_openapi_spec_file(
+      #   zap_obj: 'required - zap_obj returned from #open method',
+      #   spec: 'required - path to OpenAPI spec file (e.g. /path/to/openapi.yaml)',
+      #   target: 'required - target URL to ovverride the service URL in the OpenAPI spec (e.g. https://fq.dn)',
+      #   context_id: 'optional - ID of the ZAP context (Defaults to first context, if any)',
+      #   user_id: 'optional - ID of the ZAP user (Defaults to first user, if any)'
+      # )
+
+      public_class_method def self.import_openapi_spec_file(opts = {})
+        zap_obj = opts[:zap_obj]
+        api_key = zap_obj[:api_key].to_s.scrub
+        spec = opts[:spec]
+        target = opts[:target]
+        context_id = opts[:context_id]
+        user_id = opts[:user_id]
+
+        params = {
+          apikey: api_key,
+          file: spec,
+          target: target,
+          contextId: context_id,
+          user_id: user_id
+        }
+
+        zap_rest_call(
+          zap_obj: zap_obj,
+          rest_call: "JSON/break/action/openapi/?zapapiformat=JSON&apikey=#{api_key}",
+          params: params
+        )
+      rescue StandardError, SystemExit, Interrupt => e
+        stop(zap_obj) unless zap_obj.nil?
+        raise e
+      end
+
       # Supported Method Parameters::
       # watir_resp = PWN::Plugins::OwaspZap.request(
       #   zap_obj: 'required - zap_obj returned from #open method',

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.5.327'
+  VERSION = '0.5.328'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.327
+  version: 0.5.328
 platform: ruby
 authors:
 - 0day Inc.
@@ -2298,8 +2298,8 @@ files:
 - spec/lib/pwn_spec.rb
 - spec/spec_helper.rb
 - third_party/.gitkeep
-- third_party/burpbuddy-3.1.1-SNAPSHOT-all.jar
 - third_party/http-request-headers-fields-large.txt
+- third_party/pwn_burp_rest_api.jar
 - third_party/pwn_rdoc.jsonl
 - third_party/r2-pwn-layout
 - update_pwn.sh