ruby_smb 3.0.6 → 3.1.2

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/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

data/lib/ruby_smb/smb2/packet/transform_header.rb

@@ -8,7 +8,7 @@ module RubySMB
         hide   :reserved0
 
         endian           :little
-        bit32            :protocol,              label: 'Protocol ID Field',      initial_value: 0xFD534D42
+        bit32            :protocol,              label: 'Protocol ID Field',      initial_value: RubySMB::SMB2::SMB2_TRANSFORM_PROTOCOL_ID
         string           :signature,             label: 'Signature', length: 16
         string           :nonce,                 label: 'Nonce',     length: 16
         uint32           :original_message_size, label: 'Original Message Size'
@@ -22,13 +22,13 @@ module RubySMB
           encrypted_data = self.encrypted_data.to_ary.pack('C*')
 
           case algorithm
-          when 'AES-128-CCM'
+          when 'AES-128-CCM', 'AES-256-CCM'
             cipher = OpenSSL::CCM.new('AES', key, 16)
             unencrypted_data = cipher.decrypt(encrypted_data + self.signature, self.nonce[0...11], auth_data)
             unless unencrypted_data.length > 0
               raise OpenSSL::Cipher::CipherError  # raised for consistency with GCM mode
             end
-          when 'AES-128-GCM'
+          when 'AES-128-GCM', 'AES-256-GCM'
             cipher = OpenSSL::Cipher.new(algorithm).decrypt
             cipher.key = key
             cipher.iv = self.nonce[0...12]
@@ -37,7 +37,7 @@ module RubySMB
             unencrypted_data = cipher.update(encrypted_data)
             cipher.final # raises OpenSSL::Cipher::CipherError on signature failure
           else
-            raise ArgumentError.new('Invalid algorithm, must be either AES-128-CCM or AES-128-GCM')
+            raise ArgumentError.new('Invalid algorithm, must be one of AES-128-CCM, AES-128-GCM, AES-256-CCM, or AES-256-GCM')
           end
 
           unencrypted_data[0...self.original_message_size]
@@ -53,14 +53,14 @@ module RubySMB
           self.original_message_size.assign(unencrypted_data.length)
 
           case algorithm
-          when 'AES-128-CCM'
+          when 'AES-128-CCM', 'AES-256-CCM'
             cipher = OpenSSL::CCM.new('AES', key, 16)
             random_iv = OpenSSL::Random.random_bytes(11)
             self.nonce.assign(random_iv)
             result = cipher.encrypt(unencrypted_data, random_iv, self.to_binary_s[20...52])
             encrypted_data = result[0...-16]
             auth_tag = result[-16..-1]
-          when 'AES-128-GCM'
+          when 'AES-128-GCM', 'AES-256-GCM'
             cipher = OpenSSL::Cipher.new(algorithm).encrypt
             cipher.iv_len = 12
             cipher.key = key
@@ -69,7 +69,7 @@ module RubySMB
             encrypted_data = cipher.update(unencrypted_data) + cipher.final
             auth_tag = cipher.auth_tag
           else
-            raise ArgumentError.new('Invalid algorithm, must be either AES-128-CCM or AES-128-GCM')
+            raise ArgumentError.new('Invalid algorithm, must be one of AES-128-CCM, AES-128-GCM, AES-256-CCM, or AES-256-GCM')
           end
 
           self.encrypted_data.assign(encrypted_data.bytes)

data/lib/ruby_smb/smb2/tree.rb

@@ -237,6 +237,7 @@ module RubySMB
 
         if read
           create_request.share_access.read_access = 1
+          create_request.desired_access.read_attr = 1
           create_request.desired_access.read_data = 1
         end
 

data/lib/ruby_smb/smb2.rb

@@ -5,6 +5,7 @@ module RubySMB
   module SMB2
     # Protocol ID value. Translates to \xFESMB
     SMB2_PROTOCOL_ID = 0xFE534D42
+    SMB2_TRANSFORM_PROTOCOL_ID = 0xFD534D42
     # Wildcard revision, see: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/63abf97c-0d09-47e2-88d6-6bfa552949a5
     SMB2_WILDCARD_REVISION = 0x02ff
 

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '3.0.6'.freeze
+  VERSION = '3.1.2'.freeze
 end

data/spec/lib/ruby_smb/client_spec.rb

@@ -962,8 +962,10 @@ RSpec.describe RubySMB::Client do
           expect(nc.length).to eq(1)
           expect(nc.first.data.ciphers).to eq(
             [
-              RubySMB::SMB2::EncryptionCapabilities::AES_128_CCM,
-              RubySMB::SMB2::EncryptionCapabilities::AES_128_GCM
+              RubySMB::SMB2::EncryptionCapabilities::AES_256_GCM,
+              RubySMB::SMB2::EncryptionCapabilities::AES_256_CCM,
+              RubySMB::SMB2::EncryptionCapabilities::AES_128_GCM,
+              RubySMB::SMB2::EncryptionCapabilities::AES_128_CCM
             ]
           )
         end
@@ -1277,6 +1279,9 @@ RSpec.describe RubySMB::Client do
       end
 
       it 'calls the backing methods' do
+        request_packet = double('Request packet')
+        allow(client).to receive(:negotiate_request).and_return(request_packet)
+        allow(request_packet).to receive(:packet_smb_version)
         expect(client).to receive(:negotiate_request)
         expect(client).to receive(:send_recv)
         expect(client).to receive(:negotiate_response)
@@ -1317,14 +1322,20 @@ RSpec.describe RubySMB::Client do
 
         it 'increments the message ID' do
           expect(client).to receive(:smb2_message_id=).with(1)
+          expect(client).to receive(:negotiate_request).twice.and_call_original
+          expect(client).to receive(:parse_negotiate_response).twice do
+            client.smb1 = false
+          end
           client.negotiate
         end
 
         it 're-negotiates' do
-          expect(client).to receive(:negotiate_request).twice
+          expect(client).to receive(:negotiate_request).twice.and_call_original
           expect(client).to receive(:send_recv).twice
           expect(client).to receive(:negotiate_response).twice
-          expect(client).to receive(:parse_negotiate_response).twice
+          expect(client).to receive(:parse_negotiate_response).twice do
+            client.smb1 = false
+          end
           client.negotiate
         end
       end
@@ -2681,13 +2692,15 @@ RSpec.describe RubySMB::Client do
         context "with #{dialect} dialect" do
           before :example do
             client.dialect = dialect
+            client.encryption_algorithm = 'AES-128-CCM'
           end
 
           it 'generates the client encryption key with the expected parameters' do
             expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
               session_key,
               "SMB2AESCCM\x00",
-              "ServerIn \x00"
+              "ServerIn \x00",
+              {length: 128}
             ).and_call_original
             client.smb3_encrypt(data)
           end
@@ -2698,10 +2711,12 @@ RSpec.describe RubySMB::Client do
         it 'generates the client encryption key with the expected parameters' do
           client.preauth_integrity_hash_value = ''
           client.dialect = '0x0311'
+          client.encryption_algorithm = 'AES-128-CCM'
           expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
             session_key,
             "SMBC2SCipherKey\x00",
-            ''
+            '',
+            {length: 128}
           ).and_call_original
           client.smb3_encrypt(data)
         end
@@ -2723,6 +2738,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected client encryption key with 0x0302 dialect' do
         client.dialect = '0x0302'
+        client.encryption_algorithm = 'AES-128-CCM'
         expected_enc_key =
           "\xa4\xfa\x23\xc1\xb0\x65\x84\xce\x47\x08\x5b\xe0\x64\x98\xd7\x87".b
         client.smb3_encrypt(data)
@@ -2731,6 +2747,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected client encryption key with 0x0311 dialect' do
         client.dialect = '0x0311'
+        client.encryption_algorithm = 'AES-128-CCM'
         client.session_key =
           "\x5c\x00\x4a\x3b\xf0\xa2\x4f\x75\x4c\xb2\x74\x0a\xcf\xc4\x8e\x1a".b
         client.preauth_integrity_hash_value =
@@ -2765,13 +2782,15 @@ RSpec.describe RubySMB::Client do
         context "with #{dialect} dialect" do
           before :example do
             client.dialect = dialect
+            client.encryption_algorithm = 'AES-128-CCM'
           end
 
           it 'generates the client encryption key with the expected parameters' do
             expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
               session_key,
               "SMB2AESCCM\x00",
-              "ServerOut\x00"
+              "ServerOut\x00",
+              {length: 128}
             ).and_call_original
             client.smb3_decrypt(transform_packet)
           end
@@ -2782,10 +2801,12 @@ RSpec.describe RubySMB::Client do
         it 'generates the client encryption key with the expected parameters' do
           client.preauth_integrity_hash_value = ''
           client.dialect = '0x0311'
+          client.encryption_algorithm = 'AES-128-CCM'
           expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
             session_key,
             "SMBS2CCipherKey\x00",
-            ''
+            '',
+            {length: 128}
           ).and_call_original
           client.smb3_decrypt(transform_packet)
         end
@@ -2806,6 +2827,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected server encryption key with 0x0302 dialect' do
         client.dialect = '0x0302'
+        client.encryption_algorithm = 'AES-128-CCM'
         expected_enc_key =
           "\x65\x21\xd3\x6d\xe9\xe3\x5a\x66\x09\x61\xae\x3e\xc6\x49\x6b\xdf".b
         client.smb3_decrypt(transform_packet)
@@ -2814,6 +2836,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected server encryption key with 0x0311 dialect' do
         client.dialect = '0x0311'
+        client.encryption_algorithm = 'AES-128-CCM'
         client.session_key =
           "\x5c\x00\x4a\x3b\xf0\xa2\x4f\x75\x4c\xb2\x74\x0a\xcf\xc4\x8e\x1a".b
         client.preauth_integrity_hash_value =

data/spec/lib/ruby_smb/fscc/file_information/file_access_information_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+RSpec.describe RubySMB::Fscc::FileInformation::FileAccessInformation do
+  it 'references the correct class level' do
+    expect(described_class).to be_const_defined(:CLASS_LEVEL)
+    expect(described_class::CLASS_LEVEL).to be RubySMB::Fscc::FileInformation::FILE_ACCESS_INFORMATION
+  end
+
+  subject(:struct) { described_class.new }
+
+  it { should respond_to :access_flags }
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  it 'tracks the access flags in a Uint32 field' do
+    expect(struct.access_flags).to be_a BinData::Uint32le
+  end
+
+end