ruby_smb 2.0.11 → 3.0.1

data/lib/ruby_smb/dcerpc/bind.rb

@@ -2,51 +2,59 @@ module RubySMB
   module Dcerpc
     # The Bind PDU as defined in
     # [The bind PDU](http://pubs.opengroup.org/onlinepubs/9629399/chap12.htm#tagcjh_17_06_04_03)
-    class PContElemT < BinData::Record
+    class PContElemT < Ndr::NdrStruct
+      default_parameter byte_align: 4
       endian :little
 
-      uint16 :p_cont_id,     label: 'Context ID'
-      uint8 :n_transfer_syn, label: 'Number of transfer syntaxes', initial_value: 1
-      uint8 :reserved
+      ndr_uint16    :p_cont_id, label: 'Context ID'
+      ndr_uint8     :n_transfer_syn, label: 'Number of transfer syntaxes', initial_value: 1
+      ndr_uint8     :reserved
       p_syntax_id_t :abstract_syntax, label: 'Abstract syntax',
         uuid: ->      { endpoint::UUID },
         ver_major: -> { endpoint::VER_MAJOR },
         ver_minor: -> { endpoint::VER_MINOR }
-      array :transfer_syntaxes, label: 'Transfer syntax', type: :p_syntax_id_t,
+      array         :transfer_syntaxes, label: 'Transfer syntax', type: :p_syntax_id_t,
         initial_length: -> { n_transfer_syn },
         uuid: ->      { Ndr::UUID },
         ver_major: -> { Ndr::VER_MAJOR },
-        ver_minor: -> { Ndr::VER_MINOR }
+        ver_minor: -> { Ndr::VER_MINOR },
+        byte_align: 4
     end
 
-    class PContListT < BinData::Record
+    class PContListT < Ndr::NdrStruct
+      default_parameter byte_align: 4
       endian :little
 
-      uint8 :n_context_elem, label: 'Number of context elements', initial_value: -> { 1 }
-      uint8 :reserved
-      uint16 :reserved2
-      array :p_cont_elem, label: 'Presentation context elements', type: :p_cont_elem_t,
+      ndr_uint8  :n_context_elem, label: 'Number of context elements', initial_value: -> { 1 }
+      ndr_uint8  :reserved
+      ndr_uint16 :reserved2
+      array      :p_cont_elem, label: 'Presentation context elements', type: :p_cont_elem_t,
         initial_length: -> {n_context_elem},
-        endpoint: -> {endpoint}
+        endpoint: -> {endpoint},
+        byte_align: 4
     end
 
     class Bind < BinData::Record
-      endian :little
-
-      pdu_header :pdu_header,        label: 'PDU header'
+      PTYPE = PTypes::BIND
 
-      uint16 :max_xmit_frag,         label: 'max transmit frag size',    initial_value: RubySMB::Dcerpc::MAX_XMIT_FRAG
-      uint16 :max_recv_frag,         label: 'max receive  frag size',    initial_value: RubySMB::Dcerpc::MAX_RECV_FRAG
-      uint32 :assoc_group_id,        label: 'ncarnation of client-server assoc group'
+      endian :little
 
+      # PDU Header
+      pdu_header    :pdu_header, label: 'PDU header'
+      ndr_uint16    :max_xmit_frag, label: 'max transmit frag size', initial_value: RubySMB::Dcerpc::MAX_XMIT_FRAG
+      ndr_uint16    :max_recv_frag, label: 'max receive frag size', initial_value: RubySMB::Dcerpc::MAX_RECV_FRAG
+      ndr_uint32    :assoc_group_id, label: 'incarnation of client-server assoc group'
       p_cont_list_t :p_context_list, label: 'Presentation context list', endpoint: -> { endpoint }
-      string :auth_verifier,         label: 'Authentication verifier',
+
+      # Auth Verifier
+      sec_trailer   :sec_trailer, onlyif: -> { pdu_header.auth_length > 0 }
+      string        :auth_value,
         onlyif: -> { pdu_header.auth_length > 0 },
         read_length: -> { pdu_header.auth_length }
 
       def initialize_instance
         super
-        pdu_header.ptype = RubySMB::Dcerpc::PTypes::BIND
+        pdu_header.ptype = PTYPE
       end
     end
   end

data/lib/ruby_smb/dcerpc/bind_ack.rb

