peer review

Author: h00die

documentation/modules/post/multi/recon/persistence_suggester.md

@@ -34,6 +34,7 @@ This option lets us toggle whether or not Meterpreter commands that are missing
 ### Colors
 
 Similar to the option used for `HttpTrace`. This lets us change the colors used to show valid, invalid and ignored options or incompatibilities. Unsetting this option results in no colored output.
+Defaults to `grn/red/blu`. Additional options are [here](https://github.com/rapid7/rex-text/blob/a72151d409cd812978f63ad0c330efbc8f44b977/lib/rex/text/color.rb#L13)
 
 ## Scenarios
 

modules/post/multi/recon/local_exploit_suggester.rb

@@ -73,9 +73,10 @@ def is_session_type?(mod)
   end
 
   def is_module_platform?(mod)
-    platform_obj = Msf::Module::Platform.find_platform session.platform
     return false if mod.target.nil?
 
+    platform_obj = Msf::Module::Platform.find_platform session.platform
+
     module_platforms = mod.target.platform ? mod.target.platform.platforms : mod.platform.platforms
     module_platforms.include? platform_obj
   rescue ArgumentError => e
@@ -260,7 +261,7 @@ def run
     report_note(
       host: session.session_host,
       type: 'local.suggested_exploits',
-      data: { :suggested_exploits => report_data }
+      data: { suggested_exploits: report_data }
     )
   end
 

modules/post/multi/recon/persistence_suggester.rb

@@ -45,11 +45,25 @@ def initialize(info = {})
         Msf::OptBool.new('ValidateArch', [true, 'Validate architecture', false]),
         Msf::OptBool.new('ValidatePlatform', [true, 'Validate platform', true]),
         Msf::OptBool.new('ValidateMeterpreterCommands', [true, 'Validate Meterpreter commands', false]),
+        # https://github.com/rapid7/rex-text/blob/a72151d409cd812978f63ad0c330efbc8f44b977/lib/rex/text/color.rb#L13
         Msf::OptString.new('Colors', [false, 'Valid, Invalid and Ignored colors for module checks (unset to disable)', 'grn/red/blu'])
       ]
     )
   end
 
+  def valid_colors?(color_str = datastore['Colors'])
+    tokens = color_str.split('/')
+    tokens.each do |tok|
+      print_warning "#{tok} is unlikely to have any functionality for printing colors." if tok == 'clr'
+
+      unless Rex::Text::Color::SUPPORTED_FORMAT_CODES.include?("%#{tok}")
+        print_error "#{tok} is NOT valid color. Please see https://github.com/rapid7/rex-text/blob/a72151d409cd812978f63ad0c330efbc8f44b977/lib/rex/text/color.rb#L13 for valid color options"
+        return false
+      end
+    end
+    true
+  end
+
   def all_platforms
     Msf::Module::Platform.subclasses.collect { |c| c.realname.downcase }
   end
@@ -78,9 +92,10 @@ def is_session_type?(mod)
   end
 
   def is_module_platform?(mod)
-    platform_obj = Msf::Module::Platform.find_platform session.platform
     return false if mod.target.nil?
 
+    platform_obj = Msf::Module::Platform.find_platform session.platform
+
     module_platforms = mod.target.platform ? mod.target.platform.platforms : mod.platform.platforms
     module_platforms.include? platform_obj
   rescue ArgumentError => e
@@ -145,7 +160,11 @@ def setup
     print_status "Collecting persistence modules for #{session.session_type}..."
 
     setup_validation_options
-    setup_color_options
+    if valid_colors?
+      setup_color_options
+    else
+      fail_with(Failure::BadConfig, 'Colors options set incorrectly')
+    end
 
     # Collects persistence modules into an array
     @persistence_modules = []