pwn 0.4.450 → 0.4.453

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eee3dea3c45f5dd6d8a5a35b0eecd3cff9af2d8862756f3d84d534d92c046ad
-  data.tar.gz: 0dc08f5e32c759bb4fdf4ace0dc492097162dee99040271854e6a24fe794f864
+  metadata.gz: d64b12862bb3a18f0c36844a624e8e56811a7d2f6239ed14b6f0565c1022b0cf
+  data.tar.gz: 2a377a1f995b09e45a41c191fd62cfc36ee46beb4ca4cf0d59ee8de1a201fbea
 SHA512:
-  metadata.gz: 6842848656126e13c1220e88b0be446728e65b804e87dd4d05d4ea2656fbe35d0e441df0f9367cbc69efc2f6c4183a7eb3af63d77d5298d9fbb35b363e8894f9
-  data.tar.gz: 06af9c55f18c19ef21560a0bef9f9042371a4284528eb2f77a11bc9a99a6fcab4e904ee147c01eb4af2f8f11aa2f6bd7606e38edc74f8476d8adf9b0e739ca2d
+  metadata.gz: c1a0e45b48efe8801fa1d51d2fa023bec8e9a27aa28f84de6b1604a78e9b16cf14bbe8573dd4d7589a04f171fd84ec99feb67646c4e0ad2988715460ae09cec5
+  data.tar.gz: 0c74c65d52765c544ee0c79c2a89c7154f969e91799eba1363a2e04d94871b7b5bd13ab27443f7fc0135011b11b72ddcf8ed147bc8cc644c5e06e976595a05f2

data/README.md

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

data/bin/{pwn_nessus_cloud_create_scan → pwn_nessus_cloud_scan_crud}

@@ -32,7 +32,7 @@ OptionParser.new do |options|
   end
 
   options.on('-tVALUE', '--scan-template=VALUE', '<Optional - Canned Scan Template to Use for Scan Creation (Defaults to "Basic Network Scan">') do |t|
-    opts[:scan_template] = t
+    opts[:scan_template_name] = t
   end
 
   options.on('-pPOLICY', '--policy-name=POLICY', '<Optional - Policy to Use to Create the Scan>') do |p|
@@ -116,8 +116,8 @@ begin
   # Optional Arguments
   scan_desc = opts[:scan_desc]
 
-  scan_template = opts[:scan_template]
-  scan_template ||= 'Basic Network Scan'
+  scan_template_name = opts[:scan_template_name]
+  scan_template_name ||= 'Basic Network Scan'
 
   policy_name = opts[:policy_name]
   policy_name ||= ''
@@ -204,17 +204,18 @@ begin
     secret_key: secret_key
   )
 
-  # Requirements to create a scan:
+  # Requirements to update / create a scan:
   # Part 1: Populate uuid
   # Part 2: Populate settings object from options passed to driver
   # Part 3: Populate credentials object from YAML config (optional)
   # Part 4: Populate plugins object from YAML config (optional)
+  # Part 5: Update Scan if it exists, or create it.
 
   # Part 1: Populate uuid
   # TODO: add --list-canned-scan-templates option
   scan_template = PWN::Plugins::NessusCloud.get_canned_scan_templates(
     nessus_obj: nessus_obj,
-    name: scan_template
+    name: scan_template_name
   )
   scan_template_uuid = scan_template[:uuid]
   puts scan_template_uuid
@@ -275,15 +276,17 @@ begin
         nessus_obj: nessus_obj,
         name: tag_name
       )
+      tag_uuid = tag[:uuid] if tag.any?
+      tag_uuids_arr.push(tag_uuid) if tag.any?
       next if tag.any?
 
