pwn 0.5.411 → 0.5.412

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e8c4df2a4b02ded646f819e84eb0673aefc4f4a0f7a771ed5213d4d2b6ce3fd
-  data.tar.gz: ad1e9ad33c95d83bf7128d02600251e9229734d58c905854e29dc12511d23d83
+  metadata.gz: 38131db5d063ec6429f21a9705f43f48fee38b9cd62e84e1be7edd61a0bb78cb
+  data.tar.gz: 0edffa812c7a3c32909bfa511df313cb4531589a9c4d15bc1ba40376974e27e9
 SHA512:
-  metadata.gz: c4e78349fe9c1729a8a3df6bf69a319a4e47c971fbc98791ae7b69da9a93561a6e15bb84c0a64a6f49653278aa42a936f1685fdb480440fe3300589cd1f7877d
-  data.tar.gz: 3a7ff1c398b1bcc19f4a42e6c9ceea872078e65df1f1b3efddf2d754a93b9086847fe10de27582ed00a22b60615f0c3b9a808e7568d5d7db7895d8f76eb6f32a
+  metadata.gz: bbe772b7d7169f3ce683c378ebc68f91ef57a463b99907cca069fe32bd32c77c39af3192bc55e939388bcd215eba7f1f034066901ad9b96271f64e2ee7087c47
+  data.tar.gz: 6fad5ffc58148a10b3a5b949d4e28783001ef0daea8b069caad8d38166e6e20bd29f608d05ab2548175a99b62ec55529048ab8ebb738cd6d96ab3b3dcf06e26a

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.411]:001 >>> PWN.help
+pwn[v0.5.412]: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.411]:001 >>> PWN.help
+pwn[v0.5.412]: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.411]:001 >>> PWN.help
+pwn[v0.5.412]: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/lib/pwn/plugins/burp_suite.rb

@@ -360,16 +360,14 @@ module PWN
       # Supported Method Parameters::
       # json_sitemap = PWN::Plugins::BurpSuite.get_sitemap(
       #   burp_obj: 'required - burp_obj returned by #start method',
-      #   target_url: 'optional - target URL to filter sitemap results (defaults to entire sitemap)'
+      #   keyword: 'optional - keyword to filter sitemap entries (default: nil)',
       # )
 
       public_class_method def self.get_sitemap(opts = {})
         burp_obj = opts[:burp_obj]
         rest_browser = burp_obj[:rest_browser]
         mitm_rest_api = burp_obj[:mitm_rest_api]
-        target_url = opts[:target_url]
-
-        base64_encoded_target_url = Base64.strict_encode64(target_url.to_s.scrub.strip.chomp) if target_url
+        keyword = opts[:keyword]
 
         rest_call = "http://#{mitm_rest_api}/sitemap"
         rest_call = "#{rest_call}/#{base64_encoded_target_url}" if target_url
@@ -379,7 +377,16 @@ module PWN
           content_type: 'application/json; charset=UTF8'
         )
 
-        JSON.parse(sitemap, symbolize_names: true)
+        sitemap_arr = JSON.parse(sitemap, symbolize_names: true)
+
+        if keyword
+          sitmap_arr = sitemap_arr.select do |site|
+            dec_request = Base64.strict_decode64(site[:request])
+            site if dec_request.include?(keyword)
+          end
+        end
+
+        sitemap_arr
       rescue StandardError => e
         stop(burp_obj: burp_obj) unless burp_obj.nil?
         raise e
@@ -439,31 +446,6 @@ module PWN
         raise e
       end
 
-      # Supported Method Parameters::
-      # repeater_id = PWN::Plugins::BurpSuite.find_sitemap_entries(
-      #   burp_obj: 'required - burp_obj returned by #start method',
-      #   search_string: 'required - string to search for in the sitemap entries'
-      # )
-
-      public_class_method def self.find_sitemap_entries(opts = {})
-        burp_obj = opts[:burp_obj]
-        raise 'ERROR: burp_obj parameter is required' unless burp_obj.is_a?(Hash)
-
-        search_string = opts[:search_string]
-        raise 'ERROR: search_string parameter is required' if search_string.nil?
-
-        rest_browser = burp_obj[:rest_browser]
-        mitm_rest_api = burp_obj[:mitm_rest_api]
-
-        json_sitemap = get_sitemap(burp_obj: burp_obj)
-        matching_entries = json_sitemap.select do |entry|
-          decoded_request = Base64.strict_decode64(entry[:request])
-          decoded_request.include?(search_string)
-        end
-      rescue StandardError => e
-        raise e
-      end
-
       # Supported Method Parameters:
       # json_sitemap = PWN::Plugins::BurpSuite.import_openapi_to_sitemap(
       #   burp_obj: 'required - burp_obj returned by #start method',
