ruby_smb 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 582c72fe6559ee4c40aa9e33f77c6644669848ae3452c11095f31fb0b0fce387
-  data.tar.gz: 2791bfa79cb55e6ec6689782a747860287278bc42c38d6ecd03a66396efba200
+  metadata.gz: 5567054608b80da9be641c717d1d8b69e71452fb2fc67c2e390d9a6a34fb19d3
+  data.tar.gz: 0b439033b20bd578414e51d56d98ee4ccc4d44c60e6248bf0b8ad37a33b0fd6d
 SHA512:
-  metadata.gz: ae54e45927264996fbaed098e38f38d179c0750aa4d82073910364bdc3cb2719c8ec89c9f432554ef44a752b9aef3e4f945b73357b4694c7faa52f7025582efc
-  data.tar.gz: 0cf5036c07e48a2cb6a40bdb63e0ec18f0f20d7110af4938f3fc4067e77d99e084ac5cba0f255980b1b971f93985793cce8211f4496e9ffd6be0bc00ab5e2dd7
+  metadata.gz: 19ad76e3ed2e1902141aac772cd7908de06b402414b787e7f2371584e5cee6fc1cf82e9b80dce10ae0599082ee65a4dbd4f6c62a3c32bd3b154d47de25944b20
+  data.tar.gz: dd970aad2f91aec70671b7364438ee7df79908c552a6826aad99318e10fb63b6ebcad5929f131fa4284ff5531c189061a83f499203188ac919dc74e6007d422f

data/lib/ruby_smb/client/negotiation.rb

@@ -5,7 +5,7 @@ module RubySMB
     module Negotiation
       # Handles the entire SMB Multi-Protocol Negotiation from the
       # Client to the Server. It sets state on the client appropriate
-      # to the protocol and capabilites negotiated during the exchange.
+      # to the protocol and capabilities negotiated during the exchange.
       # It also keeps track of the negotiated dialect.
       #
       # @return [void]
@@ -23,13 +23,13 @@ module RubySMB
           update_preauth_hash(response_packet)
         end
 
-        # If the response contains the SMB2 wildcard revision number dialect;
-        # it indicates that the server implements SMB 2.1 or future dialect
-        # revisions and expects the client to send a subsequent SMB2 Negotiate
-        # request to negotiate the actual SMB 2 Protocol revision to be used.
-        # The wildcard revision number is sent only in response to a
+        # If the response contains an SMB2 dialect and the request was SMB1;
+        # it indicates that the server supports SMB2 and wants to upgrade the
+        # connection. The server expects the client to send a subsequent SMB2
+        # Negotiate request to negotiate the actual SMB 2 Protocol revision to
+        # be used. The wildcard revision number is sent only in response to a
         # multi-protocol negotiate request with the "SMB 2.???" dialect string.
-        if @dialect == '0x02ff'
+        if request_packet.packet_smb_version == 'SMB1' && RubySMB::Dialect[@dialect]&.order == RubySMB::Dialect::ORDER_SMB2
           self.smb2_message_id += 1
           version = negotiate
         end

data/lib/ruby_smb/gss/provider/ntlm.rb

@@ -78,6 +78,10 @@ module RubySMB
                 msg.flag |= NTLM::NEGOTIATE_FLAGS.fetch(flag)
               end
 
+              if type1_msg.flag & NTLM::NEGOTIATE_FLAGS[:EXTENDED_SECURITY] == NTLM::NEGOTIATE_FLAGS[:EXTENDED_SECURITY]
+                msg.flag |= NTLM::NEGOTIATE_FLAGS[:EXTENDED_SECURITY]
+              end
+
               @server_challenge = @provider.generate_server_challenge
               msg.challenge = @server_challenge.unpack1('Q<') # 64-bit unsigned, little endian (uint64_t)
               target_info = Net::NTLM::TargetInfo.new('')

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

data/spec/lib/ruby_smb/client_spec.rb

@@ -1279,6 +1279,9 @@ RSpec.describe RubySMB::Client do
       end
 
       it 'calls the backing methods' do
+        request_packet = double('Request packet')
+        allow(client).to receive(:negotiate_request).and_return(request_packet)
+        allow(request_packet).to receive(:packet_smb_version)
         expect(client).to receive(:negotiate_request)
         expect(client).to receive(:send_recv)
         expect(client).to receive(:negotiate_response)
@@ -1319,14 +1322,20 @@ RSpec.describe RubySMB::Client do
 
         it 'increments the message ID' do
           expect(client).to receive(:smb2_message_id=).with(1)
+          expect(client).to receive(:negotiate_request).twice.and_call_original
+          expect(client).to receive(:parse_negotiate_response).twice do
+            client.smb1 = false
+          end
           client.negotiate
         end
 
         it 're-negotiates' do
-          expect(client).to receive(:negotiate_request).twice
+          expect(client).to receive(:negotiate_request).twice.and_call_original
           expect(client).to receive(:send_recv).twice
           expect(client).to receive(:negotiate_response).twice
-          expect(client).to receive(:parse_negotiate_response).twice
+          expect(client).to receive(:parse_negotiate_response).twice do
+            client.smb1 = false
+          end
           client.negotiate
         end
       end

data.tar.gz.sig

@@ -1,2 +1 @@
-��,�x
AD[N�FOr���}����l�C� N���6�M�#+�q��H͓(�ސ��Դ���Eݎ(��9�q�i!��fjfWVk�#�@��g�����O~�˫��1�w*��R�B�`HP�J�b�ppЂ���\i*&{Xh4@��q%$Iu�Ur���r�r�c����H4�&�r�D0ǔ�3���뫭�X��8�����x�E^+C�:N�כ�j�!�F��$ CS��/I�
-��HW�0�ޟj
+�:�ϝ��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -97,7 +97,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet