ruby_smb 3.0.5 → 3.1.1

data/lib/ruby_smb/smb1/packet/trans2/query_information_level.rb

@@ -0,0 +1,62 @@
+module RubySMB
+  module SMB1
+    module Packet
+      module Trans2
+        # SMB Query Information Levels as defined in
+        # [2.2.8.3 QUERY Information Levels](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/b9dcb99c-e810-4df8-ae29-cdf37e8c5a23)
+        # used in TRANS2_QUERY_PATH_INFORMATION and TRANS2_QUERY_FILE_INFORMATION
+        module QueryInformationLevel
+          # Constants defined in
+          # [2.2.2.3.3 QUERY Information Level Codes](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/794afe2e-7c11-4a8c-b909-0a397966f6a9)
+          # [dialect] description
+
+          # [LANMAN2.0] Query creation, access, and last write timestamps, size and file attributes.
+          SMB_INFO_STANDARD               = 0x0001 # 1
+
+          # [LANMAN2.0] Query the SMB_INFO_STANDARD data along with the size of the file's extended attributes (EAs).
+          SMB_INFO_QUERY_EA_SIZE          = 0x0002 # 2
+
+          # [LANMAN2.0] Query a file's specific EAs by attribute name.
+          SMB_INFO_QUERY_EAS_FROM_LIST    = 0x0003 # 3
+
+          # [LANMAN2.0] Query all of a file's EAs.
+          SMB_INFO_QUERY_ALL_EAS          = 0x0004 # 4
+
+          # [LANMAN2.0] Validate the syntax of the path provided in the request. Not supported for TRANS2_QUERY_FILE_INFORMATION.
+          SMB_INFO_IS_NAME_VALID          = 0x0006 # 6
+
+          # [NT LANMAN] Query 64-bit create, access, write, and change timestamps along with extended file attributes.
+          SMB_QUERY_FILE_BASIC_INFO       = 0x0101 # 257
+
+          # [NT LANMAN] Query size, number of links, if a delete is pending, and if the path is a directory.
+          SMB_QUERY_FILE_STANDARD_INFO    = 0x0102 # 258
+
+          # [NT LANMAN] Query the size of the file's EAs.
+          SMB_QUERY_FILE_EA_INFO          = 0x0103 # 259
+
+          # [NT LANMAN] Query the long file name in Unicode format.
+          SMB_QUERY_FILE_NAME_INFO        = 0x0104 # 260
+
+          # [NT LANMAN] Query the SMB_QUERY_FILE_BASIC_INFO, SMB_QUERY_FILE_STANDARD_INFO, SMB_QUERY_FILE_EA_INFO, and SMB_QUERY_FILE_NAME_INFO data as well as access flags, access mode, and alignment information in a single request.
+          SMB_QUERY_FILE_ALL_INFO         = 0x0107 # 263
+
+          # [NT LANMAN] Query the 8.3 file name.<22>
+          SMB_QUERY_FILE_ALT_NAME_INFO    = 0x0108 # 264
+
+          # [NT LANMAN] Query file stream information.
+          SMB_QUERY_FILE_STREAM_INFO      = 0x0109 # 265
+
+          # [NT LANMAN] Query file compression information.
+          SMB_QUERY_FILE_COMPRESSION_INFO = 0x010B # 267
+
+          def self.name(value)
+            constants.select { |c| c.upcase == c }.find { |c| const_get(c) == value }
+          end
+
+          require 'ruby_smb/smb1/packet/trans2/query_information_level/query_file_basic_info'
+          require 'ruby_smb/smb1/packet/trans2/query_information_level/query_file_standard_info'
+        end
+      end
+    end
+  end
+end

data/lib/ruby_smb/smb1/packet/trans2/query_path_information_request.rb

