pwn 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c89b0a1d4b4b25ebfb0865c8528df03e291131fb0316c511124bc75dd73bbdb
-  data.tar.gz: 40da0baedc0ccd44dc1210119c073bf33e911574bc6c374d0c1a74c92870bfe3
+  metadata.gz: 830ff0222ce1d91faa0cb731810085935ad1c9da2e1785d6468ba5419e3bfb87
+  data.tar.gz: efcb347f3225693b7b67ac78e09635c2c186cc9302dd1b37e103eaf658d156f2
 SHA512:
-  metadata.gz: 1ebd87a44ea07f5395f61cf81926e9da2839d2f08ba626fdb632361b33947bbc8064764de515a456f6cc8790038413a82bcfdbc0ea3777ce898af19a144307f0
-  data.tar.gz: 2cca8da63a833cf6404f5c38c6fb1c818e3600deb1dbf3d600a6ab5d0965c1d7790b145f7293664d746ded7d09908b3c0fe037a70aa8f89a005edc98c864a278
+  metadata.gz: cb81f182a1d8de751a45bf66fd73ccdfb64ab01bdbb9c5921d8673888f9de7744c9bc7a2c422e388566d1a8c20e778ee7e8870640f15969a6be40139d7ad763e
+  data.tar.gz: 3d3c30615ef6808af1b5441ee5642ab7acdb3a7989755f115f93c3e2cc4b56f0a75ad3c468743100377f327208e2c4154c326aa8e99c656afc9f96a5f3d6d5bc

data/README.md

@@ -37,7 +37,7 @@ $ cd /opt/pwn
 $ ./install.sh
 $ ./install.sh ruby-gem
 $ pwn
-pwn[v0.5.4]:001 >>> PWN.help
+pwn[v0.5.5]: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.5.4]:001 >>> PWN.help
+pwn[v0.5.5]: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.5.4]:001 >>> PWN.help
+pwn[v0.5.5]: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_bdba_groups

@@ -26,6 +26,14 @@ OptionParser.new do |options|
   options.on('-pID', '--parent-group-id=ID', '<Optional - Black Duck Binary Analysis Parent Group ID to Associate with Group>') do |p|
     opts[:parent_group_id] = p
   end
+
+  options.on('-bSEC', '--binary-cleanup-age=SEC', '<Optional - after how long the binary will be deleted in seconds (Default: 2_592_000 / 30 days)>') do |b|
+    opts[:binary_cleanup_age] = b
+  end
+
+  options.on('-PSEC', '--product-cleanup-age=SEC', '<Optional - after how long the product will be deleted in seconds (Default: 2_592_000 / 30 days)>') do |p|
+    opts[:product_cleanup_age] = p
+  end
 end.parse!
 
 if opts.empty?
@@ -47,6 +55,8 @@ begin
 
   list_group_name = opts[:list_group_name]
   parent_group_id = opts[:parent_group_id]
+  binary_cleanup_age = opts[:binary_cleanup_age]
+  product_cleanup_age = opts[:product_cleanup_age]
 
   if list_group_name
     groups_resp = PWN::Plugins::BlackDuckBinaryAnalysis.get_groups(
@@ -95,7 +105,9 @@ begin
   create_group_resp = PWN::Plugins::BlackDuckBinaryAnalysis.create_group(
     token: token,
     name: group_name,
-    parent_id: parent_group_id
+    parent_id: parent_group_id,
+    binary_cleanup_age: binary_cleanup_age,
+    product_cleanup_age: product_cleanup_age
   )
 
   puts create_group_resp.to_json

data/bin/pwn_bdba_scan

@@ -149,12 +149,7 @@ begin
     # File encoding conducting by synopsis is kinda goofy.
     # The encode space w/ + (which is expected) but dont
     # encode + to %2B (whiich _isn't_ expected)
-    target_basename = CGI.escape(
-      File.basename(target_file)
-    ).gsub(
-      '%2B',
-      '+'
-    )
+    target_basename = CGI.unescape_uri_component(File.basename(target_file))
 
     find_product = scan_progress_resp[:products].find { |p| p[:name] == target_basename }
 

data/lib/pwn/plugins/black_duck_binary_analysis.rb

@@ -197,7 +197,7 @@ module PWN
         response = bd_bin_analysis_rest_call(
           http_method: :put,
           token: token,
-          rest_call: "upload/#{CGI.escape(file_name)}",
+          rest_call: "upload/#{CGI.escape_uri_component(file_name)}",
           http_headers: http_headers,
           http_body: http_body
         )
@@ -326,8 +326,8 @@ module PWN
       #   desc: 'optional - group description',
       #   parent_id: 'optional - parent group id',
       #   delete_binary: 'optional - delete binary after analysis C|Y|N (Default: C== company default)',
-      #   binary_cleanup_age: 'optional - after how long the binary will be deleted in seconds (Default: 604_800 / 1 week)',
-      #   product_cleanup_age: 'optional - after how long the product will be deleted in seconds (Default: 604_800 / 1 week)',
+      #   binary_cleanup_age: 'optional - after how long the binary will be deleted in seconds (Default: 2_592_000 / 30 days)',
+      #   product_cleanup_age: 'optional - after how long the product will be deleted in seconds (Default: 2_592_000 / 30 days)',
       #   file_download_enabled: 'optional - allow download of uploaded binaries from group (Default: false),
       #   low_risk_tolerance: 'optional - low risk tolerance nil|true|false (Default: nil == company default)',
       #   include_historical_vulns: 'optional - include historical vulns nil|true|false (Default: nil == company default)',
@@ -345,8 +345,8 @@ module PWN
         desc = opts[:desc]
         parent_id = opts[:parent_id]
         delete_binary = opts[:delete_binary] ||= 'C'
-        binary_cleanup_age = opts[:binary_cleanup_age] ||= 604_800
-        product_cleanup_age = opts[:product_cleanup_age] ||= 604_800
+        binary_cleanup_age = opts[:binary_cleanup_age] ||= 2_592_000
+        product_cleanup_age = opts[:product_cleanup_age] ||= 2_592_000
         file_download_enabled = opts[:file_download_enabled] ||= false
         low_risk_tolerance = opts[:low_risk_tolerance]
         include_historical_vulns = opts[:include_historical_vulns]
@@ -654,8 +654,8 @@ module PWN
             desc: 'optional - group description',
             parent_id: 'optional - parent_id group id',
             delete_binary: 'optional - delete binary after analysis C|Y|N (Default: C== company default)',
-            binary_cleanup_age: 'optional - after how long the binary will be deleted in seconds (Default: 604_800 / 1 week)',
-            product_cleanup_age: 'optional - after how long the product will be deleted in seconds (Default: 604_800 / 1 week)',
+            binary_cleanup_age: 'optional - after how long the binary will be deleted in seconds (Default: 2_592_000 / 30 days)',
+            product_cleanup_age: 'optional - after how long the product will be deleted in seconds (Default: 2_592_000 / 30 days)',
             file_download_enabled: 'optional - allow download of uploaded binaries from group (Default: false),
             low_risk_tolerance: 'optional - low risk tolerance nil|true|false (Default: nil == company default)',
             include_historical_vulns: 'optional - include historical vulns nil|true|false (Default: nil == company default)',

data/lib/pwn/version.rb

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

metadata

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