ruby_smb 3.2.7 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c3642cdede7c8763296f8249419acad490605d06b8dc546411dab0ab25a7250
-  data.tar.gz: ff2403b3cd0e5b633fcee3db672dee4c4f582d13ac7bfbf3cd1dd7b4c9d2e5f4
+  metadata.gz: e4ddd94d3c783b3091a37c946c5069da85350c23294b33ddabcdc0476f828ec4
+  data.tar.gz: 990ad64d98bd60dd957c1b8b6fcf1abdbd6e8a52d408e0e6c03d3694354cb4ad
 SHA512:
-  metadata.gz: 97bd6b1bdf5b205eb8c21f1d5d980e03a616f7f25dba1219b280a199dbeb72fecc7c9dfe2efd2afa847a3e524f3ea167cc364d79e2be8b72e7e8788cdd5c29b9
-  data.tar.gz: 61ea09ea2cd46411ead8e4bef0ce4c9eb194d8e741b1a1b1bfdd582a260d89e04edc57bd4e47ae0603a1ae125846062dde03a47ff1b17095b8b605b725461d44
+  metadata.gz: bc7b1921009d55e8263ecfe3aa282bd4df35636a5055f5126ffa1866ed8140283bbfa14f341a4d791e30a7f51e0df631676ef211961c9712e457e0939983a6c7
+  data.tar.gz: 11982c6c2b2fb653756140c7024ccff301c72ee9b5ac44f85a5071f1d2a27dbdcf31b5936bc3ea646ef7219e3c917b5466ec3e6b26bbba116fc7552169244a4a

data/lib/ruby_smb/server/server_client/share_io.rb

@@ -11,7 +11,7 @@ module RubySMB
           end
 
           logger.debug("Received #{SMB1::Commands.name(request.smb_header.command)} request for share: #{share_processor.provider.name}")
-          share_processor.send(__callee__, request)
+          share_processor.share_io(__callee__, request)
         end
 
         alias :do_close_smb1          :proxy_share_io_smb1
@@ -29,7 +29,7 @@ module RubySMB
           end
 
           logger.debug("Received #{SMB2::Commands.name(request.smb2_header.command)} request for share: #{share_processor.provider.name}")
-          share_processor.send(__callee__, request)
+          share_processor.share_io(__callee__, request)
         end
 
         alias :do_close_smb2           :proxy_share_io_smb2

data/lib/ruby_smb/server/share/provider/disk.rb

@@ -14,13 +14,13 @@ module RubySMB
           # @param [String] name The name of this share.
           # @param [String, Pathname] path The local file system path to share. This path must be an absolute path to an existing
           #   directory.
-          def initialize(name, path)
+          def initialize(name, path, hooks: nil)
             path = Pathname.new(File.expand_path(path)) if path.is_a?(String)
             raise ArgumentError.new('path must be a directory') unless path.directory? # it needs to exist
             raise ArgumentError.new('path must be absolute') unless path.absolute? # it needs to be absolute so it is independent of the cwd
 
             @path = path
-            super(name)
+            super(name, hooks: hooks)
           end
 
           attr_accessor :path

data/lib/ruby_smb/server/share/provider/processor.rb

@@ -80,6 +80,31 @@ module RubySMB
               @server_client.server
             end
 
+            # Forward a share IO method for a particular request. This is a choke point to allow any hooks that were
+            # registered with the share provider to be executed before and after the specified method is invoked to
+            # process the request and generate the response. This is used for both SMB1 and SMB2 requests.
+            #
+            # @param [Symbol] method_name The method name to forward the request to
+            # @param [RubySMB::GenericPacket] request The request packet to be processed
+            # @return [RubySMB::GenericPacket]
+            def share_io(method_name, request)
+              @provider.hooks.each do |hook|
+                next unless hook.request_class == request.class && hook.location == :before
+
+                request = hook.callback.call(@session, request) || request
+              end
+
+              response = send(method_name, request)
+
+              @provider.hooks.each do |hook|
+                next unless hook.request_class == request.class && hook.location == :after
+
+                response = hook.callback.call(@session, request, response) || response
+              end
+
+              response
+            end
+
             # The underlying share provider that this is a processor for.
             # @!attribute [r] provider
             #   @return [RubySMB::Server::Share::Provider::Base]

data/lib/ruby_smb/server/share/provider/virtual_disk.rb

@@ -14,9 +14,9 @@ module RubySMB
           private_constant :HASH_METHODS
 
           # @param [String] name The name of this share.
-          def initialize(name)
+          def initialize(name, hooks: nil)
             @vfs = {}
-            super(name, add(VirtualPathname.new(self, File::SEPARATOR)))
+            super(name, add(VirtualPathname.new(self, File::SEPARATOR)), hooks: hooks)
           end
 
           # Add a dynamic file to the virtual file system. A dynamic file is one whose contents are generated by the
@@ -86,7 +86,7 @@ module RubySMB
           end
 
           def new_processor(server_client, session)
-            scoped_virtual_disk = self.class.new(@name)
+            scoped_virtual_disk = self.class.new(@name, hooks: @hooks)
             @vfs.each_value do |path|
               path = path.dup
               path.virtual_disk = scoped_virtual_disk if path.is_a?(VirtualPathname)

data/lib/ruby_smb/server/share/provider.rb

@@ -6,9 +6,51 @@ module RubySMB
         # type and name. It is shared across all client connections and
         # sessions.
         class Base
+          Hook = Struct.new(:request_class, :location, :callback)
+
           # @param [String] name The name of this share.
-          def initialize(name)
+          def initialize(name, hooks: nil)
             @name = name
+            @hooks = hooks || []
+          end
+
+          # Add a hook to be called when the specified request class is processed. Any hook that was previously
+          # installed for the request class and location will be removed. A hook installed with a location of :before
+          # will be called with the session and request as the only two arguments. The return value, if provided, will
+          # replace the request that is to be processed. A hook installed with a location of :after will be called with
+          # the session, request and response as the only three arguments. The return value, if provided, will replace
+          # the response that is to be sent to the client.
+          #
+          # @param [RubySMB::GenericPacket] request_class The request class to register the hook for.
+          # @param [Proc] callback The routine to be executed when the request class is being processed.
+          # @param [Symbol] location When the callback should be invoked. Must be either :before or :after.
+          def add_hook(request_class, callback: nil, location: :before, &block)
+            unless %i[ before after ].include?(location)
+              raise ArgumentError, 'the location argument must be :before or :after'
+            end
+
+            unless callback.nil? ^ block.nil?
+              raise ArgumentError, 'either a callback or a block must be specified'
+            end
+
+            # Remove any hooks that were previously installed, this enforces that only one hook can be present at a time
+            # for any particular request class and location combination.
+            remove_hook(request_class, location: location)
+            @hooks << Hook.new(request_class, location, callback || block)
+
+            nil
+          end
+
+          # Remove a hook for the specified request class.
+          #
+          # @param [RubySMB::GenericPacket] request_class The request class to register the hook for.
+          # @param [Symbol] location When the callback should be invoked.
+          def remove_hook(request_class, location: :before)
+            @hooks.filter! do |hook|
+              hook.request_class == request_class && hook.location == location
+            end
+
+            nil
           end
 
           # Create a new, session-specific processor instance for this share.
@@ -28,6 +70,11 @@ module RubySMB
           # @!attribute [r] name
           #   @return [String]
           attr_accessor :name
+
+          # The hooks installed for this share.
+          # @!attribute [r] hooks
+          #   @return [Array]
+          attr_accessor :hooks
         end
       end
     end

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

@@ -35,7 +35,7 @@ module RubySMB
           end
 
           uint64                             :allocation_size,     label: 'Allocation Size'
-          smb_ext_file_attributes            :ext_file_attributes, label: 'Extented File Attributes'
+          smb_ext_file_attributes            :ext_file_attributes, label: 'Extended File Attributes'
           share_access                       :share_access,        label: 'Share Access'
           # The following constants are defined in RubySMB::Dispositions
           uint32                             :create_disposition,  label: 'Create Disposition'

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '3.2.7'.freeze
+  VERSION = '3.2.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
 platform: ruby
 authors:
 - Metasploit Hackers