ruby_smb 0.0.18 → 0.0.19

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

@@ -2,16 +2,15 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
-
         # 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
-
           class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
           end
 
+          # The Trans2 Parameter Block for this particular Subcommand
           class Trans2Parameters < BinData::Record
-            endian  :little
+            endian :little
             uint8               :fid,             label: 'File ID'
             smb_file_attributes :file_attributes, label: 'File Attributes'
             utime               :creation_time,   label: 'Creation Time'
@@ -19,7 +18,7 @@ module RubySMB
             uint16              :resource_type,   label: 'Resource Type'
             smb_nmpipe_status   :nmpipe_status,   label: 'Named Pipe Status'
 
-            struct  :action_taken do
+            struct :action_taken do
               endian  :little
               bit6    :reserved,    label: 'Reserved Space'
               bit2    :open_result, label: 'Open Result'
@@ -35,15 +34,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
@@ -52,14 +52,12 @@ module RubySMB
 
           def initialize_instance
             super
-            smb_header.command     = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+            smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::OPEN2
             smb_header.flags.reply = 1
           end
-
-
         end
       end
     end
   end
-end
+end

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

@@ -2,36 +2,36 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
-
         # 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
-
+          # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
             uint16        :total_parameter_count, label: 'Total Parameter Count(bytes)'
             uint16        :total_data_count,      label: 'Total Data Count(bytes)'
             uint16        :max_parameter_count,   label: 'Max Parameter Count(bytes)'
             uint16        :max_data_count,        label: 'Max Data Count(bytes)'
             uint8         :max_setup_count,       label: 'Max Setup Count'
-            uint8         :reserved,              label: 'Reserved Space',                 initial_value: 0x00
+            uint8         :reserved,              label: 'Reserved Space',         initial_value: 0x00
             trans2_flags  :flags
-            uint32        :timeout,               label: 'Timeout',                        initial_value: 0x00000000
-            uint16        :reserved2,             label: 'Reserved Space',                 initial_value: 0x00
-            uint16        :parameter_count,       label: 'Parameter Count(bytes)',         initial_value: lambda {self.parent.data_block.trans2_parameters.length}
-            uint16        :parameter_offset,      label: 'Parameter Offset',               initial_value: lambda {self.parent.data_block.trans2_parameters.abs_offset}
-            uint16        :data_count,            label: 'Data Count(bytes)',              initial_value: lambda {self.parent.data_block.trans2_data.length}
-            uint16        :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}
-            uint8         :reserved3,             label: 'Reserved Space',                 initial_value: 0x00
+            uint32        :timeout,               label: 'Timeout',                initial_value: 0x00000000
+            uint16        :reserved2,             label: 'Reserved Space',         initial_value: 0x00
+            uint16        :parameter_count,       label: 'Parameter Count(bytes)', initial_value: -> { parent.data_block.trans2_parameters.length }
+            uint16        :parameter_offset,      label: 'Parameter Offset',       initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
+            uint16        :data_count,            label: 'Data Count(bytes)',      initial_value: -> { parent.data_block.trans2_data.length }
+            uint16        :data_offset,           label: 'Data Offset',            initial_value: -> { parent.data_block.trans2_data.abs_offset }
+            uint8         :setup_count,           label: 'Setup Count',            initial_value: -> { setup.length }
+            uint8         :reserved3,             label: 'Reserved Space',         initial_value: 0x00
 
             array :setup, type: :uint16, initial_length: 0
           end
 
+          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
           class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
-            uint8  :name,               label: 'Name',              initial_value: 0x00
-            string :pad1,               length: lambda { pad1_length }
+            uint8  :name,               label: 'Name', initial_value: 0x00
+            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
 
@@ -43,10 +43,8 @@ module RubySMB
             super
             smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
           end
-
-
         end
       end
     end
   end
-end
+end

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

@@ -2,23 +2,23 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
-
         # 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
-
+          # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
-            uint16  :total_parameter_count,   label: 'Total Parameter Count(bytes)'
+            uint16 :total_parameter_count, label: 'Total Parameter Count(bytes)'
             uint16  :total_data_count,        label: 'Total Data Count(bytes)'
-            uint16  :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: lambda {self.parent.data_block.trans2_parameters.length}
-            uint16  :parameter_offset,        label: 'Parameter Offset',               initial_value: lambda {self.parent.data_block.trans2_parameters.abs_offset}
+            uint16  :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: -> { parent.data_block.trans2_parameters.length }
+            uint16  :parameter_offset,        label: 'Parameter Offset',               initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
             uint16  :parameter_displacement,  label: 'Parameter Displacement'
