pwn 0.4.801 → 0.4.803

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b7ad63e0b8d5b9b22fad319b8b520d083b11fc2d3cb27f2844adb090ae19a74
-  data.tar.gz: '009b6c53800b30a61c0a16e26d1f1db4c5dae6877025f6663349a2ffeb0c7872'
+  metadata.gz: b018f6d15b17f497666cf15464f43bd6a1e02e20c0ad87633bb45425ddef3ad7
+  data.tar.gz: 75fb48990f0526ff22180cb53e51efa5e6cb0b0c897235523f17f341698916e3
 SHA512:
-  metadata.gz: 2effa631570ca78d2b9a9a160d276b63edf4a8c0684fb8abfee821cb97027af07afde92800a146dffc2636b039873071edacab33c33bb7d4606c6d81ee1fd424
-  data.tar.gz: bf36c8999fa022eb266280ef4d736c96ddbcc0b52e0599ba710ec48a928e02fb642c3aa336df18c01d0093963f7b4928ff90997b3055b844035756de246a5a98
+  metadata.gz: ff29882c206b0dd096fa946a60b79890344aaac8b6b5f64d854b029be674bccf9aa98545ca3f41e7ff2d3da2dab60d66474a7a8cd68aaa35aae5c31f5f7a39b9
+  data.tar.gz: b26643bdc27c4695f9d7672ce27aa596b7e21aa1370a9aa14e45dd52b029000de0d7f6edd27090641c8e6e4c38ee5961a278450390e10be73ad4610a2827519b

data/README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.801]:001 >>> PWN.help
+pwn[v0.4.803]: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.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.801]:001 >>> PWN.help
+pwn[v0.4.803]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_bdba_scan

@@ -88,6 +88,7 @@ begin
   end
 
   scan_progress_resp = {}
+  scan_progress_busy_duration = 0
   loop do
     scan_progress_resp = PWN::Plugins::BlackDuckBinaryAnalysis.get_apps_by_group(
       token: token,
@@ -96,10 +97,23 @@ begin
 
     break if scan_progress_resp[:products].none? { |p| p[:status] == 'B' } || report_only
 
+    # Cancel queued scan if it's been queued for more than 90 minutes
+    if scan_progress_busy_duration > 5_400
+      scan_progress_resp[:products].select { |p| p[:status] == 'B' }.each do |p|
+        puts "Abort Queued Scan: #{p[:name]}"
+        PWN::Plugins::BlackDuckBinaryAnalysis.abort_product_scan(
+          token: token,
+          product_id: p[:product_id]
+        )
+      end
+      raise "ERROR: BDBA Scan Queued for More than 90 Minutes: #{target_file}"
+    end
+
     10.times do
       print '.'
       sleep 1
     end
+    scan_progress_busy_duration += 10
   end
 
   product_id = scan_progress_resp[:products].find { |p| p[:name] == CGI.escape(File.basename(target_file)) }[:product_id]

data/git_commit_test_reinit_gem.sh

@@ -17,12 +17,8 @@ if (( $# == 3 )); then
   # Tag for every 100 commits (i.e. 0.1.100, 0.1.200, etc)
   tag_this_version_bool=`ruby -r 'pwn' -e 'if (PWN::VERSION.split(".")[-1].to_i + 1) % 100 == 0; then print true; else print false; end'`
   if [[ $tag_this_version_bool == 'true' ]]; then
-    this_version=`ruby -r 'pwn' -e 'print PWN::VERSION'`
-    echo "Tagging: ${this_version}"
-    git tag $this_version
-    last_tag=$(git tag | tail -n 2 | head -n 1)
-    this_tag=$(git tag | tail -n 1)
-    git log $last_tag...$this_tag --oneline > CHANGELOG_BETWEEN_TAGS.txt
+    last_tag=$(git tag | tail -n 1)
+    git log $last_tag.. --oneline > CHANGELOG_BETWEEN_TAGS.txt
   fi
 
   git commit -a -S --author="${1} <${2}>" -m "${3}"
@@ -33,8 +29,12 @@ if (( $# == 3 )); then
     echo "Pushing ${latest_gem} to RubyGems.org..."
     rvmsudo gem push $latest_gem --debug
   fi
+
   if [[ $tag_this_version_bool == 'true' ]]; then
-    git push origin ${this_tag}
+    this_version=`ruby -r 'pwn' -e 'print PWN::VERSION'`
+    echo "Tagging: ${this_version}"
+    git tag $this_version
+    git push origin $this_version
   fi
 else
   usage

data/lib/pwn/plugins/black_duck_binary_analysis.rb

@@ -209,6 +209,27 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # response = PWN::Plugins::BlackDuckBinaryAnalysis.abort_product_scan(
+      #   token: 'required - Bearer token',
+      #   product_id: 'required - product id'
+      # )
+
+      public_class_method def self.abort_product_scan(opts = {})
+        token = opts[:token]
+        product_id = opts[:product_id]
+
+        response = bd_bin_analysis_rest_call(
+          http_method: :post,
+          token: token,
+          rest_call: "product/#{product_id}/abort"
+        )
+
+        JSON.parse(response, symbolize_names: true)
+      rescue StandardError => e
+        raise e
+      end
+
       # Supported Method Parameters::
       # response = PWN::Plugins::BlackDuckBinaryAnalysis.generate_product_report(
       #   token: 'required - Bearer token',
@@ -584,6 +605,11 @@ module PWN
             product_id: 'required - product id'
           )
 
+          response = #{self}.abort_product_scan(
+            token: 'required - Bearer token',
+            product_id: 'required - product id'
+          )
+
           response = #{self}.generate_product_report(
             token: 'required - Bearer token',
             product_id: 'required - product id',

data/lib/pwn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.801
+  version: 0.4.803
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport