ruby_smb 1.0.2 → 2.0.0

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

@@ -1,12 +1,21 @@
 module RubySMB
   module SMB1
     module Packet
-      # This packet represent an SMB1 Response Packet when the parameter and
+      # This packet represent an SMB1 Error 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 &&
+                 parameter_block.word_count == 0 &&
+                 data_block.byte_count == 0
+        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

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_ANDX
+
         # 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

@@ -1,9 +1,11 @@
 module RubySMB
   module SMB1
     module Packet
-      # A SMB1 SMB_COM_SESSION_SETUP Legacy Response Packet as defined in
+      # A SMB1 SMB_COM_SESSION_SETUP_ANDX 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_ANDX
+
         # 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_ANDX
+
         # 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

@@ -1,9 +1,11 @@
 module RubySMB
   module SMB1
     module Packet
-      # A SMB1 SMB_COM_SESSION_SETUP Response Packet as defined in
+      # A SMB1 SMB_COM_SESSION_SETUP_ANDX 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_ANDX
+
         # 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