ruby_smb 1.0.3 → 1.0.4

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Close Response Packet as defined in
       # [2.2.16 SMB2 CLOSE Response](https://msdn.microsoft.com/en-us/library/cc246524.aspx)
       class CloseResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::CLOSE
+
         endian :little
 
         smb2_header      :smb2_header
@@ -20,7 +22,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command     = RubySMB::SMB2::Commands::CLOSE
           smb2_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Create Request Packet as defined in
       # [2.2.13 SMB2 CREATE Request](https://msdn.microsoft.com/en-us/library/cc246502.aspx)
       class CreateRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::CREATE
+
         require 'ruby_smb/smb1/bit_field/create_options'
 
         endian :little
@@ -44,10 +46,6 @@ module RubySMB
 
         array :context, label: 'Contexts', type: :create_context, read_until: :eof
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::CREATE
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Create Response Packet as defined in
       # [2.2.14 SMB2 CREATE Response](https://msdn.microsoft.com/en-us/library/cc246512.aspx)
       class CreateResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::CREATE
+
         endian :little
         smb2_header           :smb2_header
         uint16                :structure_size,       label: 'Structure Size', initial_value: 89
@@ -26,7 +28,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command = RubySMB::SMB2::Commands::CREATE
           smb2_header.flags.reply = 1
         end
       end

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

@@ -4,15 +4,13 @@ module RubySMB
       # An SMB2 Echo Request Packet as defined in
       # [2.2.28 SMB2 ECHO Request](https://msdn.microsoft.com/en-us/library/cc246540.aspx)
       class EchoRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::ECHO
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size, label: 'Structure Size', initial_value: 4
         uint16       :reserved
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::ECHO
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Echo response Packet as defined in
       # [2.2.29 SMB2 ECHO Response](https://msdn.microsoft.com/en-us/library/cc246541.aspx)
       class EchoResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::ECHO
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size, label: 'Structure Size', initial_value: 4
@@ -11,7 +13,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command = RubySMB::SMB2::Commands::ECHO
           smb2_header.flags.reply = 1
         end
       end

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

@@ -3,10 +3,17 @@ module RubySMB
     module Packet
       # An SMB2 Error packet for when an incomplete response comes back
       class ErrorPacket < RubySMB::GenericPacket
+        attr_accessor :original_command
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size, label: 'Structure Size', initial_value: 4
         uint8        :error_data
+
+        def valid?
+          return smb2_header.protocol == RubySMB::SMB2::SMB2_PROTOCOL_ID &&
+            smb2_header.command == @original_command
+        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Ioctl Request Packet as defined in
       # [2.2.31 SMB2 IOCTL Request](https://msdn.microsoft.com/en-us/library/cc246545.aspx)
       class IoctlRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::IOCTL
+
         endian :little
 
         smb2_header   :smb2_header
@@ -30,11 +32,6 @@ module RubySMB
         uint32  :reserved2, label: 'Reserved Space'
         string  :buffer,    label: 'Input Buffer', read_length: -> { input_count + output_count }
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::IOCTL
-        end
-
         # Calculates the value for the input_offset field.
         # If the input buffer is empty then this should be set to 0,
         # otherwise it should return the absolute offset of the input buffer.

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Ioctl Response Packet as defined in
       # [2.2.32 SMB2 IOCTL Response](https://msdn.microsoft.com/en-us/library/cc246548.aspx)
       class IoctlResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::IOCTL
+
         endian :little
 
         smb2_header   :smb2_header
@@ -22,7 +24,6 @@ module RubySMB
         def initialize_instance
           super
           smb2_header.flags.reply = 1
-          smb2_header.command     = RubySMB::SMB2::Commands::IOCTL
         end
 
         def input_data

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