@@ -1376,7 +1358,7 @@ module PWN
 
           json_sitemap = #{self}.get_sitemap(
             burp_obj: 'required - burp_obj returned by #start method',
-            target_url: 'optional - target URL to filter sitemap results (defaults to entire sitemap)'
+            keyword: 'optional - keyword to filter sitemap results (default: nil)',
           )
 
           json_sitemap = #{self}.add_to_sitemap(
@@ -1401,11 +1383,6 @@ module PWN
             }
           )
 
-          #{self}.find_sitemap_entry(
-            burp_obj: 'required - burp_obj returned by #start method',
-            search_string: 'required - string to search for in the sitemap entries'
-          )
-
           json_sitemap = #{self}.import_openapi_to_sitemap(
             burp_obj: 'required - burp_obj returned by #start method',
             openapi_spec: 'required - path to OpenAPI JSON or YAML specification file',

data/lib/pwn/plugins/zaproxy.rb

@@ -197,18 +197,21 @@ module PWN
       # Supported Method Parameters::
       # json_sitemap = PWN::Plugins::Zaproxy.get_sitemap(
       #   zap_obj: 'required - zap_obj returned from #open method',
+      #   keyword: 'optional - string to search for in the sitemap entries (defaults to nil)',
       #   return_as: 'optional - :base64 or :har (defaults to :base64)'
       # )
 
       public_class_method def self.get_sitemap(opts = {})
         zap_obj = opts[:zap_obj]
         api_key = zap_obj[:api_key].to_s.scrub
+        keyword = opts[:keyword]
         return_as = opts[:return_as] ||= :base64
 
         entries = []
         start = 0
         count = 1000
 
+        # Get all entries in sitemap
         loop do
           params = { apikey: api_key, start: start, count: count }
 
@@ -225,59 +228,71 @@ module PWN
           entries += new_entries
           start += count
         end
-        return entries if return_as == :har
-
-        # Deduplicate entries based on method + url
-        seen = Set.new
-        converted_messages = []
-
-        entries.each do |entry|
-          req = entry[:request]
-          key = [req[:method], req[:url]]
-          next if seen.include?(key)
-
-          seen.add(key)
-
-          # Build full request string
-          req_line = "#{req[:method]} #{req[:url]} #{req[:httpVersion]}\r\n"
-          req_headers = req[:headers].map { |h| "#{h[:name]}: #{h[:value]}\r\n" }.join
-          req_body = ''
-          if req[:postData] && req[:postData][:text]
-            req_body = req[:postData][:text]
-            req_body = Base64.decode64(req_body) if req[:postData][:encoding] == 'base64'
+
+        case return_as
+        when :har
+          if keyword
+            entries = har_sitemap.select do |site|
+              json_request = site[:request].to_json
+              json_request.include?(keyword)
+            end
           end
-          full_req = "#{req_line}#{req_headers}\r\n#{req_body}".force_encoding('ASCII-8BIT')
-          encoded_req = Base64.strict_encode64(full_req)
-
-          # Build full response string
-          res = entry[:response]
-          res_line = "#{res[:httpVersion]} #{res[:status]} #{res[:statusText]}\r\n"
-          res_headers = res[:headers].map { |h| "#{h[:name]}: #{h[:value]}\r\n" }.join
-          res_body = ''
-          if res[:content] && res[:content][:text]
-            res_body = res[:content][:text]
-            res_body = Base64.decode64(res_body) if res[:content][:encoding] == 'base64'
+        when :base64
+          # Deduplicate entries based on method + url
+          entries.each do |entry|
+            entry_hash = {}
+            req = entry[:request]
+            key = [req[:method], req[:url]]
+
+            # Build full request string
+            req_line = "#{req[:method]} #{req[:url]} #{req[:httpVersion]}\r\n"
+            req_headers = req[:headers].map { |h| "#{h[:name]}: #{h[:value]}\r\n" }.join
+            req_body = ''
+            if req[:postData] && req[:postData][:text]
+              req_body = req[:postData][:text]
+              req_body = Base64.decode64(req_body) if req[:postData][:encoding] == 'base64'
+            end
+            full_req = "#{req_line}#{req_headers}\r\n#{req_body}".force_encoding('ASCII-8BIT')
+            encoded_req = Base64.strict_encode64(full_req)
+
+            # Build full response string
+            res = entry[:response]
+            res_line = "#{res[:httpVersion]} #{res[:status]} #{res[:statusText]}\r\n"
+            res_headers = res[:headers].map { |h| "#{h[:name]}: #{h[:value]}\r\n" }.join
+            res_body = ''
+            if res[:content] && res[:content][:text]
+              res_body = res[:content][:text]
+              res_body = Base64.decode64(res_body) if res[:content][:encoding] == 'base64'
+            end
+            full_res = "#{res_line}#{res_headers}\r\n#{res_body}".force_encoding('ASCII-8BIT')
+            encoded_res = Base64.strict_encode64(full_res)
+
+            # Extract http_service
+            uri = URI.parse(req[:url])
+            http_service = {
+              host: uri.host,
+              port: uri.port,
+              protocol: uri.scheme
+            }
+
+            # Add to array
+            entry_hash[:request] = encoded_req
+            entry_hash[:response] = encoded_res
+            entry_hash[:http_service] = http_service
+            entries.push(entry_hash)
           end
