Land #18548, Refactor the ghostcat module to use the AJP definitions provided by Rex::Proto

Author: adfoster-r7

lib/rex/proto/apache_j_p.rb

@@ -33,23 +33,24 @@ def set(v)
     end
   end
 
-  class ApacheJPReqHeaderName < BinData::Primitive
-    COMMON_HEADERS = %w{ accept accept-charset accept-encoding accept-language authorization connection content-type content-length cookie cookie2 host pragma referer user-agent }
+  class ApacheJPHeaderName < BinData::Primitive
+    COMMON_HEADERS = []
+
     endian :big
 
     uint16  :len_or_code
     stringz :data, onlyif: -> { len_or_code < 0xa000 }
 
     def get
       if len_or_code >= 0xa000
-        COMMON_HEADERS[(len_or_code.to_i & 0xff) - 1]
+        self.class::COMMON_HEADERS[(len_or_code.to_i & 0xff) - 1]
       else
         self.data
       end
     end
 
     def set(v)
-      if (idx = COMMON_HEADERS.index(v))
+      if (idx = self.class::COMMON_HEADERS.index(v))
         self.len_or_code = 0xa000 | (idx + 1)
       else
         raise RuntimeError if v.length >= 0xa000
@@ -60,13 +61,28 @@ def set(v)
     end
   end
 
+  class ApacheJPReqHeaderName < ApacheJPHeaderName
+    COMMON_HEADERS = %w{ accept accept-charset accept-encoding accept-language authorization connection content-type content-length cookie cookie2 host pragma referer user-agent }
+  end
+
+  class ApacheJPResHeaderName < ApacheJPHeaderName
+    COMMON_HEADERS = %w{ Content-Type Content-Language Content-Length Date Last-Modified Location Set-Cookie Set-Cookie2 Servlet-Engine Status WWW-Authentication }
+  end
+
   class ApacheJPRequestHeader < BinData::Record
     endian :big
 
     apache_jp_req_header_name :header_name
     apache_jp_string          :header_value
   end
 
+  class ApacheJPResponseHeader < BinData::Record
+    endian :big
+
+    apache_jp_res_header_name :header_name
+    apache_jp_string          :header_value
+  end
+
   class ApacheJPRequestAttribute < BinData::Record
     CODE_CONTEXT = 1
     CODE_SERVLET_PATH = 2
@@ -83,6 +99,7 @@ class ApacheJPRequestAttribute < BinData::Record
     endian :big
 
     uint8            :code
+    apache_jp_string :attribute_name, onlyif: -> { code == CODE_REQ_ATTRIBUTE }
     apache_jp_string :attribute_value, onlyif: -> { code != CODE_TERMINATOR }
   end
 
@@ -108,10 +125,11 @@ class ApacheJPForwardRequest < BinData::Record
     HTTP_METHOD_CHECKOUT = 19
     HTTP_METHOD_UNCHECKOUT = 20
     HTTP_METHOD_SEARCH = 21
+    PREFIX_CODE = 2
 
     endian :big
 
-    uint8             :prefix_code, value: 2
+    uint8             :prefix_code, value: PREFIX_CODE
     uint8             :http_method
     apache_jp_string  :protocol, initial_value: 'HTTP/1.1'
     apache_jp_string  :req_uri
@@ -124,4 +142,44 @@ class ApacheJPForwardRequest < BinData::Record
     array             :headers, type: :apache_jp_request_header, initial_length: :num_headers
     array             :attributes, type: :apache_jp_request_attribute, read_until: -> { element.code == ApacheJPRequestAttribute::TERMINATOR }
   end
+
+  class ApacheJPSendBodyChunk < BinData::Record
+    PREFIX_CODE = 3
+
+    endian :big
+
+    uint8   :prefix_code, value: PREFIX_CODE
+    uint16  :body_chunk_length, initial_value: -> { body_chunk.length }
+    string  :body_chunk, read_length: :body_chunk_length
+  end
+
+  class ApacheJPSendHeaders < BinData::Record
+    PREFIX_CODE = 4
+
+    endian :big
+
+    uint8             :prefix_code, value: PREFIX_CODE
+    uint16            :http_status_code
+    apache_jp_string  :http_status_msg
+    uint16            :num_headers, initial_value: -> { header.length }
+    array             :headers, type: :apache_jp_response_header, initial_length: :num_headers
+  end
+
+  class ApacheJPEndResponse < BinData::Record
+    PREFIX_CODE = 5
+
+    endian :big
+
+    uint8              :prefix_code, value: PREFIX_CODE
+    apache_jp_boolean  :reuse
+  end
+
+  class ApacheJPGetBodyChunk < BinData::Record
+    PREFIX_CODE = 6
+
+    endian :big
+
+    uint8   :prefix_code, value: PREFIX_CODE
+    uint16  :requested_length
+  end
 end