@@ -0,0 +1,65 @@
+module RubySMB
+  module SMB1
+    module Packet
+      module Trans2
+        # The Trans2 Parameter Block for this particular Subcommand
+        class QueryPathInformationRequestTrans2Parameters < BinData::Record
+          endian :little
+
+          uint16     :information_level, label: 'Information Level'
+          uint32     :reserved,          label: 'Reserved'
+          choice     :filename, copy_on_change: true, selection: -> { parent.parent.smb_header.flags2.unicode } do
+            stringz16 1, label: 'FileName'
+            stringz   0, label: 'FileName'
+          end
+
+
+          # Returns the length of the Trans2Parameters struct
+          # in number of bytes
+          def length
+            do_num_bytes
+          end
+        end
+
+        # The Trans2 Data Block for this particular Subcommand
+        class QueryPathInformationRequestTrans2Data < BinData::Record
+          smb_gea_list :extended_attribute_list, label: 'Get Extended Attribute List',
+            onlyif: -> { parent.trans2_parameters.information_level == FindInformationLevel::SMB_INFO_QUERY_EAS_FROM_LIST}
+
+          # Returns the length of the Trans2Data struct
+          # in number of bytes
+          def length
+            do_num_bytes
+          end
+        end
+
+        # The {RubySMB::SMB1::DataBlock} specific to this packet type.
+        class QueryPathInformationRequestDataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
+          uint8                                             :name,               label: 'Name', initial_value: 0x00
+          string                                            :pad1,               length: -> { pad1_length }
+          query_path_information_request_trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
+          string                                            :pad2,               length: -> { pad2_length }
+          query_path_information_request_trans2_data        :trans2_data,        label: 'Trans2 Data'
+        end
+
+        # A Trans2 QUERY_PATH_INFORMATION Request Packet as defined in
+        # [2.2.6.6.1](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/9b171bbf-c6d8-4c88-ac85-23c795cbb5d3)
+        class QueryPathInformationRequest < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
+          class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
+          end
+
+          smb_header                                 :smb_header
+          parameter_block                            :parameter_block
+          query_path_information_request_data_block  :data_block
+
+          def initialize_instance
+            super
+            parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_PATH_INFORMATION
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_smb/smb1/packet/trans2/query_path_information_response.rb

@@ -0,0 +1,59 @@
+module RubySMB
+  module SMB1
+    module Packet
+      module Trans2
+        # The Trans2 Parameter Block for this particular Subcommand
+        class QueryPathInformationResponseTrans2Parameters < BinData::Record
+          endian :little
+
+          uint16 :ea_error_offset, label: 'EA Error Offset'
+
+          # Returns the length of the Trans2Parameters struct
+          # in number of bytes
+          def length
+            do_num_bytes
+          end
+        end
+
+        # The Trans2 Data Block for this particular Subcommand
+        class QueryPathInformationResponseTrans2Data < BinData::Record
+          string :buffer, label: 'Results Buffer', read_length: :buffer_read_length
+
+          # Returns the length of the Trans2Data struct
+          # in number of bytes
+          def length
+            do_num_bytes
+          end
+        end
+
+        # The {RubySMB::SMB1::DataBlock} specific to this packet type.
+        class QueryPathInformationResponseDataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
+          uint8                                              :name,               label: 'Name', initial_value: 0x00
+          string                                             :pad1,               length: -> { pad1_length }
+          query_path_information_response_trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
+          string                                             :pad2,               length: -> { pad2_length }
+          query_path_information_response_trans2_data        :trans2_data,        label: 'Trans2 Data'
+        end
+
+        # A Trans2 QUERY_PATH_INFORMATION Response Packet as defined in
+        # [2.2.6.6.2](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/abd94ec3-6c35-4da5-9cef-7abbbf233a80)
+        class QueryPathInformationResponse < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
+          class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
+          end
+
+          smb_header                                  :smb_header
+          parameter_block                             :parameter_block
+          query_path_information_response_data_block  :data_block
+
+          def initialize_instance
+            super
+            parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_PATH_INFORMATION
+            smb_header.flags.reply = 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_smb/smb1/packet/trans2/request.rb

