Correct private message format, update tests

Author: jhart-r7

lib/rex/proto/ntp/modes.rb

@@ -66,19 +66,31 @@ class NTPPrivate < BitStruct
     #  0                   1                   2                   3
     #  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    # |R M| VN  |   7 |A|                   Sequence                  |
+    # |R M| VN  |   7 |A|  Sequence   | Implementation| Req code      |
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    # | Implementation| request code  |
-    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    unsigned :response, 1,  default: 0
-    unsigned :more, 1,  default: 0
+    # |  err  | Number of data items  |  MBZ   |   Size of data item  |
+    # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    unsigned :response, 1, default: 0
+    unsigned :more, 1, default: 0
     unsigned :version, 3,  default: 0
     unsigned :mode, 3,  default: 7
     unsigned :auth, 1, default: 0
     unsigned :sequence, 7, default: 0
     unsigned :implementation, 8, default: 0
     unsigned :request_code, 8, default: 0
+    unsigned :error, 4, default: 0
+    unsigned :record_count, 12, default: 0
+    unsigned :mbz, 4, default: 0
+    unsigned :record_size, 12, default: 0
     rest :payload
+
+    def records
+      records = []
+      1.upto(record_count) do |record_num|
+        records << payload[record_size*(record_num-1), record_size]
+      end
+      records
+    end
   end
 
   def self.ntp_control(version, operation, payload = nil)

spec/lib/rex/proto/ntp/modes_spec.rb

@@ -27,7 +27,7 @@
       @control_raw.should == @control.to_s
     end
 
-    it 'Parses private NTP messages correctly' do
+    it 'Parses control NTP messages correctly' do
       parsed_raw = Rex::Proto::NTP::NTPControl.new(@control_raw)
       @control.should == parsed_raw
     end
@@ -50,15 +50,15 @@
       @generic_raw.should == @generic.to_s
     end
 
-    it 'Parses private NTP messages correctly' do
+    it 'Parses generic NTP messages correctly' do
       parsed_raw = Rex::Proto::NTP::NTPGeneric.new(@generic_raw)
       @generic.should == parsed_raw
     end
   end
 
   describe Rex::Proto::NTP::NTPPrivate do
     before do
-      @private_raw = "\x1f\x5a\x01\x99" + @payload
+      @private_raw = "\x1f\x5a\x01\x99\x00\x00\x00\x00" + @payload
       @private = Rex::Proto::NTP::NTPPrivate.new
       @private.response = 0
       @private.more = 0