@@ -4,15 +4,13 @@ module RubySMB
       # An SMB2 LOGOFF Request Packet as defined in
       # [2.2.7 SMB2 LOGOFF Request](https://msdn.microsoft.com/en-us/library/cc246565.aspx)
       class LogoffRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::LOGOFF
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size, label: 'Structure Size', initial_value: 4
         uint16       :reserved,       label: 'Reserved Space'
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::LOGOFF
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 LOGOFF Response Packet as defined in
       # [2.2.8 SMB2 LOGOFF Response](https://msdn.microsoft.com/en-us/library/cc246566.aspx)
       class LogoffResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::LOGOFF
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size, label: 'Structure Size', initial_value: 4
@@ -11,7 +13,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command = RubySMB::SMB2::Commands::LOGOFF
           smb2_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 NEGOTIATE Request packet as defined by
       # [2.2.3 SMB2 NEGOTIATE Request](https://msdn.microsoft.com/en-us/library/cc246543.aspx)
       class NegotiateRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::NEGOTIATE
+
         endian              :little
         smb2_header         :smb2_header
         uint16              :structure_size,      label: 'Structure Size', initial_value: 36
@@ -15,11 +17,6 @@ module RubySMB
         file_time           :client_start_time,   label: 'Client Start Time',  initial_value: 0
         array               :dialects,            label: 'Dialects',           type: :uint16, read_until: :eof
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::NEGOTIATE
-        end
-
         # Adds a dialect to the Dialects array and increments the dialect count
         #
         # @param [Fixnum] the numeric code for the dialect you wish to add

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 NEGOTIATE Response packet as defined by
       # [2.2.4 SMB2 NEGOTIATE Response](https://msdn.microsoft.com/en-us/library/cc246561.aspx)
       class NegotiateResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::NEGOTIATE
+
         endian              :little
         smb2_header         :smb2_header
         uint16              :structure_size, label: 'Structure Size', initial_value: 65
@@ -24,7 +26,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command = RubySMB::SMB2::Commands::NEGOTIATE
           smb2_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Query Directory Request Packet as defined in
       # [2.2.33 SMB2 QUERY_DIRECTORY Request](https://msdn.microsoft.com/en-us/library/cc246551.aspx)
       class QueryDirectoryRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::QUERY_DIRECTORY
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size,          label: 'Structure Size', initial_value: 33
@@ -25,10 +27,6 @@ module RubySMB
         uint32        :output_length, label: 'Output Buffer Length'
         string16      :name,          label: 'Name/Search Pattern'
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::QUERY_DIRECTORY
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Query Directory Response Packet as defined in
       # [2.2.34 SMB2 QUERY_DIRECTORY Response](https://msdn.microsoft.com/en-us/library/cc246552.aspx)
       class QueryDirectoryResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::QUERY_DIRECTORY
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size,  label: 'Structure Size',       initial_value: 9
@@ -13,7 +15,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command = RubySMB::SMB2::Commands::QUERY_DIRECTORY
           smb2_header.flags.reply = 1
         end
 
@@ -23,6 +24,7 @@ module RubySMB
         #
         # @param klass [Class] the FileInformationClass class to read the data as
         # @return [array<BinData::Record>] An array of structs holding the requested information
+        # @raise [RubySMB::Error::InvalidPacket] if the string buffer is not a valid File Information
         def results(klass)
           information_classes = []
           blob = buffer.to_binary_s.dup
@@ -35,7 +37,11 @@ module RubySMB
                      blob.slice!(0, length)
                    end
 
-            information_classes << klass.read(data)
+            begin
+              information_classes << klass.read(data)
+            rescue IOError
+              raise RubySMB::Error::InvalidPacket, "Invalid #{klass} File Information in the string buffer"
+            end
           end
           information_classes
         end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Read Request Packet as defined in
       # [2.2.19 SMB2 READ Request](https://msdn.microsoft.com/en-us/library/cc246527.aspx)
       class ReadRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::READ
+
         endian :little
 
         smb2_header           :smb2_header
@@ -20,10 +22,6 @@ module RubySMB
         uint16                :channel_length,        label: 'Read Channel Info Length'
         string                :buffer,                label: 'Read Channel info Buffer', initial_value: 0x00
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::READ
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Read Response Packet as defined in
       # [2.2.20 SMB2 READ Response](https://msdn.microsoft.com/en-us/library/cc246531.aspx)
       class ReadResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::READ
+
         endian :little
 
         smb2_header   :smb2_header
@@ -17,7 +19,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command     = RubySMB::SMB2::Commands::READ
           smb2_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 SessionSetupRequest Packet as defined in
       # [2.2.5 SMB2 SESSION_SETUP Request](https://msdn.microsoft.com/en-us/library/cc246563.aspx)
       class SessionSetupRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::SESSION_SETUP
+
         endian                     :little
         smb2_header                :smb2_header
         uint16                     :structure_size,          label: 'Structure Size',          initial_value: 25
@@ -16,11 +18,6 @@ module RubySMB
         uint64                     :previous_session_id,     label: 'Previous Session ID'
         string                     :buffer,                  label: 'Security Buffer', length: -> { security_buffer_length }
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::SESSION_SETUP
-        end
-
         # Takes a serialized NTLM Type 1 message and wraps it in the GSS ASN1 encoding
         # and inserts it into the {RubySMB::SMB2::Packet::SessionSetupRequest#buffer}
         # as well as updating the {RubySMB::SMB2::Packet::SessionSetupRequest#security_buffer_length}

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 SessionSetupResponse Packet as defined in
       # [2.2.6 SMB2 SESSION_SETUP Response](https://msdn.microsoft.com/en-us/library/cc246564.aspx)
       class SessionSetupResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::SESSION_SETUP
+
         endian :little
         smb2_header         :smb2_header
         uint16              :structure_size, label: 'Structure Size', initial_value: 9
@@ -14,7 +16,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command = RubySMB::SMB2::Commands::SESSION_SETUP
           smb2_header.flags.reply = 1
         end
 

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Set Info Request Packet as defined in
       # [2.2.39 SMB2 SET_INFO Request](https://msdn.microsoft.com/en-us/library/cc246560.aspx)
       class SetInfoRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::SET_INFO
+
         include RubySMB::Fscc::FileInformation
 
         endian :little
@@ -48,10 +50,6 @@ module RubySMB
           file_id_full_directory_information FILE_ID_FULL_DIRECTORY_INFORMATION, label: 'File Id Full Directory Information'
         end
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::SET_INFO
-        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 Read Response Packet as defined in
       # [2.2.40 SMB2 SET_INFO Response](https://msdn.microsoft.com/en-us/library/cc246562.aspx)
       class SetInfoResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::SET_INFO
+
         endian :little
 
         smb2_header   :smb2_header
@@ -11,7 +13,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command     = RubySMB::SMB2::Commands::SET_INFO
           smb2_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 TreeConnectRequest Packet as defined in
       # [2.2.9 SMB2 TREE_CONNECT Request](https://msdn.microsoft.com/en-us/library/cc246567.aspx)
       class TreeConnectRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::TREE_CONNECT
+
         endian       :little
         smb2_header  :smb2_header
         uint16       :structure_size, label: 'Structure Size', initial_value: 9
@@ -12,11 +14,6 @@ module RubySMB
         uint16       :path_length,    label: 'Path Length',    initial_value: -> { path.length }
         string       :path,           label: 'Path Buffer'
 
-        def initialize_instance
-          super
-          smb2_header.command = RubySMB::SMB2::Commands::TREE_CONNECT
-        end
-
         def encode_path(path)
           self.path = path.encode('utf-16le')
         end

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

@@ -4,6 +4,8 @@ module RubySMB
       # An SMB2 TreeConnectResponse Packet as defined in
       # [2.2.10 SMB2 TREE_CONNECT Response](https://msdn.microsoft.com/en-us/library/cc246499.aspx)
       class TreeConnectResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB2::Commands::TREE_CONNECT
+
         endian :little
         smb2_header           :smb2_header
         uint16                :structure_size, label: 'Structure Size', initial_value: 16
@@ -15,7 +17,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb2_header.command = RubySMB::SMB2::Commands::TREE_CONNECT
           smb2_header.flags.reply = 1
         end
 
@@ -25,12 +26,17 @@ module RubySMB
         #
         # @return [RubySMB::SMB2::BitField::DirectoryAccessMask] if a directory was connected to
         # @return [RubySMB::SMB2::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?
             maximal_access
           else
             mask = maximal_access.to_binary_s
-            RubySMB::SMB2::BitField::FileAccessMask.read(mask)
+            begin
+              RubySMB::SMB2::BitField::FileAccessMask.read(mask)
+            rescue IOError
+              raise RubySMB::Error::InvalidBitField, 'Invalid ACCESS_MASK for the Maximal Share Access Rights'
+            end
           end
         end