ruby_smb 0.0.18 → 0.0.19

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

@@ -2,16 +2,15 @@ module RubySMB
   module SMB1
     module Packet
       module NtTrans
-
         # 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
-
           class ParameterBlock < RubySMB::SMB1::Packet::NtTrans::Response::ParameterBlock
           end
 
+          # The Trans2 Parameter Block for this particular Subcommand
           class Trans2Parameters < BinData::Record
-            endian  :little
+            endian :little
 
             uint8                     :oplock_level,        label: 'OpLock Level'
             uint8                     :reserved,            label: 'Reserved Space'
@@ -32,17 +31,16 @@ module RubySMB
             # Returns the length of the Trans2Parameters struct
             # in number of bytes
             def length
-              self.do_num_bytes
+              do_num_bytes
             end
           end
 
-
-
+          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
           class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
-            string            :pad1,               length: lambda { pad1_length }
+            string            :pad1,               length: -> { pad1_length }
             trans2_parameters :trans2_parameters,  label: 'Trans2 Parameters'
-            string            :pad2,               length: lambda { pad2_length }
-            string            :trans2_data,        label: 'Trans2 Data',            length: 0
+            string            :pad2,               length: -> { pad2_length }
+            string            :trans2_data,        label: 'Trans2 Data', length: 0
           end
 
           smb_header        :smb_header
@@ -58,4 +56,4 @@ module RubySMB
       end
     end
   end
-end
+end

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

@@ -2,33 +2,33 @@ module RubySMB
   module SMB1
     module Packet
       module NtTrans
-
         # 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
-
+          # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
-            endian        :little
+            endian :little
             uint8         :max_setup_count,       label: 'Max Setup Count'
             uint16        :reserved,              label: 'Reserved Space'
             uint32        :total_parameter_count, label: 'Total Parameter Count(bytes)'
             uint32        :total_data_count,      label: 'Total Data Count(bytes)'
             uint32        :max_parameter_count,   label: 'Max Parameter Count(bytes)'
             uint32        :max_data_count,        label: 'Max Data Count(bytes)'
-            uint32        :parameter_count,       label: 'Parameter Count(bytes)',         initial_value: lambda {self.parent.data_block.trans2_parameters.length}
-            uint32        :parameter_offset,      label: 'Parameter Offset',               initial_value: lambda {self.parent.data_block.trans2_parameters.abs_offset}
-            uint32        :data_count,            label: 'Data Count(bytes)',              initial_value: lambda {self.parent.data_block.trans2_data.length}
-            uint32        :data_offset,           label: 'Data Offset',                    initial_value: lambda {self.parent.data_block.trans2_data.abs_offset}
-            uint8         :setup_count,           label: 'Setup Count',                    initial_value: lambda {setup.length}
+            uint32        :parameter_count,       label: 'Parameter Count(bytes)',         initial_value: -> { parent.data_block.trans2_parameters.length }
+            uint32        :parameter_offset,      label: 'Parameter Offset',               initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
+            uint32        :data_count,            label: 'Data Count(bytes)',              initial_value: -> { parent.data_block.trans2_data.length }
+            uint32        :data_offset,           label: 'Data Offset',                    initial_value: -> { parent.data_block.trans2_data.abs_offset }
+            uint8         :setup_count,           label: 'Setup Count',                    initial_value: -> { setup.length }
             uint16        :function,              label: 'Function'
 
             array :setup, type: :uint16, initial_length: 0
           end
 
+          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
           class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
-            string :pad1,               length: lambda { pad1_length }
+            string :pad1, length: -> { pad1_length }
             string :trans2_parameters,  label: 'Trans2 Parameters'
-            string :pad2,               length: lambda { pad2_length }
+            string :pad2,               length: -> { pad2_length }
             string :trans2_data,        label: 'Trans2 Data'
           end
 
@@ -44,4 +44,4 @@ module RubySMB
       end
     end
   end
-end
+end

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

@@ -2,29 +2,29 @@ module RubySMB
   module SMB1
     module Packet
       module NtTrans
-
         # 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
-
+          # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
-            endian        :little
+            endian :little
 
-            array :reserved,  type: :uint8, inital_length: 3
+            array :reserved, type: :uint8, inital_length: 3
 
             uint32        :total_parameter_count,   label: 'Total Parameter Count(bytes)'
             uint32        :total_data_count,        label: 'Total Data Count(bytes)'