-      tag_uuid = tag[:uuid]
-      tag_uuids_arr.push(tag_uuid)
-      PWN::Plugins::NessusCloud.create_tag(
+      new_tag = PWN::Plugins::NessusCloud.create_tag(
         nessus_obj: nessus_obj,
         category: tag_category_name,
         value: tag_name
       )
+      tag_uuid = new_tag[:uuid]
+      tag_uuids_arr.push(tag_uuid)
     end
 
     settings[:tag_targets] = tag_uuids_arr
@@ -305,15 +308,34 @@ begin
   # Part 4: Populate plugins object from YAML config (optional)
   plugins = yaml[:plugins] if yaml[:plugins]
 
-  create_scan_resp = PWN::Plugins::NessusCloud.create_scan(
+  # Part 5: Update Scan if it exists, or create it.
+  scan = PWN::Plugins::NessusCloud.get_scans(
     nessus_obj: nessus_obj,
-    scan_template_uuid: scan_template_uuid,
-    settings: settings,
-    credentials: credentials,
-    plugins: plugins
+    name: scan_name
   )
-
-  puts create_scan_resp.inspect
+  if scan.any?
+    scan_uuid = scan[:uuid]
+    update_scan_resp = PWN::Plugins::NessusCloud.update_scan(
+      nessus_obj: nessus_obj,
+      scan_uuid: scan_uuid,
+      scan_template_uuid: scan_template_uuid,
+      settings: settings,
+      credentials: credentials,
+      plugins: plugins
+    )
+
+    puts update_scan_resp.inspect
+  else
+    create_scan_resp = PWN::Plugins::NessusCloud.create_scan(
+      nessus_obj: nessus_obj,
+      scan_template_uuid: scan_template_uuid,
+      settings: settings,
+      credentials: credentials,
+      plugins: plugins
+    )
+
+    puts create_scan_resp.inspect
+  end
 rescue Interrupt
   puts 'CTRL+C detected...goodbye.'
 rescue StandardError => e

data/bin/pwn_nessus_cloud_vulnscan

@@ -58,11 +58,11 @@ begin
     nessus_obj: nessus_obj,
     name: scan_name
   )
-  scan_id = scan[:id]
+  scan_uuid = scan[:uuid]
 
   PWN::Plugins::NessusCloud.launch_scan(
     nessus_obj: nessus_obj,
-    scan_id: scan_id
+    scan_uuid: scan_uuid
   )
 
   scan_status = 'initializing'
@@ -73,7 +73,7 @@ begin
 
     scan_status_resp = PWN::Plugins::NessusCloud.get_scan_status(
       nessus_obj: nessus_obj,
-      scan_id: scan_id
+      scan_uuid: scan_uuid
     )
 
     scan_status = scan_status_resp[:status]
@@ -87,7 +87,7 @@ begin
   print "Exporting results to #{path_to_export}..."
   PWN::Plugins::NessusCloud.export_scan_results(
     nessus_obj: nessus_obj,
-    scan_id: scan_id,
+    scan_uuid: scan_uuid,
     path_to_export: path_to_export,
     format: format
   )

data/lib/pwn/plugins/nessus_cloud.rb

@@ -46,6 +46,19 @@ module PWN
             verify_ssl: false
           )
 
