ruby_smb 1.0.3 → 1.0.4

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

@@ -4,6 +4,8 @@ module RubySMB
       # This class represents an SMB1 TreeConnect Request Packet as defined in
       # [2.2.4.7.1 Client Request Extensions](https://msdn.microsoft.com/en-us/library/cc246330.aspx)
       class TreeConnectRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_TREE_CONNECT
+
         # A SMB1 Parameter Block as defined by the {TreeConnectRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block          :andx_block
@@ -22,10 +24,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TREE_CONNECT
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 TreeConnect Response Packet as defined in
       # [2.2.4.7.2 Server Response Extensions](https://msdn.microsoft.com/en-us/library/cc246331.aspx)
       class TreeConnectResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_TREE_CONNECT
+
         # A SMB1 Parameter Block as defined by the {SessionSetupResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block                :andx_block
@@ -24,7 +26,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TREE_CONNECT
           smb_header.flags.reply = 1
         end
 
@@ -34,12 +35,17 @@ module RubySMB
         #
         # @return [RubySMB::SMB1::BitField::DirectoryAccessMask] if a directory was connected to
         # @return [RubySMB::SMB1::BitField::FileAccessMask] if anything else was connected to
+        # @raise [RubySMB::Error::InvalidBitField] if ACCESS_MASK bit field is not valid
         def access_rights
           if is_directory?
             parameter_block.access_rights
           else
             mask = parameter_block.access_rights.to_binary_s
-            RubySMB::SMB1::BitField::FileAccessMask.read(mask)
+            begin
+              RubySMB::SMB1::BitField::FileAccessMask.read(mask)
+            rescue IOError
+              raise RubySMB::Error::InvalidBitField, 'Invalid ACCESS_MASK for the Maximal Share Access Rights'
+            end
           end
         end
 
@@ -54,7 +60,11 @@ module RubySMB
             parameter_block.guest_access_rights
           else
             mask = parameter_block.guest_access_rights.to_binary_s
-            RubySMB::SMB1::BitField::FileAccessMask.read(mask)
+            begin
+              RubySMB::SMB1::BitField::FileAccessMask.read(mask)
+            rescue IOError
+              raise RubySMB::Error::InvalidBitField, 'Invalid ACCESS_MASK for the Guest Share Access Rights'
+            end
           end
         end
 

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

@@ -4,6 +4,8 @@ module RubySMB
       # This class represents an SMB1 TreeDisonnect Request Packet as defined in
       # [2.2.4.51.1 Request](https://msdn.microsoft.com/en-us/library/ee441622.aspx)
       class TreeDisconnectRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_TREE_DISCONNECT
+
         # The Parameter Block for this packet is empty save the Word Count
         # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
@@ -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_TREE_DISCONNECT
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # This class represents an SMB1 TreeDisonnect Response Packet as defined in
       # [2.2.4.51.2 Response](https://msdn.microsoft.com/en-us/library/ee441823.aspx)
       class TreeDisconnectResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_TREE_DISCONNECT
+
         # The Parameter Block for this packet is empty save the Word Count
         # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
@@ -19,7 +21,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TREE_DISCONNECT
           smb_header.flags.reply = 1
         end
       end

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

@@ -5,6 +5,8 @@ module RubySMB
       # [2.2.4.43.1 Request](https://msdn.microsoft.com/en-us/library/ee441954.aspx)
       # [2.2.4.3.1 Client Request Extensions](https://msdn.microsoft.com/en-us/library/ff469893.aspx)
       class WriteAndxRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_WRITE_ANDX
+
         # A SMB1 Parameter Block as defined by the {WriteAndxRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           endian      :little
@@ -49,11 +51,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_WRITE_ANDX
-        end
-
         # Specifies whether the offset is a 32-bit (default) or 64-bit value. When `is_64_bit`
         # is true, a 64-bit offset will be used and the OffsetHigh field will be added to the structure.
         #

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

@@ -5,6 +5,8 @@ module RubySMB
       # [2.2.4.43.2 Response](https://msdn.microsoft.com/en-us/library/ee441673.aspx)
       # [2.2.4.3.2 Server Response Extensions](https://msdn.microsoft.com/en-us/library/ff469858.aspx)
       class WriteAndxResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_WRITE_ANDX
+
         # A SMB1 Parameter Block as defined by the {WriteAndxResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           endian      :little
@@ -26,7 +28,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_WRITE_ANDX
           smb_header.flags.reply = 1
         end
       end

data/lib/ruby_smb/smb1/pipe.rb

@@ -26,14 +26,19 @@ module RubySMB
         packet = @tree.set_header_fields(packet)
         raw_response = @tree.client.send_recv(packet)
         response = RubySMB::SMB1::Packet::Trans::PeekNmpipeResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::Trans::PeekNmpipeRequest::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
+        end
 
         unless response.status_code == WindowsError::NTStatus::STATUS_BUFFER_OVERFLOW or response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
         end
 
-        unless response.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
-          raise RubySMB::Error::InvalidPacket, 'Not a TransResponse packet'
-        end
         response
       end
 

data/lib/ruby_smb/smb1/tree.rb

@@ -39,11 +39,20 @@ module RubySMB
       # Disconnects this Tree from the current session
       #
       # @return [WindowsError::ErrorCode] the NTStatus sent back by the server.
+      # @raise [RubySMB::Error::InvalidPacket] if the response is not a TreeDisconnectResponse packet
       def disconnect!
         request = RubySMB::SMB1::Packet::TreeDisconnectRequest.new
         request = set_header_fields(request)
         raw_response = client.send_recv(request)
         response = RubySMB::SMB1::Packet::TreeDisconnectResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::TreeDisconnectResponse::COMMAND,
+            received_proto: response.smb_header.protocol,
+            received_cmd:   response.smb_header.command
+          )
+        end
         response.status_code
       end
 
@@ -113,8 +122,13 @@ module RubySMB
 
         raw_response = @client.send_recv(nt_create_andx_request)
         response = RubySMB::SMB1::Packet::NtCreateAndxResponse.read(raw_response)
-        unless response.smb_header.command == RubySMB::SMB1::Commands::SMB_COM_NT_CREATE_ANDX
-          raise RubySMB::Error::InvalidPacket, 'Not a NtCreateAndxResponse packet'
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::NtCreateAndxResponse::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
@@ -140,6 +154,8 @@ module RubySMB
       # @param pattern [String] search pattern
       # @param type [Class] file information class
       # @return [Array] array of directory structures
+      # @raise [RubySMB::Error::InvalidPacket] if the response is not a Trans2 packet
+      # @raise [RubySMB::Error::UnexpectedStatusCode] if the response NTStatus is not STATUS_SUCCESS
       def list(directory: '\\', pattern: '*', unicode: true,
                type: RubySMB::SMB1::Packet::Trans2::FindInformationLevel::FindFileFullDirectoryInfo)
         find_first_request = RubySMB::SMB1::Packet::Trans2::FindFirst2Request.new
@@ -166,6 +182,17 @@ module RubySMB
 
         raw_response  = client.send_recv(find_first_request)
         response      = RubySMB::SMB1::Packet::Trans2::FindFirst2Response.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB1::Packet::Trans2::FindFirst2Response::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
 
         results = response.results(type, unicode: unicode)
 
@@ -190,6 +217,17 @@ module RubySMB
 
           raw_response  = client.send_recv(find_next_request)
           response      = RubySMB::SMB1::Packet::Trans2::FindNext2Response.read(raw_response)
+          unless response.valid?
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto: RubySMB::SMB1::SMB_PROTOCOL_ID,
+              expected_cmd:   RubySMB::SMB1::Packet::Trans2::FindNext2Response::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
 
           results += response.results(type, unicode: unicode)
 

data/lib/ruby_smb/smb2/dcerpc.rb

@@ -55,8 +55,13 @@ module RubySMB
         request.buffer = action.to_binary_s
         ioctl_raw_response = @tree.client.send_recv(request)
         ioctl_response = RubySMB::SMB2::Packet::IoctlResponse.read(ioctl_raw_response)
-        unless ioctl_response.smb2_header.command == RubySMB::SMB2::Commands::IOCTL
-          raise RubySMB::Error::InvalidPacket, 'Not a IoctlResponse packet'
+        unless ioctl_response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::IoctlRequest::COMMAND,
+            received_proto: ioctl_response.smb2_header.protocol,
+            received_cmd:   ioctl_response.smb2_header.command
+          )
         end
         unless ioctl_response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, ioctl_response.status_code.name

data/lib/ruby_smb/smb2/file.rb

@@ -79,11 +79,24 @@ 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 is not a CloseResponse packet
+      # @raise [RubySMB::Error::UnexpectedStatusCode] if the response NTStatus is not STATUS_SUCCESS
       def close
         close_request = set_header_fields(RubySMB::SMB2::Packet::CloseRequest.new)
         raw_response  = tree.client.send_recv(close_request)
         response = RubySMB::SMB2::Packet::CloseResponse.read(raw_response)
-        response.smb2_header.nt_status.to_nt_status
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::CloseResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
+        end
+        unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
+          raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
+        end
+        response.status_code
       end
 
       # Read from the file, a specific number of bytes
@@ -93,6 +106,8 @@ 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 is not a ReadResponse packet
+      # @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.server_max_read_size
                              tree.client.server_max_read_size
@@ -103,6 +118,17 @@ module RubySMB
         read_request = read_packet(read_length: atomic_read_size, offset: offset)
         raw_response = tree.client.send_recv(read_request)
         response     = RubySMB::SMB2::Packet::ReadResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::ReadResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
+        end
+        unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
+          raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
+        end
 
         data = response.buffer.to_binary_s
 
@@ -115,6 +141,17 @@ module RubySMB
           read_request = read_packet(read_length: atomic_read_size, offset: offset)
           raw_response = tree.client.send_recv(read_request)
           response     = RubySMB::SMB2::Packet::ReadResponse.read(raw_response)
+          unless response.valid?
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+              expected_cmd:   RubySMB::SMB2::Packet::ReadResponse::COMMAND,
+              received_proto: response.smb2_header.protocol,
+              received_cmd:   response.smb2_header.command
+            )
+          end
+          unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
+            raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
+          end
 
           data << response.buffer.to_binary_s
           remaining_bytes -= atomic_read_size
@@ -138,10 +175,26 @@ module RubySMB
         read_request = read_packet(read_length: read_length, offset: offset)
         raw_response = tree.client.send_recv(read_request)
         response = RubySMB::SMB2::Packet::ReadResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::ReadResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
+        end
         if response.status_code == WindowsError::NTStatus::STATUS_PENDING
           sleep 1
           raw_response = tree.client.dispatcher.recv_packet
           response = RubySMB::SMB2::Packet::ReadResponse.read(raw_response)
+          unless response.valid?
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+              expected_cmd:   RubySMB::SMB2::Packet::ReadResponse::COMMAND,
+              received_proto: response.smb2_header.protocol,
+              received_cmd:   response.smb2_header.command
+            )
+          end
         elsif response.status_code != WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
         end
@@ -151,9 +204,18 @@ module RubySMB
       # Delete a file on close
       #
       # @return [WindowsError::ErrorCode] the NTStatus Response code
+      # @raise [RubySMB::Error::InvalidPacket] if the response is not a SetInfoResponse packet
       def delete
         raw_response = tree.client.send_recv(delete_packet)
         response = RubySMB::SMB2::Packet::SetInfoResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::SetInfoResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
+        end
         response.smb2_header.nt_status.to_nt_status
       end
 
@@ -182,6 +244,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 [WindowsError::ErrorCode] the NTStatus code returned from the operation
+      # @raise [RubySMB::Error::InvalidPacket] if the response is not a WriteResponse packet
       def write(data:'', offset: 0)
         buffer            = data.dup
         bytes             = data.length
@@ -195,6 +258,14 @@ 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::SMB2::Packet::WriteResponse.read(raw_response)
+          unless response.valid?
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+              expected_cmd:   RubySMB::SMB2::Packet::WriteResponse::COMMAND,
+              received_proto: response.smb2_header.protocol,
+              received_cmd:   response.smb2_header.command
+            )
+          end
           status        = response.smb2_header.nt_status.to_nt_status
 
           offset+= atomic_write_size
@@ -220,10 +291,26 @@ module RubySMB
         pkt = write_packet(data: data, offset: offset)
         raw_response = tree.client.send_recv(pkt)
         response = RubySMB::SMB2::Packet::WriteResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::WriteResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
+        end
         if response.status_code == WindowsError::NTStatus::STATUS_PENDING
           sleep 1
           raw_response = tree.client.dispatcher.recv_packet
           response = RubySMB::SMB2::Packet::WriteResponse.read(raw_response)
+          unless response.valid?
+            raise RubySMB::Error::InvalidPacket.new(
+              expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+              expected_cmd:   RubySMB::SMB2::Packet::WriteResponse::COMMAND,
+              received_proto: response.smb2_header.protocol,
+              received_cmd:   response.smb2_header.command
+            )
+          end
         elsif response.status_code != WindowsError::NTStatus::STATUS_SUCCESS
           raise RubySMB::Error::UnexpectedStatusCode, response.status_code.name
         end
@@ -234,9 +321,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 is not a SetInfoResponse packet
       def rename(new_file_name)
         raw_response = tree.client.send_recv(rename_packet(new_file_name))
         response = RubySMB::SMB2::Packet::SetInfoResponse.read(raw_response)
+        unless response.valid?
+          raise RubySMB::Error::InvalidPacket.new(
+            expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
+            expected_cmd:   RubySMB::SMB2::Packet::SetInfoResponse::COMMAND,
+            received_proto: response.smb2_header.protocol,
+            received_cmd:   response.smb2_header.command
+          )
+        end
         response.smb2_header.nt_status.to_nt_status
       end
 

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Close Request Packet as defined in
       # [2.2.15 SMB2 CLOSE Request](https://msdn.microsoft.com/en-us/library/cc246523.aspx)
       class CloseRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::CLOSE
+
         endian :little
 
         smb2_header           :smb2_header
@@ -12,10 +14,6 @@ module RubySMB
         uint32                :reserved,              label: 'Reserved Space'
         smb2_fileid           :file_id,               label: 'File ID'
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::CLOSE
-        end
       end
     end
   end