ruby_smb 3.3.16 → 3.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f3e7d4b38a0c2cbae5b04d401f988e0eb90585374877983c5d0f249935379b
-  data.tar.gz: dc98770e931bf9c6ee4edd80a0a1bba2a2ac6ff75aef12b96f5c00efa1612074
+  metadata.gz: df07f2b672976e5cff3e2a4a724038b9557ce8db1d01faa089348f0dc472592a
+  data.tar.gz: 936642cf5e5d3dfcef265af694eb37d58f83cbdfd9f3e337fade9dd5f9f4d39f
 SHA512:
-  metadata.gz: bb9b0288dc73c844c6707aa1bbd5e7db38a8f1a92240695e4fda6ecbe94bddcb049270a4b6ad96038cabda1a871ebb026ad1ef868c366fe17f804f9c107ba3ee
-  data.tar.gz: 3fc829b270e287d4e87de00b08c17ed9fa9bf325191582f88cb252a0b64f9b0ec4c1b8d2ffae6ef7200ad42ea3daa7192f54edd8c829540783a980ae920b92e3
+  metadata.gz: 33201873ef84ff27d62f8381e52d25da7ce2e4831a262987682050b2deedebcdfe382f4177c5d375268a43fcddc78d195a06368f0d6919a21be34a32544254e3
+  data.tar.gz: 978a64324e79c8f183599ad05d1291f4b172deb9ddc1d1e669acbc68e8c179d17cfd367138a4c5bb49aa7abd4063758a8e7b36023ecd8b11a427b086c2ecd154

data/lib/ruby_smb/client/authentication.rb

@@ -31,6 +31,7 @@ module RubySMB
       #
       # @return [WindowsError::ErrorCode] the status code the server returned
       def smb1_anonymous_auth
+        @mech_type = :anonymous
         request       = smb1_anonymous_auth_request
         raw_response  = send_recv(request)
         response      = smb1_anonymous_auth_response(raw_response)
@@ -73,6 +74,7 @@ module RubySMB
       # Handles the SMB1 NTLMSSP 4-way handshake for Authentication and store
       # information about the peer/server.
       def smb1_authenticate
+        @mech_type = :ntlm
         response = smb1_ntlmssp_negotiate
         challenge_packet = smb1_ntlmssp_challenge_packet(response)
 
@@ -205,6 +207,7 @@ module RubySMB
       # Handles the SMB2 NTLMSSP 4-way handshake for Authentication and store
       # information about the peer/server.
       def smb2_authenticate
+        @mech_type = :ntlm
         response = smb2_ntlmssp_negotiate
         challenge_packet = smb2_ntlmssp_challenge_packet(response)
         if @dialect == '0x0311'

data/lib/ruby_smb/client.rb

@@ -517,6 +517,18 @@ module RubySMB
         break
       end unless version == 'SMB1'
 
+      # Handle STATUS_NETWORK_SESSION_EXPIRED. The 'net use' client upon receiving this error will automatically attempt
+      # to re-authenticate, which makes relaying ntlm authentication to multiple targets possible. This block ensures
+      # ruby_smb behaves in the same manner as 'net use'.
+      if smb2_header && smb2_header.nt_status == WindowsError::NTStatus::STATUS_NETWORK_SESSION_EXPIRED && !@mech_type.nil?
+        if @mech_type == :ntlm || @mech_type == :anonymous
+          session_setup(self.username, self.password, self.domain, local_workstation: self.local_workstation, ntlm_flags: NTLM::DEFAULT_CLIENT_FLAGS)
+          raw_response = send_recv(packet, encrypt: encrypt) # Retry the request after re-authentication
+        elsif  @mech_type == :kerberos
+          raise RubySMB::Error::RubySMBError, 'WindowsError::NTStatus::STATUS_NETWORK_SESSION_EXPIRED received, but kerberos authentication is being used, so automatic re-authentication cannot be attempted.'
+        end
+      end
+
       self.sequence_counter += 1 if signing_required && !session_key.empty?
       # update the SMB2 message ID according to the received Credit Charged
       self.smb2_message_id += smb2_header.credit_charge - 1 if smb2_header && self.server_supports_multi_credit

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

@@ -2,8 +2,8 @@ module RubySMB
   module SMB1
     module Packet
       # A SMB1 SMB_COM_NT_CREATE_ANDX Response Packet as defined in
-      # [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)
+      # [MS-CIFS: 2.2.4.64.2 Response](https://msdn.microsoft.com/en-us/library/ee441612.aspx) and
+      # [MS-SMB : 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
 
@@ -35,15 +35,28 @@ module RubySMB
           end
 
           uint8                   :directory,           label: 'Directory'
-          string                  :volume_guid,         label: 'Volume GUID', length: 16
-          uint64                  :file_id,             label: 'File ID'
+          # MS-CIFS: 2.2.4.64.2 (WC=34)
+          # MS-SMB:  2.2.4.9.2  (WC=42) - VolumeGUID only, per the spec (so we get the right WordCount, WC)
+          # MS-SMB:  2.2.4.9.2  (WC=50) - all four fields as per spec (but then the spec is then wrong for the WC)
+          #                               VolumeGUID, FileId, MaximalAccessRights & GuestMaximalAccessRights
+          # MS-SMB 2.2.4.9.2 (WC=42): VolumeGUID
+          string                  :volume_guid,         label: 'Volume GUID', length: 16,
+                                   onlyif: -> { word_count >= 42 }
 
-          choice :maximal_access_rights, selection: -> { ext_file_attributes.directory } do
+          # MS-SMB 2.2.4.9.2 (WC=50): FileId
+          uint64                  :file_id,             label: 'File ID',
+                                   onlyif: -> { word_count >= 50 }
+
+          # MS-SMB 2.2.4.9.2 (WC=50): MaximalAccessRights
+          choice :maximal_access_rights, selection: -> { ext_file_attributes.directory },
+                                   onlyif: -> { word_count >= 50 } do
             file_access_mask      0, label: 'Maximal Access Rights'
             directory_access_mask 1, label: 'Maximal Access Rights'
           end
 
-          choice :guest_maximal_access_rights, selection: -> { ext_file_attributes.directory } do
+          # MS-SMB 2.2.4.9.2 (WC=50): GuestMaximalAccessRights
+          choice :guest_maximal_access_rights, selection: -> { ext_file_attributes.directory },
+                                   onlyif: -> { word_count >= 50 } do
             file_access_mask      0, label: 'Guest Maximal Access Rights'
             directory_access_mask 1, label: 'Guest Maximal Access Rights'
           end

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '3.3.16'.freeze
+  VERSION = '3.3.18'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 3.3.16
+  version: 3.3.18
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2026-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet