Merge pull request #490 from ninp0/master

PWN::Plugins::BlackDuckBinaryAnalysis module - duplicate behavior or …

Author: ninp0

README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.4.989]:001 >>> PWN.help
+pwn[v0.4.990]: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.3.0@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.989]:001 >>> PWN.help
+pwn[v0.4.990]:001 >>> PWN.help
 ```
 
 If you're using a multi-user install of RVM do:
@@ -62,7 +62,7 @@ $ rvm use ruby-3.3.0@pwn
 $ rvmsudo gem uninstall --all --executables pwn
 $ rvmsudo gem install --verbose pwn
 $ pwn
-pwn[v0.4.989]:001 >>> PWN.help
+pwn[v0.4.990]: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:

lib/pwn/plugins/black_duck_binary_analysis.rb

@@ -60,8 +60,15 @@ module BlackDuckBinaryAnalysis
 
         when :post, :put
           if http_body.is_a?(Hash)
-            headers[:content_type] = 'multipart/form-data' if http_body.key?(:multipart)
-            http_body = http_body.to_json unless http_body.key?(:multipart)
+            case http_body.key?
+            when :multipart
+              headers[:content_type] = 'multipart/form-data'
+            when :raw
+              headers[:content_type] = nil
+              http_body = http_body[:file]
+            else
+              http_body = http_body.to_json unless http_body.key?(:multipart)
+            end
           end
 
           response = rest_client.execute(
@@ -178,9 +185,14 @@ module BlackDuckBinaryAnalysis
           replace: product_id
         }
 
+        # http_body = {
+        #   multipart: true,
+        #   file: File.new(file, 'rb')
+        # }
+
         http_body = {
-          multipart: true,
-          file: File.new(file, 'rb')
+          raw: true,
+          file: File.binread(file)
         }
 
         response = bd_bin_analysis_rest_call(

lib/pwn/version.rb

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