ruby_smb 1.0.3 → 1.0.4

data/lib/ruby_smb/smb1/file.rb

@@ -76,14 +76,19 @@ module RubySMB
       # Closes the handle to the remote file.
       #
       # @return [WindowsError::ErrorCode] the NTStatus code returned by the operation
-      # @raise [RubySMB::Error::InvalidPacket] if the response command is not SMB_COM_CLOSE
+      # @raise [RubySMB::Error::InvalidPacket] if the response packet is not valid
       # @raise [RubySMB::Error::UnexpectedStatusCode] if the response NTStatus is not STATUS_SUCCESS
       def close
         close_request = set_header_fields(RubySMB::SMB1::Packet::CloseRequest.new)
         raw_response  = @tree.client.send_recv(close_request)
         response = RubySMB::SMB1::Packet::CloseResponse.read(raw_response)
-        unless response.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_CLOSE
-          raise RubySMB::Error::InvalidPacket, 'Not a CloseResponse packet'
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::CloseResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
         end
         unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
@@ -98,7 +103,7 @@ module RubySMB
       # @param bytes [Integer] the number of bytes to read
       # @param offset [Integer] the byte offset in the file to start reading from
       # @return [String] the data read from the file
-      # @raise [RubySMB::Error::InvalidPacket] if the response command is not SMB_COM_READ_ANDX
+      # @raise [RubySMB::Error::InvalidPacket] if the response packet is not valid
       # @raise [RubySMB::Error::UnexpectedStatusCode] if the response NTStatus is not STATUS_SUCCESS
       def read(bytes: @size, offset: 0)
         atomic_read_size = if bytes > @tree.client.max_buffer_size
@@ -113,8 +118,13 @@ module RubySMB
           read_request = read_packet(read_length: atomic_read_size, offset: offset)
           raw_response = @tree.client.send_recv(read_request)
           response = RubySMB::SMB1::Packet::ReadAndxResponse.read(raw_response)
-          unless response.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_READ_ANDX
-            raise RubySMB::Error::InvalidPacket, 'Not a ReadAndxResponse packet'
+          unless response.valid?
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+              expected_cmd:   RubySMB::SMB1::Packet::ReadAndxResponse::COMMAND,
+              received_proto: response.smb_header.protocol,
+              received_cmd:   response.smb_header.command
+            )
           end
           unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
             raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
@@ -149,12 +159,20 @@ module RubySMB
         read_request.parameter_block.offset = offset
         read_request
       end
-      
+
       def send_recv_read(read_length: 0, offset: 0)
         read_request = read_packet(read_length: read_length, offset: offset)
         raw_response = tree.client.send_recv(read_request)
 
         response = RubySMB::SMB1::Packet::ReadAndxResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::ReadAndxResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
+        end
         unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
         end
@@ -165,9 +183,18 @@ module RubySMB
       # Delete a file on close
       #
       # @return [WindowsError::ErrorCode] the NTStatus Response code
+      # @raise [RubySMB::Error::InvalidPacket] if the response packet is not valid
       def delete
         raw_response = @tree.client.send_recv(delete_packet)
         response = RubySMB::SMB1::Packet::Trans2::SetFileInformationResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::Trans2::SetFileInformationResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
+        end
         response.status_code
       end
 
@@ -190,7 +217,7 @@ module RubySMB
       # @param data [String] the data to write to the file
       # @param offset [Integer] the offset in the file to start writing from
       # @return [Integer] the count of bytes written
-      # @raise [RubySMB::Error::InvalidPacket] if the response command is not SMB_COM_WRITE_ANDX
+      # @raise [RubySMB::Error::InvalidPacket] if the response packet is not valid
       # @raise [RubySMB::Error::UnexpectedStatusCode] if the response NTStatus is not STATUS_SUCCESS
       def write(data:, offset: 0)
         buffer = data.dup
@@ -206,8 +233,13 @@ module RubySMB
           write_request = write_packet(data: buffer.slice!(0, atomic_write_size), offset: offset)
           raw_response = @tree.client.send_recv(write_request)
           response = RubySMB::SMB1::Packet::WriteAndxResponse.read(raw_response)
-          unless response.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_WRITE_ANDX
-            raise RubySMB::Error::InvalidPacket, 'Not a WriteAndxResponse packet'
+          unless response.valid?
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+              expected_cmd:   RubySMB::SMB1::Packet::WriteAndxResponse::COMMAND,
+              received_proto: response.smb_header.protocol,
+              received_cmd:   response.smb_header.command
+            )
           end
           unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
             raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
@@ -235,12 +267,20 @@ module RubySMB
         write_request.parameter_block.remaining = write_request.parameter_block.data_length
         write_request
       end
-      
+
       def send_recv_write(data:'', offset: 0)
         pkt = write_packet(data: data, offset: offset)
         pkt.set_64_bit_offset(true)
         raw_response = @tree.client.send_recv(pkt)
         response = RubySMB::SMB1::Packet::WriteAndxResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::WriteAndxResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
+        end
         response.parameter_block.count_low
       end
 
@@ -248,9 +288,18 @@ module RubySMB
       #
       # @param new_file_name [String] the new name
       # @return [WindowsError::ErrorCode] the NTStatus Response code
+      # @raise [RubySMB::Error::InvalidPacket] if the response packet is not valid
       def rename(new_file_name)
         raw_response = tree.client.send_recv(rename_packet(new_file_name))
         response = RubySMB::SMB1::Packet::Trans2::SetFileInformationResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::Trans2::SetFileInformationResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
+        end
         response.status_code
       end
 

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_CLOSE Request Packet as defined in
       # [2.2.4.5.1 Request](https://msdn.microsoft.com/en-us/library/ee442151.aspx)
       class CloseRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_CLOSE
+
         # A SMB1 Parameter Block as defined by the {CloseRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           endian  :little
@@ -20,11 +22,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_CLOSE
-        end
-
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_CLOSE Response Packet as defined in
       # [2.2.4.5.2 Response](https://msdn.microsoft.com/en-us/library/ee441667.aspx)
       class CloseResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_CLOSE
+
         # A SMB1 Parameter Block as defined by the {CloseResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
         end
@@ -18,7 +20,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command     = RubySMB::SMB1::Commands::SMB_COM_CLOSE
           smb_header.flags.reply = 1
         end
 

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

@@ -4,6 +4,8 @@ module RubySMB
       # This class represents an SMB1 Echo Request Packet as defined in
       # [2.2.4.39.1 Request](https://msdn.microsoft.com/en-us/library/ee441746.aspx)
       class EchoRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_ECHO
+
         # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           uint16 :echo_count, label: 'Echo Count', initial_value: 1
@@ -18,10 +20,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_ECHO
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # This class represents an SMB1 Echo Request Packet as defined in
       # [2.2.4.39.2 Response](https://msdn.microsoft.com/en-us/library/ee441626.aspx)
       class EchoResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_ECHO
+
         # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           uint16 :sequence_number, label: 'Sequence Number'
@@ -20,7 +22,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_ECHO
           smb_header.flags.reply = 1
         end
       end

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

@@ -4,9 +4,16 @@ module RubySMB
       # This packet represent an SMB1 Response Packet when the parameter and
       # data blocks will be empty.
       class EmptyPacket < RubySMB::GenericPacket
+        attr_accessor :original_command
+
         smb_header        :smb_header
         parameter_block   :parameter_block
         data_block        :data_block
+
+        def valid?
+          return smb_header.protocol == RubySMB::SMB1::SMB_PROTOCOL_ID &&
+            smb_header.command == @original_command
+        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # This class represents an SMB1 LOGOFF Request Packet as defined in
       # [2.2.4.54.1 Request](https://msdn.microsoft.com/en-us/library/ee442167.aspx)
       class LogoffRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_LOGOFF
+
         # The Parameter Block for this packet is empty save the Word Count and ANDX Block
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block :andx_block
@@ -17,10 +19,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_LOGOFF
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # This class represents an SMB1 LOGOFF Response Packet as defined in
       # [2.2.4.54.2 Response](https://msdn.microsoft.com/en-us/library/ee441488.aspx)
       class LogoffResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_LOGOFF
+
         # The Parameter Block for this packet is empty save the Word Count and ANDX Block
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block :andx_block
@@ -19,7 +21,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_LOGOFF
           smb_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_NEGOTIATE Request Packet as defined in
       # [2.2.4.52.1](https://msdn.microsoft.com/en-us/library/ee441572.aspx)
       class NegotiateRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
+
         # Represents the specific layout of the DataBlock for a NegotiateRequest Packet.
         class DataBlock < RubySMB::SMB1::DataBlock
           array :dialects, label: 'Dialects', type: :dialect, read_until: :eof
@@ -13,11 +15,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
-        end
-
         # Add an individual Dialect string to the list of
         # Dialects in the packet.
         #

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_NEGOTIATE Non-Extended Security Response Packet as defined in
       # [2.2.4.5.2.2 Non-Extended Security Response](https://msdn.microsoft.com/en-us/library/cc246327.aspx)
       class NegotiateResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
+
         # An SMB_Parameters Block as defined by the {NegotiateResponse}.
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           uint16          :dialect_index, label: 'Dialect Index'
@@ -32,13 +34,7 @@ module RubySMB
 
         def initialize_instance
           super
-          header = smb_header
-          header.command = RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
-          header.flags.reply = 1
-        end
-
-        def valid?
-          smb_header.command == RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
+          smb_header.flags.reply = 1
         end
 
         # Stores the list of {RubySMB::SMB1::Dialect} that were sent to the

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_NEGOTIATE Extended Security Response Packet as defined in
       # [2.2.4.5.2.1 Extended Security Response](https://msdn.microsoft.com/en-us/library/cc246326.aspx)
       class NegotiateResponseExtended < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
+
         # An SMB_Parameters Block as defined by the {NegotiateResponseExtended}.
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           uint16          :dialect_index, label: 'Dialect Index'
@@ -31,13 +33,11 @@ module RubySMB
 
         def initialize_instance
           super
-          header = smb_header
-          header.command = RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
-          header.flags.reply = 1
+          smb_header.flags.reply = 1
         end
 
         def valid?
-          return false unless smb_header.command == RubySMB::SMB1::Commands::SMB_COM_NEGOTIATE
+          return false unless super
           return false unless parameter_block.capabilities.extended_security == 1
           true
         end

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

@@ -5,6 +5,8 @@ module RubySMB
       # [2.2.4.64.1 Request](https://msdn.microsoft.com/en-us/library/ee442175.aspx) and
       # [2.2.4.9.1 Client Request Extensions](https://msdn.microsoft.com/en-us/library/cc246332.aspx)
       class NtCreateAndxRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_NT_CREATE_ANDX
+
         # A SMB1 Parameter Block as defined by the {NtCreateAndxRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           endian :little
@@ -52,10 +54,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NT_CREATE_ANDX
-        end
       end
     end
   end

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

@@ -5,6 +5,8 @@ module RubySMB
       # [2.2.4.64.2 Response](https://msdn.microsoft.com/en-us/library/ee441612.aspx) and
       # [2.2.4.9.2 Server Response Extensions](https://msdn.microsoft.com/en-us/library/cc246334.aspx)
       class NtCreateAndxResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_NT_CREATE_ANDX
+
         # A SMB1 Parameter Block as defined by the {NtCreateAndxResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           endian :little
@@ -57,7 +59,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NT_CREATE_ANDX
           smb_header.flags.reply = 1
         end
       end

data/lib/ruby_smb/smb1/packet/nt_trans/create_request.rb

@@ -5,6 +5,8 @@ module RubySMB
         # Class representing a generic NT Transaction request packet as defined in
         # [2.2.4.62.1 Request](https://msdn.microsoft.com/en-us/library/ee441534.aspx)
         class CreateRequest < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
+
           class ParameterBlock < RubySMB::SMB1::Packet::NtTrans::Request::ParameterBlock
           end
 
@@ -81,7 +83,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
             parameter_block.function = RubySMB::SMB1::Packet::NtTrans::Subcommands::CREATE
           end
         end

data/lib/ruby_smb/smb1/packet/nt_trans/create_response.rb

@@ -5,6 +5,8 @@ module RubySMB
         # Class representing a NT Transaction Create response packet as defined in
         # [2.2.7.1.2 Response](https://msdn.microsoft.com/en-us/library/ee441961.aspx)
         class CreateResponse < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
+
           class ParameterBlock < RubySMB::SMB1::Packet::NtTrans::Response::ParameterBlock
           end
 
@@ -49,7 +51,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
             smb_header.flags.reply = 1
           end
         end

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

@@ -5,6 +5,8 @@ module RubySMB
         # Class representing a generic NT Transaction request packet as defined in
         # [2.2.4.62.1 Request](https://msdn.microsoft.com/en-us/library/ee441534.aspx)
         class Request < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
+
           # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             endian :little
@@ -36,10 +38,6 @@ module RubySMB
           parameter_block   :parameter_block
           data_block        :data_block
 
-          def initialize_instance
-            super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
-          end
         end
       end
     end

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

@@ -5,6 +5,8 @@ module RubySMB
         # Class representing a generic NT Transaction response packet as defined in
         # [2.2.4.62.2 Response](https://msdn.microsoft.com/en-us/library/ee442112.aspx)
         class Response < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
+
           # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             endian :little
@@ -34,7 +36,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_NT_TRANSACT
             smb_header.flags.reply = 1
           end
         end