@@ -3,34 +3,39 @@ module RubySMB
     # The Bind ACK PDU as defined in
     # [The bind_ack PDU](http://pubs.opengroup.org/onlinepubs/9629399/chap12.htm#tagcjh_17_06_04_04)
 
-    class PResultT < BinData::Record
+    class PResultT < Ndr::NdrStruct
+      default_parameter byte_align: 4
       endian :little
 
-      uint16        :result,          label: 'Presentation context negotiation results'
-      uint16        :reason,          label: 'Rejection reason'
-      p_syntax_id_t :transfer_syntax, label: 'Presentation syntax ID',
-        uuid: ->      { Ndr::UUID },
+      ndr_uint16        :result,          label: 'Presentation context negotiation results'
+      ndr_uint16        :reason,          label: 'Rejection reason'
+      p_syntax_id_t     :transfer_syntax, label: 'Presentation syntax ID',
+        uuid:      -> { Ndr::UUID },
         ver_major: -> { Ndr::VER_MAJOR },
         ver_minor: -> { Ndr::VER_MINOR }
     end
 
-    class PResultListT < BinData::Record
+    class PResultListT < Ndr::NdrStruct
+      default_parameter byte_align: 4
       endian :little
 
-      uint8  :n_results, label: 'Number of results'
-      uint8  :reserved
-      uint16 :reserved2
-      array  :p_results, label: 'Results', type: :p_result_t, initial_length: -> { n_results }
+      ndr_uint8  :n_results, label: 'Number of results', initial_value: -> { p_results.size }
+      ndr_uint8  :reserved
+      ndr_uint16 :reserved2
+      array      :p_results, label: 'Results', type: :p_result_t, initial_length: -> { n_results }, byte_align: 4
     end
 
-    class PortAnyT < BinData::Record
+    class PortAnyT < Ndr::NdrStruct
+      default_parameter byte_align: 2
       endian :little
 
-      uint16  :str_length, label: 'Length', initial_value: -> { port_spec.to_binary_s.size }
-      stringz :port_spec,  label: 'Port string spec'
+      ndr_uint16  :str_length, label: 'Length', initial_value: -> { port_spec.to_binary_s.size }
+      stringz     :port_spec, label: 'Port string spec', byte_align: 2
     end
 
     class BindAck < BinData::Record
+      PTYPE = PTypes::BIND_ACK
+
       # Presentation context negotiation results
       ACCEPTANCE         = 0
       USER_REJECTION     = 1
@@ -44,27 +49,23 @@ module RubySMB
 
       endian :little
 
-      pdu_header :pdu_header,         label: 'PDU header'
-
-      uint16     :max_xmit_frag,      label: 'Max transmit frag size',  initial_value: RubySMB::Dcerpc::MAX_XMIT_FRAG
-      uint16     :max_recv_frag,      label: 'Max receive frag size',   initial_value: RubySMB::Dcerpc::MAX_RECV_FRAG
-      uint32     :assoc_group_id,     label: 'Association group ID'
-      port_any_t :sec_addr,           label: 'Secondary address'
-      string     :pad,                length: -> { pad_length }
-
+      # PDU Header
+      pdu_header      :pdu_header, label: 'PDU header'
+      ndr_uint16      :max_xmit_frag, label: 'Max transmit frag size', initial_value: RubySMB::Dcerpc::MAX_XMIT_FRAG
+      ndr_uint16      :max_recv_frag, label: 'Max receive frag size', initial_value: RubySMB::Dcerpc::MAX_RECV_FRAG
+      ndr_uint32      :assoc_group_id, label: 'Association group ID'
+      port_any_t      :sec_addr, label: 'Secondary address'
       p_result_list_t :p_result_list, label: 'Presentation context result list'
-      string :auth_verifier, label: 'Authentication verifier',
+
+      # Auth Verifier
+      sec_trailer     :sec_trailer, onlyif: -> { pdu_header.auth_length > 0 }
+      string          :auth_value,
         onlyif: -> { pdu_header.auth_length > 0 },
         read_length: -> { pdu_header.auth_length }
 
       def initialize_instance
         super
-        pdu_header.ptype = RubySMB::Dcerpc::PTypes::BIND_ACK
-      end
-
-      def pad_length
-        offset = (sec_addr.abs_offset + sec_addr.do_num_bytes) % 4
-        (4 - offset) % 4
+        pdu_header.ptype = PTYPE
       end
     end
   end