pwn 0.4.438 → 0.4.443

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33588cb757610a97b50a963139394cd378b6dfed85a0379a22b694d567956814
-  data.tar.gz: 28bf4ed7c3e2c043873d93c6fc1e35f213a02c2a862f7fd83d7747bacedf2dd0
+  metadata.gz: 922671309b203e0f0e7f03e6dff9f67fb6e133cd8713d0e513365e07c134d9e4
+  data.tar.gz: 32cb95070b1d500dbd3338aafdada9e43e024d24784616ff2f8e8d63f148e63f
 SHA512:
-  metadata.gz: 9dbed712b1a371adeb258d11ac40609391ed398efd9e3a0fef2a7f211b478fe51b88cf2fc7fa18d474c07a39f96fc924a7a39bac31443491c40683251b96f1d9
-  data.tar.gz: 3c96781e09e1d72cd9c539c8b0a1adb20c495fcb290d4f9aa580e12ad780f873090722bd93d5c35197e851287d5fb86b2a304f4ce4aba4c9987e884bfb16e319
+  metadata.gz: 89bf92b8d1d73c388186e97b0a5c3ae2da016f013dc5f67d1438058677b15386a00c2217b12deb9f1ed37a03f11ec7bca8b13f4c7f13c49689ab4ffff77c1728
+  data.tar.gz: ea852ef1ba8100112cf51c8292f970b78e5ee759bf4cb166a5e134f1ebe28aa192f68c8be0ad1bb599e17960146bd7fc471487d66cc68cb162b37398cc8218a4

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

data/bin/pwn_nessus_cloud_create_scan

@@ -55,19 +55,27 @@ OptionParser.new do |options|
     opts[:launch] = l
   end
 
-  options.on('-wTIMEWINDOW', '--scan-time-window=TIMEWINDOW', '<Optional - Scan Time Window in Minutes - (Defaults to 0)>') do |t|
+  options.on('-wTIMEWINDOW', '--scan-time-window=TIMEWINDOW', '<Optional - Scan Time Window in Minutes (Defaults to 0)>') do |t|
     opts[:scan_time_window] = t
   end
 
-  options.on('-STIME', '--start-time=TIME', '<Optional - For One-Time Scans, the Starting Time and Date for the Scan - (Defaults to Time.now.strftime("%Y%m%dT%H%M%S")>') do |t|
+  options.on('-STIME', '--start-time=TIME', '<Optional - For One-Time Scans, the Starting Time and Date for the Scan (Defaults to Time.now.strftime("%Y%m%dT%H%M%S")>') do |t|
     opts[:starttime] = t
   end
 
-  options.on('-rRRULES', '--rrules=RRULES', '<Optional - For One-Time Scans, the Starting Time and Date for the Scan - (Defaults to "FREQ=ONETIME;INTERVAL=0;BYDAY=null")>') do |r|
+  options.on('-rRRULES', '--rrules=RRULES', '<Optional - For One-Time Scans, the Starting Time and Date for the Scan (Defaults to "FREQ=ONETIME;INTERVAL=0;BYDAY=null")>') do |r|
     opts[:rrules] = r
   end
 
-  options.on('-zTIMEZONE', '--timezone=TIMEZONE', '<Optional - Timezone of the scheduled start time for the scan - (Defaults to "UTC")>') do |t|
+  options.on('-xTAGS', '--tag-targets=TAGS', '<Optional - Comma-delimited list of tags to add to targets in scan>') do |x|
+    opts[:tag_targets] = x
+  end
+
+  options.on('-yCATEGORY', '--tag-category-name=CATEGORY', '<Optional - Tag Category Name to Associate with --tag-targets flag>') do |y|
+    opts[:tag_category_name] = y
+  end
+
+  options.on('-zTIMEZONE', '--timezone=TIMEZONE', '<Optional - Timezone of the scheduled start time for the scan (Defaults to "UTC")>') do |t|
     opts[:timezone] = t
   end
 
@@ -148,6 +156,9 @@ begin
   tag_targets_arr = []
   tag_targets_arr = tag_targets.split(',') if tag_targets
 
+  tag_category_name = opts[:tag_category_name]
+  raise 'ERROR: --tag-category-name Required as --tag-targets is Populated' if tag_targets && !tag_category_name
+
   agent_group_name = opts[:agent_group_name]
   agent_group_id_arr = []
 
@@ -252,7 +263,25 @@ begin
 
   settings[:file_targets] = file_targets if file_targets
 
-  settings[:tag_targets] = tag_targets_arr if tag_targets_arr.any?
+  if tag_targets_arr.any?
+    tag_targets_arr.each do |tag_name|
+      # Lookup tag and create if does not exist
+      tag = PWN::Plugins::NessusCloud.get_tag_values(
+        nessus_obj: nessus_obj,
+        name: tag_name
+      )
+
+      next if tag.any?
+
+      PWN::Plugins::NessusCloud.create_tag(
+        nessus_obj: nessus_obj,
+        category: tag_category_name,
+        value: tag_name
+      )
+    end
+
+    settings[:tag_targets] = tag_targets_arr
+  end
 
   settings[:agent_group_id] = agent_group_id_arr if agent_group_id_arr.any?
 

data/lib/pwn/plugins/nessus_cloud.rb

@@ -275,7 +275,7 @@ module PWN
       # Supported Method Parameters::
       # PWN::Plugins::NessusCloud.get_target_groups(
       #   nessus_obj: 'required - nessus_obj returned from #login method',
