pwn 0.4.802 → 0.4.804

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd6ac362c796433cbdeb21b3f13ebd7e9b72a3bf3995c9fd203d5b6739f2e58
-  data.tar.gz: c704e7044aeeac624db2bfda416d78022d3cef3a211b8a170625063e0ce397e6
+  metadata.gz: '09721e5fe360b1b68f75194406792bf3ce99d8b0d907dbf3ec21e853f34792ba'
+  data.tar.gz: 32438ee4f0cfff658da7657c420602d0c4261909dc0d6cb28055ace5fae28252
 SHA512:
-  metadata.gz: f99b1bfbbbc00e3acca8eecfea0a57df37c75ec8473936c0ed61397573f12c1347405bbd142a24e1606987aa57a7ed8615379a27d492961cb692724add353032
-  data.tar.gz: aeb3e52dfd502b296274bc9cfb91acdf1400101dca4452d6da9fc5c45bf8b41cb7c76c1653dd135945b7a069ddb2258f82dcf7cea4605307f045b12ce58c6f59
+  metadata.gz: 83c3dcbfce05ac2fcae70a94a88a4431f5191920f6ccc3f1412440609ca6b9a1b04b78107cd24541188e3e2eb80a13ca452b410f838dca8684535d46aa89e8ac
+  data.tar.gz: ff0b6e00e2b210d0249eedbcdd55e99bdd91b641dd0a611807e46342b6f91c709257d1b9dbd11e51b6d7bc690f21c3dcd86d29360fd44102093b6a8705a904f1

data/Gemfile

@@ -16,7 +16,7 @@ gem 'anemone', '0.7.2'
 gem 'authy', '3.0.1'
 gem 'aws-sdk', '3.1.0'
 # gem 'bettercap', '1.6.2'
-gem 'brakeman', '6.0.0'
+gem 'brakeman', '6.0.1'
 gem 'bson', '4.15.0'
 gem 'bundler', '>=2.4.17'
 gem 'bundler-audit', '0.9.1'
@@ -40,7 +40,7 @@ gem 'jsonpath', '1.1.3'
 gem 'jwt', '2.7.1'
 gem 'luhn', '1.0.2'
 gem 'mail', '2.8.1'
-gem 'mongo', '2.19.0'
+gem 'mongo', '2.19.1'
 gem 'msfrpc-client', '1.1.2'
 gem 'neovim', '0.9.0'
 gem 'netaddr', '2.0.6'
@@ -64,10 +64,10 @@ gem 'rbvmomi', '3.0.0'
 gem 'rdoc', '6.5.0'
 gem 'rest-client', '2.1.0'
 gem 'rex', '2.0.13'
-gem 'rmagick', '5.2.0'
+gem 'rmagick', '5.3.0'
 gem 'rspec', '3.12.0'
 gem 'rtesseract', '3.1.2'
-gem 'rubocop', '1.54.2'
+gem 'rubocop', '1.55.0'
 gem 'rubocop-rake', '0.6.0'
 gem 'rubocop-rspec', '2.22.0'
 gem 'ruby-audio', '1.6.1'
@@ -75,7 +75,7 @@ gem 'ruby-nmap', '1.0.1'
 gem 'ruby-saml', '1.15.0'
 gem 'rvm', '1.11.3.9'
 gem 'savon', '2.14.0'
-gem 'selenium-devtools', '0.114.0'
+gem 'selenium-devtools', '0.115.0'
 gem 'serialport', '1.3.2'
 gem 'sinatra', '3.0.6'
 gem 'slack-ruby-client', '2.1.0'

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.802]:001 >>> PWN.help
+pwn[v0.4.804]: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.802]:001 >>> PWN.help
+pwn[v0.4.804]:001 >>> PWN.help
 ```
 
 

data/bin/pwn_bdba_scan

@@ -35,6 +35,10 @@ OptionParser.new do |options|
   options.on('-tTYPE', '--report-type=TYPE', '<Optional - Black Duck Binary Analysis Scan Report Type csv_libs|csv_vulns|pdf (Default: csv_vulns)>') do |t|
     opts[:report_type] = t
   end
+
+  options.on('-vVERSION', '--version=VERSION', '<Optional - Version to Associate w/ Specific Scan (Default: nil)>') do |v|
+    opts[:version] = v
+  end
 end.parse!
 
 if opts.empty?
@@ -68,6 +72,8 @@ begin
   report_type_str = opts[:report_type] ||= 'csv_vulns'
   report_type = report_type_str.to_s.to_sym
 
+  version = opts[:version]
+
   groups_resp = PWN::Plugins::BlackDuckBinaryAnalysis.get_groups(
     token: token
   )
@@ -83,11 +89,13 @@ begin
     PWN::Plugins::BlackDuckBinaryAnalysis.upload_file(
       token: token,
       file: target_file,
-      group_id: parent_id
+      group_id: parent_id,
+      version: version
     )
   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 +104,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/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.802'
+  VERSION = '0.4.804'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.802
+  version: 0.4.804
 platform: ruby
 authors:
 - 0day Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
@@ -408,14 +408,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: 2.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.19.0
+        version: 2.19.1
 - !ruby/object:Gem::Dependency
   name: msfrpc-client
   requirement: !ruby/object:Gem::Requirement
@@ -744,14 +744,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -786,14 +786,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.54.2
+        version: 1.55.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.54.2
+        version: 1.55.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -898,14 +898,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.114.0
+        version: 0.115.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.114.0
+        version: 0.115.0
 - !ruby/object:Gem::Dependency
   name: serialport
   requirement: !ruby/object:Gem::Requirement