-            uint16  :data_count,              label: 'Data Count(bytes)',              initial_value: lambda {self.parent.data_block.trans2_data.length}
-            uint16  :data_offset,             label: 'Data Offset',                    initial_value: lambda {self.parent.data_block.trans2_data.abs_offset}
+            uint16  :data_count,              label: 'Data Count(bytes)',              initial_value: -> { parent.data_block.trans2_data.length }
+            uint16  :data_offset,             label: 'Data Offset',                    initial_value: -> { parent.data_block.trans2_data.abs_offset }
             uint16  :data_displacement,       label: 'Data Displacement'
             uint16  :fid,                     label: 'FileID'
           end
 
+          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
           class DataBlock < RubySMB::SMB1::Packet::Trans2::Request::DataBlock
           end
 
@@ -30,10 +30,8 @@ module RubySMB
             super
             smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2_SECONDARY
           end
-
-
         end
       end
     end
   end
-end
+end

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

@@ -2,31 +2,31 @@ module RubySMB
   module SMB1
     module Packet
       module Trans2
-
         # 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
-
+          # The {RubySMB::SMB1::ParameterBlock} specific to this packet type.
           class ParameterBlock < RubySMB::SMB1::ParameterBlock
-            uint16        :total_parameter_count,   label: 'Total Parameter Count(bytes)'
+            uint16 :total_parameter_count, label: 'Total Parameter Count(bytes)'
             uint16        :total_data_count,        label: 'Total Data Count(bytes)'
             uint16        :reserved,                label: 'Reserved Space',                 initial_value: 0x00
-            uint16        :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: lambda {self.parent.data_block.trans2_parameters.length}
-            uint16        :parameter_offset,        label: 'Parameter Offset',               initial_value: lambda {self.parent.data_block.trans2_parameters.abs_offset}
+            uint16        :parameter_count,         label: 'Parameter Count(bytes)',         initial_value: -> { parent.data_block.trans2_parameters.length }
+            uint16        :parameter_offset,        label: 'Parameter Offset',               initial_value: -> { parent.data_block.trans2_parameters.abs_offset }
             uint16        :parameter_displacement,  label: 'Parameter Displacement'
-            uint16        :data_count,              label: 'Data Count(bytes)',              initial_value: lambda {self.parent.data_block.trans2_data.length}
-            uint16        :data_offset,             label: 'Data Offset',                    initial_value: lambda {self.parent.data_block.trans2_data.abs_offset}
+            uint16        :data_count,              label: 'Data Count(bytes)',              initial_value: -> { parent.data_block.trans2_data.length }
+            uint16        :data_offset,             label: 'Data Offset',                    initial_value: -> { parent.data_block.trans2_data.abs_offset }
             uint16        :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 }
             uint8         :reserved2,               label: 'Reserved Space',                 initial_value: 0x00
 
             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
 
@@ -39,10 +39,8 @@ module RubySMB
             smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
             smb_header.flags.reply = 1
           end
-
-
         end
       end
     end
   end
-end
+end

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

@@ -0,0 +1,66 @@
+module RubySMB
+  module SMB1
+    module Packet
+      module Trans2
+        # 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
+          class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
+          end
+
+          # The Trans2 Parameter Block for this particular Subcommand
+          class Trans2Parameters < BinData::Record
+            endian :little
+
+            uint16  :fid,               label: 'FID'
+            uint16  :information_level, label: 'Information Level'
+            uint16  :reserved,          label: 'Reserved Space'
+
+            # Returns the length of the Trans2Parameters struct
+            # in number of bytes
+            def length
+              do_num_bytes
+            end
+          end
+
+          # The Trans2 Data Block for this particular Subcommand
+          class Trans2Data < BinData::Record
+            include RubySMB::Fscc::FileInformation
+
+            choice :info_level_struct, selection: -> { parent.trans2_parameters.information_level } do
+              # It supports new pass-through Information Level capabilities, as specified in
+              # [2.2.2.3.5 Pass-through Information Level Codes](https://msdn.microsoft.com/en-us/library/ff470158.aspx)
+              file_disposition_information (FILE_DISPOSITION_INFORMATION + SMB_INFO_PASSTHROUGH), label: 'File Disposition Information'
+              file_rename_information      (FILE_RENAME_INFORMATION + SMB_INFO_PASSTHROUGH),      label: 'File Rename Information'
+            end
+
+            # Returns the length of the Trans2Data struct
+            # in number of bytes
+            def length
+              do_num_bytes
+            end
+          end
+
+          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
+          class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
+            uint8              :name,               label: 'Name', initial_value: 0x00
+            string             :pad1,               length: -> { pad1_length }
+            trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
+            string             :pad2,               length: -> { pad2_length }
+            trans2_data        :trans2_data,        label: 'Trans2 Data'
+          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_TRANSACTION2
+            parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::SET_FILE_INFORMATION
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+module RubySMB
+  module SMB1
+    module Packet
+      module Trans2
+        # 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
+          class ParameterBlock < RubySMB::SMB1::Packet::Trans2::Response::ParameterBlock
+          end
+
+          # The Trans2 Parameter Block for this particular Subcommand
+          class Trans2Parameters < BinData::Record
+            endian :little
+
+            uint16 :ea_error_offset, label: 'Extended Attribute Error Offset'
+
+            # Returns the length of the Trans2Parameters struct
+            # in number of bytes
+            def length
+              do_num_bytes
+            end
+          end
+
+          # The Trans2 Data Block for this particular Subcommand
+          class Trans2Data < BinData::Record
+
+            # Returns the length of the Trans2Data struct
+            # in number of bytes
+            def length
+              do_num_bytes
+            end
+          end
+
+          # The {RubySMB::SMB1::DataBlock} specific to this packet type.
+          class DataBlock < RubySMB::SMB1::Packet::Trans2::DataBlock
+            uint8              :name,               label: 'Name', initial_value: 0x00
+            string             :pad1,               length: -> { pad1_length }
+            trans2_parameters  :trans2_parameters,  label: 'Trans2 Parameters'
+            string             :pad2,               length: -> { pad2_length }
+            trans2_data        :trans2_data,        label: 'Trans2 Data'
+          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_TRANSACTION2
+            parameter_block.setup << RubySMB::SMB1::Packet::Trans2::Subcommands::SET_FILE_INFORMATION
+            smb_header.flags.reply = 1
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,8 +3,11 @@ module RubySMB
     module Packet
       module Trans2
         module Subcommands
-          OPEN2         = 0x0000
-          SESSION_SETUP = 0x000E
+          OPEN2                = 0x0000
+          FIND_FIRST2          = 0x0001
+          FIND_NEXT2           = 0x0002
+          SET_FILE_INFORMATION = 0x0008
+          SESSION_SETUP        = 0x000E
         end
       end
     end

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

@@ -1,11 +1,9 @@
 module RubySMB
   module SMB1
     module Packet
-
       # 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
-
         # A SMB1 Parameter Block as defined by the {TreeConnectRequest}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block          :andx_block
@@ -13,10 +11,11 @@ module RubySMB
           uint16               :password_length, label: 'Password Length', initial_value: 0x01
         end
 
+        # The {RubySMB::SMB1::DataBlock} specific to this packet type.
         class DataBlock < RubySMB::SMB1::DataBlock
-          stringz  :password, label: 'Password Field', initial_value: '',    length: lambda { self.parent.parameter_block.password_length }
+          stringz :password, label: 'Password Field', initial_value: '', length: -> { parent.parameter_block.password_length }
           stringz  :path,     label: 'Resource Path'
-          stringz  :service,  label: 'Resource Type',  initial_value: '?????'
+          stringz  :service,  label: 'Resource Type', initial_value: '?????'
         end
 
         smb_header        :smb_header
@@ -27,8 +26,7 @@ module RubySMB
           super
           smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TREE_CONNECT
         end
-
       end
     end
   end
-end
+end

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

@@ -1,11 +1,9 @@
 module RubySMB
   module SMB1
     module Packet
-
       # 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
-
         # A SMB1 Parameter Block as defined by the {SessionSetupResponse}
         class ParameterBlock < RubySMB::SMB1::ParameterBlock
           and_x_block                :andx_block
@@ -38,9 +36,9 @@ module RubySMB
         # @return [RubySMB::SMB1::BitField::FileAccessMask] if anything else was connected to
         def access_rights
           if is_directory?
-            self.parameter_block.access_rights
+            parameter_block.access_rights
           else
-            mask = self.parameter_block.access_rights.to_binary_s
+            mask = parameter_block.access_rights.to_binary_s
             RubySMB::SMB1::BitField::FileAccessMask.read(mask)
           end
         end
@@ -53,9 +51,9 @@ module RubySMB
         # @return [RubySMB::SMB1::BitField::FileAccessMask] if anything else was connected to
         def guest_access_rights
           if is_directory?
-            self.parameter_block.guest_access_rights
+            parameter_block.guest_access_rights
           else
-            mask = self.parameter_block.guest_access_rights.to_binary_s
+            mask = parameter_block.guest_access_rights.to_binary_s
             RubySMB::SMB1::BitField::FileAccessMask.read(mask)
           end
         end
@@ -66,7 +64,7 @@ module RubySMB
         # @return [TrueClass] if service is 'A:'
         # @return [FalseClass] if service is NOT 'A:'
         def is_directory?
-          self.data_block.service == 'A:'
+          data_block.service == 'A:'
         end
       end
     end

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

@@ -1,12 +1,11 @@
 module RubySMB
   module SMB1
     module Packet
-
       # 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
-
         # 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
         end
 
@@ -22,8 +21,7 @@ module RubySMB
           super
           smb_header.command = RubySMB::SMB1::Commands::SMB_COM_TREE_DISCONNECT
         end
-
       end
     end
   end
-end
+end