-      #   name: 'optional - name of timezone'
+      #   name: 'optional - name of target group'
       # )
       # )
 
@@ -288,17 +288,48 @@ module PWN
           rest_call: 'target-groups'
         ).body
 
-        timezones = JSON.parse(target_groups_resp, symbolize_names: true)
+        target_groups = JSON.parse(target_groups_resp, symbolize_names: true)
 
         if name
-          selected_timezone = timezones[:networks].select do |tz|
-            tz[:name] == name
+          selected_target_group = target_groups[:target_groups].select do |tg|
+            tg[:name] == name
           end
-          timezones = selected_timezone.first if selected_timezone.any?
-          timezones ||= {}
+          target_groups = selected_target_group.first if selected_target_group.any?
+          target_groups ||= {}
         end
 
-        timezones
+        target_groups
+      rescue StandardError, SystemExit, Interrupt => e
+        raise e
+      end
+
+      # Supported Method Parameters::
+      # PWN::Plugins::NessusCloud.get_tag_values(
+      #   nessus_obj: 'required - nessus_obj returned from #login method',
+      #   name: 'optional - name of tag value'
+      # )
+      # )
+
+      public_class_method def self.get_tag_values(opts = {})
+        nessus_obj = opts[:nessus_obj]
+        name = opts[:name]
+
+        tag_values_resp = nessus_cloud_rest_call(
+          nessus_obj: nessus_obj,
+          rest_call: 'tags/values'
+        ).body
+
+        tag_values = JSON.parse(tag_values_resp, symbolize_names: true)
+
+        if name
+          selected_tag = tag_values[:tags].select do |tag|
+            tag[:name] == name
+          end
+          tag_values = selected_tag.first if selected_tag.any?
+          tag_values ||= {}
+        end
+
+        tag_values
       rescue StandardError, SystemExit, Interrupt => e
         raise e
       end
@@ -347,6 +378,35 @@ module PWN
         raise e
       end
 
+      # Supported Method Parameters::
+      # PWN::Plugins::NessusCloud.get_scans(
+      #   nessus_obj: 'required - nessus_obj returned from #login method'
+      # )
+
+      public_class_method def self.get_scans(opts = {})
+        nessus_obj = opts[:nessus_obj]
+        name = opts[:name]
+
+        scans_resp = nessus_cloud_rest_call(
+          nessus_obj: nessus_obj,
+          rest_call: 'scans'
+        ).body
+
+        scans = JSON.parse(scans_resp, symbolize_names: true)
+
+        if name
+          selected_scan = scans[:scans].select do |s|
+            s[:name] == name
+          end
+          scans = selected_scan.first if selected_scan.any?
+          scans ||= {}
+        end
+
+        scans
+      rescue StandardError, SystemExit, Interrupt => e
+        raise e
+      end
+
       # Supported Method Parameters::
       # PWN::Plugins::NessusCloud.create_scan(
       #   nessus_obj: 'required - nessus_obj returned from #login method',
@@ -382,35 +442,6 @@ module PWN
         raise e
       end
 
-      # Supported Method Parameters::
-      # PWN::Plugins::NessusCloud.get_scans(
-      #   nessus_obj: 'required - nessus_obj returned from #login method'
-      # )
-
-      public_class_method def self.get_scans(opts = {})
-        nessus_obj = opts[:nessus_obj]
-        name = opts[:name]
-
-        scans_resp = nessus_cloud_rest_call(
-          nessus_obj: nessus_obj,
-          rest_call: 'scans'
-        ).body
-
-        scans = JSON.parse(scans_resp, symbolize_names: true)
-
-        if name
-          selected_scan = scans[:scans].select do |s|
-            s[:name] == name
-          end
-          scans = selected_scan.first if selected_scan.any?
-          scans ||= {}
-        end
-
-        scans
-      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',
@@ -453,14 +484,14 @@ module PWN
       end
 
       # Supported Method Parameters::
-      # PWN::Plugins::NessusCloud.tag(
+      # PWN::Plugins::NessusCloud.create_tag(
       #   nessus_obj: 'required - nessus_obj returned from #login method',
       #   category: 'required - category name to create or use',
       #   value: 'required - value name to create or use',
       #   desc: 'optional - _value_ description'
       # )
 
-      public_class_method def self.tag(opts = {})
+      public_class_method def self.create_tag(opts = {})
         nessus_obj = opts[:nessus_obj]
         category = opts[:category]
         value = opts[:value]
@@ -468,7 +499,8 @@ module PWN
 
         http_body = {
           category_name: category,
-          value: value
+          value: value,
+          description: desc
         }.to_json
 
         tag_resp = nessus_cloud_rest_call(
@@ -614,6 +646,16 @@ module PWN
             name: 'optional - name of timezone'
           )
 
+          #{self}.get_target_groups(
+            nessus_obj: 'required - nessus_obj returned from #login method',
+            name: 'optional - name of target group'
+          )
+
+          #{self}.get_tag_values(
+            nessus_obj: 'required - nessus_obj returned from #login method',
+            name: 'optional - name of tag value'
+          )
+
           #{self}.get_scans(
             nessus_obj: 'required - nessus_obj returned from #login method'
           )

data/lib/pwn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.4.438
+  version: 0.4.443
 platform: ruby
 authors:
 - 0day Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport