ruby_smb 1.0.3 → 1.0.4

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

@@ -5,6 +5,8 @@ module RubySMB
       # [2.2.4.42.1 Request](https://msdn.microsoft.com/en-us/library/ee441839.aspx)
       # [2.2.4.2.1 Client Request Extensions](https://msdn.microsoft.com/en-us/library/ff470250.aspx)
       class ReadAndxRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_READ_ANDX
+
         # A SMB1 Parameter Block as defined by the {ReadAndxRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           endian :little
@@ -54,11 +56,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_READ_ANDX
-        end
-
         # Sets the read_from_named_pipe flag to `read_from_named_pipe` value (true or false).
         # When reading from a named pipe, this flag needs to be set to true, which forces
         # the use of Timeout field in Timeout_or_MaxCountHigh. When set to false (default),

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

@@ -5,6 +5,8 @@ module RubySMB
       # [2.2.4.42.2 Response](https://msdn.microsoft.com/en-us/library/ee441872.aspx)
       # [2.2.4.2.2 Server Response Extensions](https://msdn.microsoft.com/en-us/library/ff470017.aspx)
       class ReadAndxResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_READ_ANDX
+
         # A SMB1 Parameter Block as defined by the {ReadAndxResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           endian :little
@@ -38,7 +40,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_READ_ANDX
           smb_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_SESSION_SETUP_ANDX Request Packet, without NTLMSSP as defined in
       # [2.2.4.53.1 Request](https://msdn.microsoft.com/en-us/library/ee441849.aspx)
       class SessionSetupLegacyRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
+
         # A SMB1 Parameter Block as defined by the {SessionSetupRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block   :andx_block
@@ -37,7 +39,6 @@ module RubySMB
 
         def initialize_instance
           super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
           parameter_block.capabilities.extended_security = 0
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_SESSION_SETUP Legacy Response Packet as defined in
       # [2.2.4.53.2 Response](https://msdn.microsoft.com/en-us/library/ee442143.aspx)
       class SessionSetupLegacyResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
+
         # 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_SESSION_SETUP
           smb_header.flags.reply = 1
         end
       end

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_SESSION_SETUP_ANDX Request Packet as defined in
       # [2.2.4.6.1](https://msdn.microsoft.com/en-us/library/cc246328.aspx)
       class SessionSetupRequest < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
+
         # A SMB1 Parameter Block as defined by the {SessionSetupRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block   :andx_block
@@ -30,11 +32,6 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
-        def initialize_instance
-          super
-          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
-        end
-
         # Takes an NTLM Type 1 Message and creates the GSS Security Blob
         # for it and sets it in the {RubySMB::SMB1::Packet::SessionSetupRequest::DataBlock#security_blob}
         # field. It also automaticaly sets the length in

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

@@ -4,6 +4,8 @@ module RubySMB
       # A SMB1 SMB_COM_SESSION_SETUP Response Packet as defined in
       # [2.2.4.6.2](https://msdn.microsoft.com/en-us/library/cc246329.aspx)
       class SessionSetupResponse < RubySMB::GenericPacket
+        COMMAND = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
+
         # 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_SESSION_SETUP
           smb_header.flags.reply = 1
         end
 

data/lib/ruby_smb/smb1/packet/trans/peek_nmpipe_request.rb

@@ -12,7 +12,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
             data_block.name = "\\PIPE\\"
             parameter_block.setup << RubySMB::SMB1::Packet::Trans::Subcommands::PEEK_NMPIPE
             parameter_block.setup_count = 2

data/lib/ruby_smb/smb1/packet/trans/peek_nmpipe_response.rb

@@ -5,6 +5,8 @@ module RubySMB
         # This class represents an SMB1 Trans PeekNamedPipe Response Packet as defined in
         # [2.2.5.5.2 Response](https://msdn.microsoft.com/en-us/library/ee441883.aspx)
         class PeekNmpipeResponse < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans::Response::ParameterBlock
           end
 
@@ -22,7 +24,7 @@ module RubySMB
               do_num_bytes
             end
           end
-          
+
           class TransData < BinData::Record
             string :read_data, label: 'Readable data', length: -> { parent.parameter_block.total_data_count }
 
@@ -48,7 +50,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
             smb_header.flags.reply = 1
             parameter_block.setup << RubySMB::SMB1::Packet::Trans::Subcommands::PEEK_NMPIPE
           end

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

@@ -6,6 +6,8 @@ module RubySMB
         # This class represents a generic SMB1 Trans Request Packet as defined in
         # [2.2.4.33.1 Request](https://msdn.microsoft.com/en-us/library/ee441730.aspx)
         class Request < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
+
           # A SMB1 Parameter Block
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             uint16      :total_parameter_count, label: 'Total Parameter Count(bytes)', initial_value: -> { parameter_count }
@@ -48,11 +50,6 @@ module RubySMB
           parameter_block   :parameter_block
           data_block        :data_block
 
-          def initialize_instance
-            super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
-          end
-
         end
       end
     end

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

@@ -6,6 +6,8 @@ module RubySMB
         # This class represents a generic SMB1 Trans Response Packet as defined in
         # [2.2.4.33.2 Response](https://msdn.microsoft.com/en-us/library/ee442061.aspx)
         class Response < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
+
           # A SMB1 Parameter Block
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             uint16 :total_parameter_count,  label: 'Total Parameter Count(bytes)', initial_value: -> { parameter_count }
@@ -35,7 +37,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
             smb_header.flags.reply = 1
           end
 

data/lib/ruby_smb/smb1/packet/trans/transact_nmpipe_request.rb

@@ -6,6 +6,7 @@ module RubySMB
         # A Trans TRANSACT_NMPIPE Request Packet as defined in
         # [2.2.5.6.1 Request](https://msdn.microsoft.com/en-us/library/ee441832.aspx)
         class TransactNmpipeRequest < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
 
           class ParameterBlock < RubySMB::SMB1::Packet::Trans::Request::ParameterBlock
           end
@@ -42,7 +43,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
             parameter_block.max_parameter_count = 0x0000
             parameter_block.max_setup_count = 0x00
             parameter_block.setup << RubySMB::SMB1::Packet::Trans::Subcommands::TRANSACT_NMPIPE

data/lib/ruby_smb/smb1/packet/trans/transact_nmpipe_response.rb

@@ -6,6 +6,7 @@ module RubySMB
         # A Trans TRANSACT_NMPIPE Response Packet as defined in
         # [2.2.5.6.2 Response](https://msdn.microsoft.com/en-us/library/ee442003.aspx)
         class TransactNmpipeResponse < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
 
           class ParameterBlock < RubySMB::SMB1::Packet::Trans::Response::ParameterBlock
           end
@@ -33,7 +34,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION
             smb_header.flags.reply = 1
           end
 

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

@@ -5,6 +5,8 @@ module RubySMB
         # A Trans2 FIND_FIRST2 Request Packet as defined in
         # [2.2.6.2.1](https://msdn.microsoft.com/en-us/library/ee441987.aspx)
         class FindFirst2Request < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
           end
 
@@ -67,7 +69,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_FIRST2
           end
         end

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

@@ -5,6 +5,8 @@ module RubySMB
         # This class represents an SMB1 Trans2 FIND_FIRST2 Response Packet as defined in
         # [2.2.6.2.2 Response](https://msdn.microsoft.com/en-us/library/ee441704.aspx)
         class FindFirst2Response < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
           end
 
@@ -51,7 +53,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_FIRST2
             smb_header.flags.reply = 1
           end
@@ -62,6 +63,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 packet
           def results(klass, unicode:)
             information_classes = []
             blob = data_block.trans2_data.buffer.to_binary_s.dup
@@ -76,7 +78,11 @@ module RubySMB
 
               file_info = klass.new
               file_info.unicode = unicode
-              information_classes << file_info.read(data)
+              begin
+                information_classes << file_info.read(data)
+              rescue IOError
+                raise RubySMB::Error::InvalidPacket, "Invalid #{klass} File Information packet in the string buffer"
+              end
             end
             information_classes
           end

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