@@ -25,22 +25,38 @@ module RubySMB
             uint8         :setup_count,           label: 'Setup Count',            initial_value: -> { setup.length }
             uint8         :reserved3,             label: 'Reserved Space',         initial_value: 0x00
 
-            array :setup, type: :uint16, initial_length: 0
+            array :setup, type: :uint16, initial_length: :setup_count
           end
 
           # The {RubySMB::SMB1::DataBlock} specific to this packet type.
           class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
-            uint8  :name,               label: 'Name', initial_value: 0x00
-            string :pad1,               length: -> { pad1_length }
-            string :trans2_parameters,  label: 'Trans2 Parameters'
-            string :pad2,               length: -> { pad2_length }
-            string :trans2_data,        label: 'Trans2 Data'
+            uint8  :name,              label: 'Name', initial_value: 0x00
+            string :pad1,              length: -> { pad1_length }
+            string :trans2_parameters, label: 'Trans2 Parameters'
+            string :pad2,              length: -> { pad2_length }
+            string :trans2_data,       label: 'Trans2 Data'
           end
 
+          require 'ruby_smb/smb1/packet/trans2/find_first2_request'
+          require 'ruby_smb/smb1/packet/trans2/find_next2_request'
+          require 'ruby_smb/smb1/packet/trans2/open2_request'
+          require 'ruby_smb/smb1/packet/trans2/query_file_information_request'
+          require 'ruby_smb/smb1/packet/trans2/query_path_information_request'
+          require 'ruby_smb/smb1/packet/trans2/set_file_information_request'
+          require 'ruby_smb/smb1/packet/trans2/query_fs_information_request'
+
           smb_header        :smb_header
           parameter_block   :parameter_block
-          data_block        :data_block
-
+          choice            :data_block, selection: -> { parameter_block.setup.first || :default } do
+            open2_request_data_block                  Subcommands::OPEN2
+            find_first2_request_data_block            Subcommands::FIND_FIRST2
+            find_next2_request_data_block             Subcommands::FIND_NEXT2
+            query_file_information_request_data_block Subcommands::QUERY_FILE_INFORMATION
+            query_path_information_request_data_block Subcommands::QUERY_PATH_INFORMATION
+            set_file_information_request_data_block   Subcommands::SET_FILE_INFORMATION
+            query_fs_information_request_data_block   Subcommands::QUERY_FS_INFORMATION
+            data_block                                :default
+          end
         end
       end
     end

data/lib/ruby_smb/smb1/packet/trans2/request_secondary.rb

@@ -9,7 +9,7 @@ module RubySMB
 
           # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
-            uint16 :total_parameter_count, label: 'Total Parameter Count(bytes)'
+            uint16  :total_parameter_count,   label: 'Total Parameter Count(bytes)'
             uint16  :total_data_count,        label: 'Total Data Count(bytes)'
             uint16  :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: -> { parent.data_block.trans2_parameters.length }
             uint16  :parameter_offset,        label: 'Parameter Offset',               initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
@@ -24,9 +24,9 @@ module RubySMB
           class DataBlock < RubySMB::SMB1::Packet::Trans2::Request::DataBlock
           end
 
-          smb_header        :smb_header
-          parameter_block   :parameter_block
-          data_block        :data_block
+          smb_header       :smb_header
+          parameter_block  :parameter_block
+          data_block       :data_block
 
         end
       end

data/lib/ruby_smb/smb1/packet/trans2/response.rb

@@ -9,32 +9,41 @@ module RubySMB
 
           # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