+        when :put
+          response = rest_client.execute(
+            method: :put,
+            url: "#{base_nessus_cloud_api_uri}/#{rest_call}",
+            headers: {
+              x_apikeys: "accessKey=#{access_key}; secretKey=#{secret_key}",
+              accept: 'application/json',
+              content_type: 'application/json; charset=UTF-8'
+            },
+            payload: http_body,
+            verify_ssl: false
+          )
+
         when :post
           response = rest_client.execute(
             method: :post,
@@ -442,20 +455,57 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # PWN::Plugins::NessusCloud.update_scan(
+      #   nessus_obj: 'required - nessus_obj returned from #login method',
+      #   scan_uuid: 'required - the scan UUID to update.  Run #get_scans for a list of UUIDs',
+      #   scan_template_uuid: 'required - the UUID for the Tenable-provided scan template to use.  Run #get_canned_scan_templates for a list of UUIDs',
+      #   settings: 'required - settings object as defined by https://developer.tenable.com/reference/scans-create',
+      #   credentials: 'required - credentials object as defined by https://developer.tenable.com/reference/scans-create',
+      #   plugins: 'optional - plugins object as defined by https://developer.tenable.com/reference/scans-create (Defaults to {})'
+      # )
+
+      public_class_method def self.update_scan(opts = {})
+        nessus_obj = opts[:nessus_obj]
+        scan_uuid = opts[:scan_uuid]
+        scan_template_uuid = opts[:scan_template_uuid]
+        settings = opts[:settings]
+        credentials = opts[:credentials]
+        plugins = opts[:plugins]
+
+        http_body = {
+          uuid: scan_template_uuid,
+          settings: settings,
+          credentials: credentials,
+          plugins: plugins
+        }.to_json
+
+        update_scan_resp = nessus_cloud_rest_call(
+          http_method: :put,
+          nessus_obj: nessus_obj,
+          rest_call: "scans/#{scan_uuid}",
+          http_body: http_body
+        ).body
+
+        JSON.parse(update_scan_resp, symbolize_names: true)
+      rescue StandardError, SystemExit, Interrupt => e
+        raise e
+      end
+
       # Supported Method Parameters::
       # PWN::Plugins::NessusCloud.launch_scan(
       #   nessus_obj: 'required - nessus_obj returned from #login method',
-      #   scan_id: 'required - scan id to launch'
+      #   scan_uuid: 'required - scan uuid to launch'
       # )
 
       public_class_method def self.launch_scan(opts = {})
         nessus_obj = opts[:nessus_obj]
-        scan_id = opts[:scan_id]
+        scan_uuid = opts[:scan_uuid]
 
         launch_scan_resp = nessus_cloud_rest_call(
           http_method: :post,
           nessus_obj: nessus_obj,
-          rest_call: "scans/#{scan_id}/launch"
+          rest_call: "scans/#{scan_uuid}/launch"
         ).body
 
         JSON.parse(launch_scan_resp, symbolize_names: true)
@@ -466,16 +516,16 @@ module PWN
       # Supported Method Parameters::
       # PWN::Plugins::NessusCloud.get_scan_status(
       #   nessus_obj: 'required - nessus_obj returned from #login method',
-      #   scan_id: 'required - scan id to retrieve status'
+      #   scan_uuid: 'required - scan uuid to retrieve status'
       # )
 
       public_class_method def self.get_scan_status(opts = {})
         nessus_obj = opts[:nessus_obj]
-        scan_id = opts[:scan_id]
+        scan_uuid = opts[:scan_uuid]
 
         scan_status_resp = nessus_cloud_rest_call(
           nessus_obj: nessus_obj,
-          rest_call: "scans/#{scan_id}/latest-status"
+          rest_call: "scans/#{scan_uuid}/latest-status"
         ).body
 
         JSON.parse(scan_status_resp, symbolize_names: true)
@@ -518,16 +568,16 @@ module PWN
       # Supported Method Parameters::
       # PWN::Plugins::NessusCloud.get_scan_history(
       #   nessus_obj: 'required - nessus_obj returned from #login method'
-      #   scan_id: 'required - scan id to launch'
+      #   scan_uuid: 'required - scan uuid to launch'
       # )
 
       public_class_method def self.get_scan_history(opts = {})
         nessus_obj = opts[:nessus_obj]
-        scan_id = opts[:scan_id]
+        scan_uuid = opts[:scan_uuid]
 
         scan_hist_resp = nessus_cloud_rest_call(
           nessus_obj: nessus_obj,
-          rest_call: "scans/#{scan_id}/history"
+          rest_call: "scans/#{scan_uuid}/history"
         ).body
 
         JSON.parse(scan_hist_resp, symbolize_names: true)
@@ -538,7 +588,7 @@ module PWN
       # Supported Method Parameters::
       # PWN::Plugins::NessusCloud.export_scan_results(
       #   nessus_obj: 'required - nessus_obj returned from #login method',
-      #   scan_id: 'required - scan id to export',
+      #   scan_uuid: 'required - scan uuid to export',
       #   path_to_export: 'required - filename to export results',
       #   history_id: 'optional - defaults to last scan',
       #   format: 'optional - :csv|:db|:html|:nessus|:pdf (defaults to :csv')
@@ -546,14 +596,14 @@ module PWN
 
       public_class_method def self.export_scan_results(opts = {})
         nessus_obj = opts[:nessus_obj]
-        scan_id = opts[:scan_id]
+        scan_uuid = opts[:scan_uuid]
         path_to_export = opts[:path_to_export]
         if opts[:history_id]
           history_id = opts[:history_id]
         else
           scan_history_resp = get_scan_history(
             nessus_obj: nessus_obj,
-            scan_id: scan_id
+            scan_uuid: scan_uuid
           )
 
           if scan_history_resp[:history].empty?
@@ -568,7 +618,7 @@ module PWN
         format = opts[:format].to_s.to_sym if opts[:format]
 
         http_body = {
-          scan_id: scan_id,
+          scan_uuid: scan_uuid,
           history_id: history_id,
           format: format
         }.to_json
@@ -576,7 +626,7 @@ module PWN
         export_scan_resp = nessus_cloud_rest_call(
           http_method: :post,
           nessus_obj: nessus_obj,
-          rest_call: "scans/#{scan_id}/export",
+          rest_call: "scans/#{scan_uuid}/export",
           http_body: http_body
         ).body
 
@@ -587,7 +637,7 @@ module PWN
 
         download_export_resp = nessus_cloud_rest_call(
           nessus_obj: nessus_obj,
-          rest_call: "scans/#{scan_id}/export/#{file_id}/download"
+          rest_call: "scans/#{scan_uuid}/export/#{file_id}/download"
         ).body
 
         File.open(path_to_export, 'wb') do |f|
@@ -660,14 +710,31 @@ module PWN
             nessus_obj: 'required - nessus_obj returned from #login method'
           )
 