-            uint32        :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: lambda {self.parent.data_block.trans2_parameters.length}
-            uint32        :parameter_offset,        label: 'Parameter Offset',               initial_value: lambda {self.parent.data_block.trans2_parameters.abs_offset}
+            uint32        :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: -> { parent.data_block.trans2_parameters.length }
+            uint32        :parameter_offset,        label: 'Parameter Offset',               initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
             uint32        :parameter_displacement,  label: 'Parameter Displacement'
-            uint32        :data_count,              label: 'Data Count(bytes)',              initial_value: lambda {self.parent.data_block.trans2_data.length}
-            uint32        :data_offset,             label: 'Data Offset',                    initial_value: lambda {self.parent.data_block.trans2_data.abs_offset}
+            uint32        :data_count,              label: 'Data Count(bytes)',              initial_value: -> { parent.data_block.trans2_data.length }
+            uint32        :data_offset,             label: 'Data Offset',                    initial_value: -> { parent.data_block.trans2_data.abs_offset }
             uint32        :data_displacement,       label: 'Data Displacement'
-            uint8         :setup_count,             label: 'Setup Count',                    initial_value: lambda {setup.length}
+            uint8         :setup_count,             label: 'Setup Count', initial_value: -> { setup.length }
 
             array :setup, type: :uint16, initial_length: 0
           end
 
+          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
           class DataBlock < RubySMB::SMB1::Packet::NtTrans::Request::DataBlock
           end
 
@@ -41,4 +41,4 @@ module RubySMB
       end
     end
   end
-end
+end

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

@@ -3,7 +3,14 @@ module RubySMB
     module Packet
       module NtTrans
         module Subcommands
-          CREATE = 0x0001
+          CREATE              = 0x0001
+          IOCTL               = 0x0002
+          SET_SECURITY_DESC   = 0x0003
+          NOTIFY              = 0x0004
+          RENAME              = 0x0005
+          QUERY_SECURITY_DESC = 0x0006
+          GET_USER_QUOTA      = 0x0007
+          SET_USER_QUOTA      = 0x0008
         end
       end
     end

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

@@ -0,0 +1,84 @@
+module RubySMB
+  module SMB1
+    module Packet
+      # A SMB1 SMB_COM_READ_ANDX Request Packet as defined in
+      # [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
+        # A SMB1 Parameter Block as defined by the {ReadAndxRequest}
+        class ParameterBlock < RubySMB::SMB1::ParameterBlock
+          endian :little
+
+          and_x_block :andx_block
+          uint16      :fid,                          label: 'FID'
+          uint32      :offset,                       label: 'Offset'
+          uint16      :max_count_of_bytes_to_return, label: 'Max Count of Bytes to Return'
+          uint16      :min_count_of_bytes_to_return, label: 'Min Count of Bytes to Return'
+
+          choice :timeout_or_max_count_high, selection: -> { read_from_named_pipe } do
+            struct true do
+              uint32 :timeout,                       label: 'Timeout'
+            end
+            struct false do
+              uint16 :max_count_high,                label: 'Max Count High'
+              uint16 :reserved,                      label: 'Reserved'
+            end
+          end
+
+          uint16      :remaining,                        label: 'Remaining',     initial_value: 0x0000
+          uint32      :offset_high,                      label: 'Offset High',   onlyif: -> { word_count == 0x0C }
+
+          # Specifies if the file to read is a named pipe or a regular file.
+          # @return [TrueClass, FalseClass] true if reading from a named pipe, false otherwise
+          attr_accessor :read_from_named_pipe
+
+          def initialize_instance
+            super
+            @read_from_named_pipe = false
+          end
+
+          # Bypass the word count calculation to use 32-bit offset by default.
+          # As a result, the optional offset_high field won't be defined until
+          # #set_64_bit_offset(true) is explicitly called.
+          def calculate_word_count
+            0x0A
+          end
+          private :calculate_word_count
+        end
+
+        # Represents the specific layout of the DataBlock for a {ReadAndxRequest} Packet.
+        class DataBlock < RubySMB::SMB1::DataBlock
+        end
+
+        smb_header        :smb_header
+        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),
+        # for regular files, MaxCountHigh field will be used instead.
+        #
+        # @param read_from_named_pipe [TrueClass, FalseClass] the value the read_from_named_pipe flag is to be set to.
+        def set_read_from_named_pipe(read_from_named_pipe)
+          raise ArgumentError.new, 'The value can only be true or false' unless [true, false].include?(read_from_named_pipe)
+          parameter_block.read_from_named_pipe = read_from_named_pipe
+        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.
+        #
+        # @param is_64_bit [TrueClass, FalseClass] use a 64-bit offset if set to true, 32-bit otherwise
+        def set_64_bit_offset(is_64_bit)
+          raise ArgumentError.new, 'The value can only be true or false' unless [true, false].include?(is_64_bit)
+          parameter_block.word_count = is_64_bit ? 0x0C : 0x0A
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+module RubySMB
+  module SMB1
+    module Packet
+      # A SMB1 SMB_COM_READ_ANDX Response Packet as defined in
+      # [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
+        # A SMB1 Parameter Block as defined by the {ReadAndxResponse}
+        class ParameterBlock < RubySMB::SMB1::ParameterBlock
+          endian :little
+          and_x_block :andx_block
+          uint16      :available,            label: 'Available'
+          uint16      :data_compaction_mode, label: 'Data Compaction Mode', initial_value: 0x0000
+          uint16      :reserved,             label: 'Reserved'
+          uint16      :data_length,          label: 'Data Length'
+          uint16      :data_offset,          label: 'Data Offset'
+          uint16      :data_length_high,     label: 'Data Length High'
+          uint64      :reserved2,            label: 'Reserved'
+        end
+
+        # Represents the specific layout of the DataBlock for a {ReadAndxResponse} Packet.
+        class DataBlock < RubySMB::SMB1::DataBlock
+          uint8  :pad,  label: 'Pad',  onlyif: -> { has_padding? }
+          string :data, label: 'Data', read_length: -> { parent.parameter_block.data_length }
+
+          # This method checks if the optional pad field is present in the response.
+          def has_padding?
+            return false if byte_count.zero?
+            return true if byte_count - parent.parameter_block.data_length == 1
+            false
+          end
+          private :has_padding?
+        end
+
+        smb_header        :smb_header
+        parameter_block   :parameter_block
+        data_block        :data_block
+
+        def initialize_instance
+          super
+          smb_header.command = RubySMB::SMB1::Commands::SMB_COM_READ_ANDX
+          smb_header.flags.reply = 1
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,9 @@
 module RubySMB
   module SMB1
     module Packet
-
       # 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
-
         # A SMB1 Parameter Block as defined by the {SessionSetupRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block   :andx_block
@@ -13,8 +11,8 @@ module RubySMB
           uint16        :max_mpx_count,           label: 'Max Mpx Count'
           uint16        :vc_number,               label: 'VC Number'
           uint32        :session_key,             label: 'Session Key'
-          uint16        :oem_password_length,     label: 'OEM Password Length',       initial_value: lambda { self.parent.data_block.oem_password.length }
-          uint16        :unicode_password_length, label: 'Unicored Password Length',  initial_value: lambda { self.parent.data_block.unicode_password.length }
+          uint16        :oem_password_length,     label: 'OEM Password Length',       initial_value: -> { parent.data_block.oem_password.length }
+          uint16        :unicode_password_length, label: 'Unicored Password Length',  initial_value: -> { parent.data_block.unicode_password.length }
           uint32        :reserved
           capabilities  :capabilities
         end
@@ -42,8 +40,6 @@ module RubySMB
           smb_header.command = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
           parameter_block.capabilities.extended_security = 0
         end
-
-
       end
     end
   end

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

@@ -1,11 +1,9 @@
 module RubySMB
   module SMB1
     module Packet
-
       # 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
-
         # A SMB1 Parameter Block as defined by the {SessionSetupResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block   :andx_block
@@ -14,7 +12,7 @@ module RubySMB
 
         # Represents the specific layout of the DataBlock for a {SessionSetupResponse} Packet.
         class DataBlock < RubySMB::SMB1::DataBlock
-          string      :pad,            label: 'Padding',          length: 0
+          string      :pad,            label: 'Padding', length: 0
           stringz     :native_os,      label: 'Native OS'
           stringz     :native_lan_man, label: 'Native LAN Manager'
           stringz     :primary_domain, label: 'Primary Domain'
@@ -29,7 +27,6 @@ module RubySMB
           smb_header.command = RubySMB::SMB1::Commands::SMB_COM_SESSION_SETUP
           smb_header.flags.reply = 1
         end
-
       end
     end
   end

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

@@ -1,11 +1,9 @@
 module RubySMB
   module SMB1
     module Packet
-
       # 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
-
         # A SMB1 Parameter Block as defined by the {SessionSetupRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block   :andx_block
@@ -23,7 +21,7 @@ module RubySMB
         # for the security blob, you must null-terminate the {native_os} and {native_lan_man} fields
         # yourself if you set them away from their defaults.
         class DataBlock < RubySMB::SMB1::DataBlock
-          string      :security_blob,  label: 'Security Blob (GSS-API)', length: lambda { self.parent.parameter_block.security_blob_length }
+          string      :security_blob,  label: 'Security Blob (GSS-API)', length: -> { parent.parameter_block.security_blob_length }
           string      :native_os,      label: 'Native OS',             initial_value: "Windows 7 Ultimate N 7601 Service Pack 1\x00"
           string      :native_lan_man, label: 'Native LAN Manager',    initial_value: "Windows 7 Ultimate N 6.1\x00"
         end
@@ -48,7 +46,6 @@ module RubySMB
           gss_blob = RubySMB::Gss.gss_type1(type1_message)
           parameter_block.security_blob_length = gss_blob.length
           data_block.security_blob = gss_blob
-
         end
 
         # Takes an NTLM Type 3 Message and creates the GSS Security Blob
@@ -63,8 +60,6 @@ module RubySMB
           parameter_block.security_blob_length = gss_blob.length
           data_block.security_blob = gss_blob
         end
-
-
       end
     end
   end

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

@@ -1,21 +1,19 @@
 module RubySMB
   module SMB1
     module Packet
-
       # 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
-
         # A SMB1 Parameter Block as defined by the {SessionSetupResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block   :andx_block
           uint16        :action,       label: 'Action'
-          uint16        :security_blob_length,  label: 'Security Blob Length'
+          uint16        :security_blob_length, label: 'Security Blob Length'
         end
 
         # Represents the specific layout of the DataBlock for a {SessionSetupResponse} Packet.
         class DataBlock < RubySMB::SMB1::DataBlock
-          string      :security_blob,  label: 'Security Blob (GSS-API)', length: lambda { self.parent.parameter_block.security_blob_length }
+          string      :security_blob,  label: 'Security Blob (GSS-API)', length: -> { parent.parameter_block.security_blob_length }
           stringz     :native_os,      label: 'Native OS'
           stringz     :native_lan_man, label: 'Native LAN Manager'
         end

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

@@ -1,10 +1,10 @@
 module RubySMB
   module SMB1
     module Packet
-
       # Namespace for the Transaction2 sub-protocol documented in
       # [2.2.4.46 SMB_COM_TRANSACTION2 (0x32)](https://msdn.microsoft.com/en-us/library/ee441652.aspx)
       module Trans2
+        require 'ruby_smb/smb1/packet/trans2/find_information_level'
         require 'ruby_smb/smb1/packet/trans2/data_block'
         require 'ruby_smb/smb1/packet/trans2/subcommands'
         require 'ruby_smb/smb1/packet/trans2/request'
@@ -12,7 +12,13 @@ module RubySMB
         require 'ruby_smb/smb1/packet/trans2/response'
         require 'ruby_smb/smb1/packet/trans2/open2_request'
         require 'ruby_smb/smb1/packet/trans2/open2_response'
+        require 'ruby_smb/smb1/packet/trans2/find_first2_request'
+        require 'ruby_smb/smb1/packet/trans2/find_first2_response'
+        require 'ruby_smb/smb1/packet/trans2/find_next2_request'
+        require 'ruby_smb/smb1/packet/trans2/find_next2_response'
+        require 'ruby_smb/smb1/packet/trans2/set_file_information_request'
+        require 'ruby_smb/smb1/packet/trans2/set_file_information_response'
       end
     end
   end
-end
+end

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

@@ -2,7 +2,6 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
-
         # Extends the {RubySMB::SMB1::DataBlock} to include padding methods
         # that all Trans2 DataBlocks will need to handle proper byte alignment.
         class DataBlock < RubySMB::SMB1::DataBlock
@@ -22,11 +21,11 @@ module RubySMB
           # #trans2_parameters. It should always force a 4-byte alignment.
           def pad1_length
             if enable_padding
-              if self.respond_to?(:name)
-                offset = (name.abs_offset + 1) % 4
-              else
-                offset = (byte_count.abs_offset + 2) % 4
-              end
+              offset = if respond_to?(:name)
+                         (name.abs_offset + 1) % 4
+                       else
+                         (byte_count.abs_offset + 2) % 4
+                       end
               (4 - offset) % 4
             else
               0
@@ -47,4 +46,4 @@ module RubySMB
       end
     end
   end
-end
+end