-            uint16 :total_parameter_count, label: 'Total Parameter Count(bytes)'
-            uint16        :total_data_count,        label: 'Total Data Count(bytes)'
-            uint16        :reserved,                label: 'Reserved Space',                 initial_value: 0x00
-            uint16        :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: -> { parent.data_block.trans2_parameters.length }
-            uint16        :parameter_offset,        label: 'Parameter Offset',               initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
-            uint16        :parameter_displacement,  label: 'Parameter Displacement'
-            uint16        :data_count,              label: 'Data Count(bytes)',              initial_value: -> { parent.data_block.trans2_data.length }
-            uint16        :data_offset,             label: 'Data Offset',                    initial_value: -> { parent.data_block.trans2_data.abs_offset }
-            uint16        :data_displacement,       label: 'Data Displacement'
-            uint8         :setup_count,             label: 'Setup Count',                    initial_value: -> { setup.length }
-            uint8         :reserved2,               label: 'Reserved Space',                 initial_value: 0x00
+            uint16  :total_parameter_count, label: 'Total Parameter Count(bytes)'
+            uint16  :total_data_count,        label: 'Total Data Count(bytes)'
+            uint16  :reserved,                label: 'Reserved Space',                 initial_value: 0x00
+            uint16  :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: -> { parent.data_block.trans2_parameters.length }
+            uint16  :parameter_offset,        label: 'Parameter Offset',               initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
+            uint16  :parameter_displacement,  label: 'Parameter Displacement'
+            uint16  :data_count,              label: 'Data Count(bytes)',              initial_value: -> { parent.data_block.trans2_data.length }
+            uint16  :data_offset,             label: 'Data Offset',                    initial_value: -> { parent.data_block.trans2_data.abs_offset }
+            uint16  :data_displacement,       label: 'Data Displacement'
+            uint8   :setup_count,             label: 'Setup Count',                    initial_value: -> { setup.length }
+            uint8   :reserved2,               label: 'Reserved Space',                 initial_value: 0x00
 
-            array :setup, type: :uint16, initial_length: 0
+            array :setup, type: :uint16, initial_length: :setup_count
           end
 
-          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
-          class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
-            string :pad1,               length: -> { pad1_length }
-            string :trans2_parameters,  label: 'Trans2 Parameters'
-            string :pad2,               length: -> { pad2_length }
-            string :trans2_data,        label: 'Trans2 Data'
-          end
+          require 'ruby_smb/smb1/packet/trans2/find_first2_response'
+          require 'ruby_smb/smb1/packet/trans2/find_next2_response'
+          require 'ruby_smb/smb1/packet/trans2/open2_response'
+          require 'ruby_smb/smb1/packet/trans2/query_file_information_response'
+          require 'ruby_smb/smb1/packet/trans2/query_path_information_response'
+          require 'ruby_smb/smb1/packet/trans2/set_file_information_response'
+          require 'ruby_smb/smb1/packet/trans2/query_fs_information_response'
 
           smb_header        :smb_header
           parameter_block   :parameter_block
-          data_block        :data_block
+          choice            :data_block, selection: -> { parameter_block.setup.first || :default } do
+            open2_response_data_block                  Subcommands::OPEN2
+            find_first2_response_data_block            Subcommands::FIND_FIRST2
+            find_next2_response_data_block             Subcommands::FIND_NEXT2
+            query_file_information_response_data_block Subcommands::QUERY_FILE_INFORMATION
+            query_path_information_response_data_block Subcommands::QUERY_PATH_INFORMATION
+            set_file_information_response_data_block   Subcommands::SET_FILE_INFORMATION
+            query_fs_information_response_data_block   Subcommands::QUERY_FS_INFORMATION
+            data_block                                 :default
+          end
 
           def initialize_instance
             super

data/lib/ruby_smb/smb1/packet/trans2/set_file_information_request.rb

@@ -2,59 +2,59 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
-        # A Trans2 SET_FILE_INFORMATION Request Packet as defined in
-        # [2.2.6.9.1 Request](https://msdn.microsoft.com/en-us/library/ee441527.aspx)
-        class SetFileInformationRequest < RubySMB::GenericPacket
-          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+        # The Trans2 Parameter Block for this particular Subcommand
+        class SetFileInformationRequestTrans2Parameters < BinData::Record
+          endian :little
 
-          class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
-          end
+          uint16  :fid,               label: 'FID'
+          uint16  :information_level, label: 'Information Level'
+          uint16  :reserved,          label: 'Reserved Space'
 