+          #{self}.create_scan(
+            nessus_obj: 'required - nessus_obj returned from #login method',
+            scan_template_uuid: 'required - the UUID for the Tenable-provided scan template to use.  Run #get_canned_scan_templates for a list of UUIDs',
+            settings: 'required - settings object as defined by https://developer.tenable.com/reference/scans-create',
+            credentials: 'required - credentials object as defined by https://developer.tenable.com/reference/scans-create',
+            plugins: 'optional - plugins object as defined by https://developer.tenable.com/reference/scans-create (Defaults to {})'
+          )
+
+          #{self}.update_scan(
+            nessus_obj: 'required - nessus_obj returned from #login method',
+            scan_uuid: 'required - the scan UUID to update.  Run #get_scans for a list of UUIDs',
+            scan_template_uuid: 'required - the UUID for the Tenable-provided scan template to use.  Run #get_canned_scan_templates for a list of UUIDs',
+            settings: 'required - settings object as defined by https://developer.tenable.com/reference/scans-create',
+            credentials: 'required - credentials object as defined by https://developer.tenable.com/reference/scans-create',
+            plugins: 'optional - plugins object as defined by https://developer.tenable.com/reference/scans-create (Defaults to {})'
+          )
+
           #{self}.launch_scan(
             nessus_obj: 'required - nessus_obj returned from #login method',
-            scan_id: 'required - scan id to launch'
+            scan_uuid: 'required - scan uuid to launch'
           )
 
           #{self}.get_scan_status(
             nessus_obj: 'required - nessus_obj returned from #login method',
-            scan_id: 'required - scan id to retrieve status'
+            scan_uuid: 'required - scan uuid to retrieve status'
           )
 
           #{self}.create_tag(
@@ -679,12 +746,12 @@ module PWN
 
           #{self}.get_scan_history(
             nessus_obj: 'required - nessus_obj returned from #login method'
-            scan_id: 'required - scan id to launch'
+            scan_uuid: 'required - scan uuid to launch'
           )
 
           #{self}.export_scan_results(
             nessus_obj: 'required - nessus_obj returned from #login method',
-            scan_id: 'required - scan id to export',
+            scan_uuid: 'required - scan uuid to export',
             path_to_export: 'required - filename to export results',
             history_id: 'optional - defaults to last scan',
             format: 'optional - :csv|:db|:html|:nessus|:pdf (defaults to :csv')

data/lib/pwn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.450
+  version: 0.4.453
 platform: ruby
 authors:
 - 0day Inc.
@@ -1007,7 +1007,7 @@ executables:
 - pwn_jenkins_useradd
 - pwn_mail_agent
 - pwn_msf_postgres_login
-- pwn_nessus_cloud_create_scan
+- pwn_nessus_cloud_scan_crud
 - pwn_nessus_cloud_vulnscan
 - pwn_nexpose
 - pwn_openvas_vulnscan
@@ -1066,7 +1066,7 @@ files:
 - bin/pwn_jenkins_useradd
 - bin/pwn_mail_agent
 - bin/pwn_msf_postgres_login
-- bin/pwn_nessus_cloud_create_scan
+- bin/pwn_nessus_cloud_scan_crud
 - bin/pwn_nessus_cloud_vulnscan
 - bin/pwn_nexpose
 - bin/pwn_openvas_vulnscan