Land rapid7#5314, set snmp defaults for constrained values

Author: Brent Cook

lib/metasploit/framework/login_scanner/snmp.rb

@@ -11,7 +11,10 @@ module LoginScanner
       class SNMP
         include Metasploit::Framework::LoginScanner::Base
 
+        DEFAULT_TIMEOUT      = 2
         DEFAULT_PORT         = 161
+        DEFAULT_RETRIES      = 0
+        DEFAULT_VERSION      = 'all'
         LIKELY_PORTS         = [ 161, 162 ]
         LIKELY_SERVICE_NAMES = [ 'snmp' ]
         PRIVATE_TYPES        = [ :password ]
@@ -112,11 +115,13 @@ def has_write_access?(snmp_client, value)
 
         end
 
-        # Sets the connection timeout approrpiately for SNMP
+        # Sets the connection timeout appropriately for SNMP
         # if the user did not set it.
         def set_sane_defaults
-          self.connection_timeout = 2 if self.connection_timeout.nil?
+          self.connection_timeout = DEFAULT_TIMEOUT if self.connection_timeout.nil?
           self.port = DEFAULT_PORT if self.port.nil?
+          self.retries = DEFAULT_RETRIES if self.retries.nil?
+          self.version = DEFAULT_VERSION if self.version.nil?
         end
 
         # This method takes an snmp client and tests whether

spec/lib/metasploit/framework/login_scanner/snmp_spec.rb

@@ -37,8 +37,6 @@
       snmp_scanner.host = '127.0.0.1'
       snmp_scanner.port = 161
       snmp_scanner.connection_timeout = 1
-      snmp_scanner.retries = 0
-      snmp_scanner.version = 'all'
       snmp_scanner.stop_on_success = true
       snmp_scanner.cred_details = detail_group
     end