-          # The Trans2 Parameter Block for this particular Subcommand
-          class Trans2Parameters < BinData::Record
-            endian :little
+          # Returns the length of the Trans2Parameters struct
+          # in number of bytes
+          def length
+            do_num_bytes
+          end
+        end
 
-            uint16  :fid,               label: 'FID'
-            uint16  :information_level, label: 'Information Level'
-            uint16  :reserved,          label: 'Reserved Space'
+        # The Trans2 Data Block for this particular Subcommand
+        class SetFileInformationRequestTrans2Data < BinData::Record
+          include RubySMB::Fscc::FileInformation
 
-            # Returns the length of the Trans2Parameters struct
-            # in number of bytes
-            def length
-              do_num_bytes
-            end
+          choice :info_level_struct, selection: -> { parent.trans2_parameters.information_level } do
+            # It supports new pass-through Information Level capabilities, as specified in
+            # [2.2.2.3.5 Pass-through Information Level Codes](https://msdn.microsoft.com/en-us/library/ff470158.aspx)
+            file_disposition_information (FILE_DISPOSITION_INFORMATION + SMB_INFO_PASSTHROUGH), label: 'File Disposition Information'
+            file_rename_information      (FILE_RENAME_INFORMATION + SMB_INFO_PASSTHROUGH),      label: 'File Rename Information'
           end
 
-          # The Trans2 Data Block for this particular Subcommand
-          class Trans2Data < BinData::Record
-            include RubySMB::Fscc::FileInformation
+          # Returns the length of the Trans2Data struct
+          # in number of bytes
+          def length
+            do_num_bytes
+          end
+        end
 
-            choice :info_level_struct, selection: -> { parent.trans2_parameters.information_level } do
-              # It supports new pass-through Information Level capabilities, as specified in
-              # [2.2.2.3.5 Pass-through Information Level Codes](https://msdn.microsoft.com/en-us/library/ff470158.aspx)
-              file_disposition_information (FILE_DISPOSITION_INFORMATION + SMB_INFO_PASSTHROUGH), label: 'File Disposition Information'
-              file_rename_information      (FILE_RENAME_INFORMATION + SMB_INFO_PASSTHROUGH),      label: 'File Rename Information'
-            end
+        # The {RubySMB::SMB1::DataBlock} specific to this packet type.
+        class SetFileInformationRequestDataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
+          uint8                                           :name,               label: 'Name', initial_value: 0x00
+          string                                          :pad1,               length: -> { pad1_length }
+          set_file_information_request_trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
+          string                                          :pad2,               length: -> { pad2_length }
+          set_file_information_request_trans2_data        :trans2_data,        label: 'Trans2 Data'
+        end
 
-            # Returns the length of the Trans2Data struct
-            # in number of bytes
-            def length
-              do_num_bytes
-            end
-          end
+        # A Trans2 SET_FILE_INFORMATION Request Packet as defined in
+        # [2.2.6.9.1 Request](https://msdn.microsoft.com/en-us/library/ee441527.aspx)
+        class SetFileInformationRequest < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
 
-          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
-          class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
-            uint8              :name,               label: 'Name', initial_value: 0x00
-            string             :pad1,               length: -> { pad1_length }
-            trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
-            string             :pad2,               length: -> { pad2_length }
-            trans2_data        :trans2_data,        label: 'Trans2 Data'
+          class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
           end
 
-          smb_header        :smb_header
-          parameter_block   :parameter_block
-          data_block        :data_block
+          smb_header                               :smb_header
+          parameter_block                          :parameter_block
+          set_file_information_request_data_block  :data_block
 
           def initialize_instance
             super

data/lib/ruby_smb/smb1/packet/trans2/set_file_information_response.rb