@@ -5,6 +5,8 @@ module RubySMB
         # A Trans2 FIND_NEXT2 Request Packet as defined in
         # [2.2.6.3.1 Request](https://msdn.microsoft.com/en-us/library/ee441844.aspx)
         class FindNext2Request < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
           end
 
@@ -67,7 +69,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_NEXT2
           end
         end

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

@@ -5,6 +5,8 @@ module RubySMB
         # This class represents an SMB1 Trans2 FIND_NEXT2 Response Packet as defined in
         # [2.2.6.3.2 Response](https://msdn.microsoft.com/en-us/library/ee441871.aspx)
         class FindNext2Response < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
           end
 
@@ -50,7 +52,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_NEXT2
             smb_header.flags.reply = 1
           end
@@ -61,6 +62,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 packet
           def results(klass, unicode:)
             information_classes = []
             blob = data_block.trans2_data.buffer.to_binary_s.dup
@@ -75,7 +77,11 @@ module RubySMB
 
               file_info = klass.new
               file_info.unicode = unicode
-              information_classes << file_info.read(data)
+              begin
+                information_classes << file_info.read(data)
+              rescue IOError
+                raise RubySMB::Error::InvalidPacket, "Invalid #{klass} File Information packet in the string buffer"
+              end
             end
             information_classes
           end

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

@@ -5,6 +5,8 @@ module RubySMB
         # A Trans2 OPEN2 Request Packet as defined in
         # [2.2.6.1.1 Request](https://msdn.microsoft.com/en-us/library/ee441733.aspx)
         class Open2Request < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
           end
 
@@ -50,7 +52,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::OPEN2
           end
         end

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

@@ -5,6 +5,8 @@ module RubySMB
         # This class represents an SMB1 Trans2 Open2 Response Packet as defined in
         # [2.2.6.1.2 Response](https://msdn.microsoft.com/en-us/library/ee441545.aspx)
         class Open2Response < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
           end
 
@@ -52,7 +54,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::OPEN2
             smb_header.flags.reply = 1
           end

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

@@ -5,6 +5,8 @@ module RubySMB
         # This class represents a generic SMB1 Trans2 Request Packet as defined in
         # [2.2.4.46.1 Request](https://msdn.microsoft.com/en-us/library/ee442192.aspx)
         class Request < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             uint16        :total_parameter_count, label: 'Total Parameter Count(bytes)'
@@ -39,10 +41,6 @@ module RubySMB
           parameter_block   :parameter_block
           data_block        :data_block
 
-          def initialize_instance
-            super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
-          end
         end
       end
     end

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

@@ -5,6 +5,8 @@ module RubySMB
         # This class represents a generic SMB1 Trans2 Secondary Request Packet as defined in
         # [2.2.4.47.1 Request](https://msdn.microsoft.com/en-us/library/ee442105.aspx)
         class RequestSecondary < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2_SECONDARY
+
           # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             uint16 :total_parameter_count, label: 'Total Parameter Count(bytes)'
@@ -26,10 +28,6 @@ module RubySMB
           parameter_block   :parameter_block
           data_block        :data_block
 
-          def initialize_instance
-            super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2_SECONDARY
-          end
         end
       end
     end

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

@@ -5,6 +5,8 @@ module RubySMB
         # This class represents a generic SMB1 Trans2 Response Packet as defined in
         # [2.2.4.46.2 Response](https://msdn.microsoft.com/en-us/library/ee441550.aspx)
         class Response < RubySMB::GenericPacket
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             uint16 :total_parameter_count, label: 'Total Parameter Count(bytes)'
@@ -36,7 +38,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             smb_header.flags.reply = 1
           end
         end

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

@@ -5,6 +5,8 @@ module RubySMB
         # 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
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
           end
 
@@ -56,7 +58,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::SET_FILE_INFORMATION
           end
         end

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

@@ -5,6 +5,8 @@ module RubySMB
         # 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
+          COMMAND = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
           end
 
@@ -46,7 +48,6 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::SET_FILE_INFORMATION
             smb_header.flags.reply = 1
           end