-          full_res = "#{res_line}#{res_headers}\r\n#{res_body}".force_encoding('ASCII-8BIT')
-          encoded_res = Base64.strict_encode64(full_res)
-
-          # Extract http_service
-          uri = URI.parse(req[:url])
-          http_service = {
-            host: uri.host,
-            port: uri.port,
-            protocol: uri.scheme
-          }
 
-          # Add to array
-          converted_messages << {
-            request: encoded_req,
-            response: encoded_res,
-            http_service: http_service
-          }
+          if keyword
+            entries = entries.select do |site|
+              deccoded_request = Base64.strict_decode64(site[:request])
+              deccoded_request.include?(keyword)
+            end
+          end
+        else
+          raise "ERROR: Invalid return_as option #{return_as}.  Valid options are :base64 or :har"
         end
 
-        converted_messages
+        entries.uniq
       rescue StandardError, SystemExit, Interrupt => e
         stop(zap_obj: zap_obj) unless zap_obj.nil?
         raise e
@@ -316,38 +331,10 @@ module PWN
         raise e
       end
 
-      # Supported Method Parameters::
-      # PWN::Plugins::Zaproxy.find_har_entries(
-      #   zap_obj: 'required - zap_obj returned from #open method',
-      #   search_string: 'required - string to search for in the sitemap entries'
-      # )
-
-      public_class_method def self.find_har_entries(opts = {})
-        zap_obj = opts[:zap_obj]
-        api_key = zap_obj[:api_key].to_s.scrub
-        search_string = opts[:search_string]
-        raise 'ERROR: search_string must be provided' if search_string.nil?
-
-        har_sitemap = get_sitemap(
-          zap_obj: zap_obj,
-          return_as: :har
-        )
-
-        har_entries = har_sitemap.select do |entry|
-          json_request = entry[:request].to_json
-          json_request.include?(search_string)
-        end
-
-        har_entries
-      rescue StandardError, SystemExit, Interrupt => e
-        stop(zap_obj: zap_obj) unless zap_obj.nil?
-        raise e
-      end
-
       # Supported Method Parameters::
       # PWN::Plugins::Zaproxy.requester(
       #   zap_obj: 'required - zap_obj returned from #open method',
-      #   har_entry: 'required - har entry (e.g. from #get_sitemap method or #find_har_entries method)',
+      #   har_entry: 'required - har entry (e.g. from #get_sitemap method method)',
       #   redirect: 'optional - follow redirects if set to true (defaults to false)'
       # )
 
@@ -788,6 +775,7 @@ module PWN
 
           #{self}.get_sitemap(
             zap_obj: 'required - zap_obj returned from #open method',
+            keyword: 'optional - string to search for in the sitemap entries (defaults to nil)',
             return_as: 'optional - :base64 or :har (defaults to :base64)'
           )
 
@@ -797,14 +785,9 @@ module PWN
             context_name: 'optional - context name to add target_regex to (defaults to Default Context)'
           )
 
-          #{self}.find_har_entries(
-            zap_obj: 'required - zap_obj returned from #open method',
-            search_string: 'required - string to search for in the sitemap entries'
-          )
-
           #{self}.requester(
             zap_obj: 'required - zap_obj returned from #open method',
-            har_entry: 'required - har entry (e.g. from #get_sitemap method or #find_har_entries method)',
+            har_entry: 'required - har entry (e.g. from #get_sitemap method method)',
             redirect: 'optional - follow redirects if set to true (defaults to true)'
           )
 

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.411
+  version: 0.5.412
 platform: ruby
 authors:
 - 0day Inc.