@@ -2,6 +2,26 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
+        # The Trans2 Parameter Block for this particular Subcommand
+        class SetFileInformationResponseTrans2Parameters < BinData::Record
+          endian :little
+
+          uint16 :ea_error_offset, label: 'Extended Attribute Error Offset'
+
+          # Returns the length of the Trans2Parameters struct
+          # in number of bytes
+          def length
+            do_num_bytes
+          end
+        end
+
+        # The {RubySMB::SMB1::DataBlock} specific to this packet type.
+        class SetFileInformationResponseDataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
+          string                                           :pad1,               length: -> { pad1_length }
+          set_file_information_response_trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
+          # trans2_data: No data is sent by this message.
+        end
+
         # A Trans2 SET_FILE_INFORMATION Response Packet as defined in
         # [2.2.6.9.2 Response](https://msdn.microsoft.com/en-us/library/ff469853.aspx)
         class SetFileInformationResponse < RubySMB::GenericPacket
@@ -10,29 +30,9 @@ module RubySMB
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
           end
 
-          # The Trans2 Parameter Block for this particular Subcommand
-          class Trans2Parameters < BinData::Record
-            endian :little
-
-            uint16 :ea_error_offset, label: 'Extended Attribute Error Offset'
-
-            # Returns the length of the Trans2Parameters struct
-            # in number of bytes
-            def length
-              do_num_bytes
-            end
-          end
-
-          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
-          class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
-            string             :pad1,               length: -> { pad1_length }
-            trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
-            # trans2_data: No data is sent by this message.
-          end
-
-          smb_header        :smb_header
-          parameter_block   :parameter_block
-          data_block        :data_block
+          smb_header                                :smb_header
+          parameter_block                           :parameter_block
+          set_file_information_response_data_block  :data_block
 
           def initialize_instance
             super

data/lib/ruby_smb/smb1/packet/trans2/subcommands.rb

@@ -2,12 +2,30 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
+        # Transaction2 subcommand constants as defined in
+        # [2.2.6 Transaction2 Subcommands](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/1cc40e02-aaea-4f33-b7b7-3a6b63906516)
         module Subcommands
-          OPEN2                = 0x0000
-          FIND_FIRST2          = 0x0001
-          FIND_NEXT2           = 0x0002
-          SET_FILE_INFORMATION = 0x0008
-          SESSION_SETUP        = 0x000E
+          OPEN2                    = 0x0000
+          FIND_FIRST2              = 0x0001
+          FIND_NEXT2               = 0x0002
+          QUERY_FS_INFORMATION     = 0x0003
+          SET_FS_INFORMATION       = 0x0004
+          QUERY_PATH_INFORMATION   = 0x0005
+          SET_PATH_INFORMATION     = 0x0006
+          QUERY_FILE_INFORMATION   = 0x0007
+          SET_FILE_INFORMATION     = 0x0008
+          FSCTL                    = 0x0009
+          IOCTL2                   = 0x000A
+          FIND_NOTIFY_FIRST        = 0x000B
+          FIND_NOTIFY_NEXT         = 0x000C
+          CREATE_DIRECTORY         = 0x000D
+          SESSION_SETUP            = 0x000E
+          GET_DFS_REFERRAL         = 0x0010
+          REPORT_DFS_INCONSISTENCY = 0x0011
+
+          def self.name(value)
+            constants.select { |c| c.upcase == c }.find { |c| const_get(c) == value }
+          end
         end
       end
     end

data/lib/ruby_smb/smb1/packet/trans2.rb

@@ -5,6 +5,8 @@ module RubySMB
       # [2.2.4.46 SMB_COM_TRANSACTION2 (0x32)](https://msdn.microsoft.com/en-us/library/ee441652.aspx)
       module Trans2
         require 'ruby_smb/smb1/packet/trans2/find_information_level'
+        require 'ruby_smb/smb1/packet/trans2/query_information_level'
+        require 'ruby_smb/smb1/packet/trans2/query_fs_information_level'
         require 'ruby_smb/smb1/packet/trans2/data_block'
         require 'ruby_smb/smb1/packet/trans2/subcommands'
         require 'ruby_smb/smb1/packet/trans2/request'
