Allow singular NTP version and mode 7 implementation testing

Author: jhart-r7

lib/msf/core/auxiliary/ntp.rb

@@ -25,8 +25,8 @@ def initialize(info = {})
 
     register_advanced_options(
       [
-        OptString.new('VERSIONS', [true, 'Try these NTP versions', '2,3']),
-        OptString.new('IMPLEMENTATIONS', [true, 'Try these NTP mode 7 implementations', '3,2'])
+        OptInt.new('VERSION', [true, 'Use this NTP version', 2]),
+        OptInt.new('IMPLEMENTATION', [true, 'Use this NTP mode 7 implementation', 3])
       ], self.class)
   end
 end

modules/auxiliary/scanner/ntp/ntp_peer_list_dos.rb

@@ -38,7 +38,7 @@ def scan_host(ip)
   # Called before the scan block
   def scanner_prescan(batch)
     @results = {}
-    @probe = Rex::Proto::NTP.ntp_private(2, 3, 0)
+    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 0)
   end
 
   # Called for each response packet

modules/auxiliary/scanner/ntp/ntp_peer_list_sum_dos.rb

@@ -44,7 +44,7 @@ def scanner_process(data, shost, sport)
   # Called before the scan block
   def scanner_prescan(batch)
     @results = {}
-    @probe = Rex::Proto::NTP.ntp_private(2, 3, 1)
+    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 1)
   end
 
   # Called after the scan block

modules/auxiliary/scanner/ntp/ntp_req_nonce_dos.rb

@@ -46,7 +46,7 @@ def scanner_process(data, shost, sport)
   def scanner_prescan(batch)
     @results = {}
     @probe = Rex::Proto::NTP::NTPControl.new
-    @probe.version = 2
+    @probe.version = datastore['VERSION']
     @probe.operation = 12
   end
 

modules/auxiliary/scanner/ntp/ntp_reslist_dos.rb

@@ -46,7 +46,7 @@ def scanner_process(data, shost, sport)
   # Called before the scan block
   def scanner_prescan(batch)
     @results = {}
-    @probe = Rex::Proto::NTP.ntp_private(2, 3, 16)
+    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 16)
   end
 
   # Called after the scan block

modules/auxiliary/scanner/ntp/ntp_unsettrap_dos.rb

@@ -45,7 +45,7 @@ def scanner_process(data, shost, sport)
   def scanner_prescan(batch)
     @results = {}
     @probe = Rex::Proto::NTP::NTPControl.new
-    @probe.version = 2
+    @probe.version = datastore['VERSION']
     @probe.operation = 31
   end