@@ -18,6 +20,8 @@ module RubySMB
         require 'ruby_smb/smb1/packet/trans2/find_next2_response'
         require 'ruby_smb/smb1/packet/trans2/set_file_information_request'
         require 'ruby_smb/smb1/packet/trans2/set_file_information_response'
+        require 'ruby_smb/smb1/packet/trans2/query_path_information_request'
+        require 'ruby_smb/smb1/packet/trans2/query_path_information_response'
       end
     end
   end

data/lib/ruby_smb/smb1/packet/tree_connect_request.rb

@@ -16,7 +16,10 @@ module RubySMB
         # The {RubySMB::SMB1::DataBlock} specific to this packet type.
         class DataBlock < RubySMB::SMB1::DataBlock
           stringz :password, label: 'Password Field', initial_value: '', length: -> { parent.parameter_block.password_length }
-          stringz  :path,     label: 'Resource Path'
+          choice  :path, selection: -> { parent.smb_header.flags2.unicode } do
+            stringz   0
+            stringz16 1
+          end
           stringz  :service,  label: 'Resource Type', initial_value: '?????'
         end
 

data/lib/ruby_smb/smb2/bit_field/directory_access_mask.rb

@@ -30,7 +30,7 @@ module RubySMB
         bit1    :generic_execute, label: 'Generic Execute'
         bit1    :generic_all,     label: 'Generic All'
         bit2    :reserved3
-        bit1    :maximum,         label: 'Maximum Allowed'
+        bit1    :maximum_allowed, label: 'Maximum Allowed'
         bit1    :system_security, label: 'System Security'
       end
     end

data/lib/ruby_smb/smb2/bit_field/file_access_mask.rb

@@ -30,7 +30,7 @@ module RubySMB
         bit1    :generic_execute, label: 'Generic Execute'
         bit1    :generic_all,     label: 'Generic All'
         bit2    :reserved3
-        bit1    :maximum,         label: 'Maximum Allowed'
+        bit1    :maximum_allowed, label: 'Maximum Allowed'
         bit1    :system_security, label: 'System Security'
       end
     end

data/lib/ruby_smb/smb2/negotiate_context.rb

@@ -22,9 +22,13 @@ module RubySMB
     class EncryptionCapabilities < BinData::Record
       AES_128_CCM = 0x0001
       AES_128_GCM = 0x0002
+      AES_256_CCM = 0x0003
+      AES_256_GCM = 0x0004
       ENCRYPTION_ALGORITHM_MAP = {
         AES_128_CCM => 'AES-128-CCM',
-        AES_128_GCM => 'AES-128-GCM'
+        AES_128_GCM => 'AES-128-GCM',
+        AES_256_CCM => 'AES-256-CCM',
+        AES_256_GCM => 'AES-256-GCM'
       }
 
       endian  :little
@@ -99,6 +103,10 @@ module RubySMB
       SMB2_NETNAME_NEGOTIATE_CONTEXT_ID    = 0x0005
       # The NegotiateContext Data field contains the transport capabilities, as specified in section 2.2.3.1.5.
       SMB2_TRANSPORT_CAPABILITIES          = 0x0006
+      # The NegotiateContext Data field contains the RDMA transform capabilities, as specified in section 2.2.3.1.6.
+      SMB2_RDMA_TRANSFORM_CAPABILITIES     = 0x0007
+      # The NegotiateContext Data field contains the signing capabilities, as specified in section 2.2.3.1.7.
+      SMB2_SIGNING_CAPABILITIES            = 0x0008
 
       endian  :little
 
@@ -112,6 +120,7 @@ module RubySMB
         compression_capabilities       SMB2_COMPRESSION_CAPABILITIES,       label: 'Compression Capabilities'
         netname_negotiate_context_id   SMB2_NETNAME_NEGOTIATE_CONTEXT_ID,   label: 'Netname Negotiate Context ID', data_length: :data_length
         transport_capabilities         SMB2_TRANSPORT_CAPABILITIES,         label: 'Transport Capabilities'
+        string                         :default,                            label: 'Unsupported Negotiating Context', read_length: :data_length
       end
 
       def pad_length