ruby_smb 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b10829db92d5746b069916440f0e91ca006c370053fdc02621ed75723efbf40
-  data.tar.gz: aeeeb396277c47b16ff977e33344ab08da275a0632d6a9a220aac7e733e91311
+  metadata.gz: 587f03eec26c36a6ca67ffde30bb05881a456609dff32873b912e7763d266f25
+  data.tar.gz: 18c3b50b89657fe874d0a13904dad2b36c01c49089f01b5a3821d1733eb07c61
 SHA512:
-  metadata.gz: 7269f0664dd840a83d39d5d1b3a953f87d050bcffbea0b9993685ef1ec91c9047a9117d88ee305d2c467555b475a7c15e82f0f8bfa1b98d077ea00fd401de200
-  data.tar.gz: a5997a65e48cd66585896c55cd8a01fbbee4a8b04280a15ecacdd79501fdd42caf772ac712a32228ea6c1991a6db27c9657d8829ca412691df0834e392c45284
+  metadata.gz: cd6f94e4b093ecab453e6e7f2056bfb7b52fbf2cfec51a26eceb2761b98c78bfd0fe273f083b1ec7db69f553ac7b8fb594e4d7c31ea8468e02337611b0bd4541
+  data.tar.gz: 4b5d924834a9168458ad50afcf6b27df5ba9ab50632b4b81db1e226235c7ebe80540e05fdc4aa6a6a608a6365e83f937304e0289a9d8e5689480f3021f6dd07e

data/lib/ruby_smb/client/authentication.rb

@@ -146,7 +146,7 @@ module RubySMB
       end
 
       # Takes the raw binary string and returns a {RubySMB::SMB1::Packet::SessionSetupResponse}
-      def smb1_ntlmssp_final_packet(raw_response)
+      def smb1_session_setup_response(raw_response)
         packet = RubySMB::SMB1::Packet::SessionSetupResponse.read(raw_response)
 
         unless packet.valid?
@@ -159,6 +159,11 @@ module RubySMB
         packet
       end
 
+      # Takes the raw binary string and returns a {RubySMB::SMB1::Packet::SessionSetupResponse}
+      def smb1_ntlmssp_final_packet(raw_response)
+        smb1_session_setup_response(raw_response)
+      end
+
       # Takes the raw binary string and returns a {RubySMB::SMB1::Packet::SessionSetupResponse}
       def smb1_ntlmssp_challenge_packet(raw_response)
         packet = RubySMB::SMB1::Packet::SessionSetupResponse.read(raw_response)
@@ -235,7 +240,7 @@ module RubySMB
       end
 
       # Takes the raw binary string and returns a {RubySMB::SMB2::Packet::SessionSetupResponse}
-      def smb2_ntlmssp_final_packet(raw_response)
+      def smb2_session_setup_response(raw_response)
         packet = RubySMB::SMB2::Packet::SessionSetupResponse.read(raw_response)
         unless packet.valid?
           raise RubySMB::Error::InvalidPacket.new(
@@ -248,6 +253,11 @@ module RubySMB
         packet
       end
 
+      # Takes the raw binary string and returns a {RubySMB::SMB2::Packet::SessionSetupResponse}
+      def smb2_ntlmssp_final_packet(raw_response)
+        smb2_session_setup_response(raw_response)
+      end
+
       # Takes the raw binary string and returns a {RubySMB::SMB2::Packet::SessionSetupResponse}
       def smb2_ntlmssp_challenge_packet(raw_response)
         packet = RubySMB::SMB2::Packet::SessionSetupResponse.read(raw_response)

data/lib/ruby_smb/client/negotiation.rb

@@ -118,6 +118,7 @@ module RubySMB
           self.server_max_buffer_size = packet.parameter_block.max_buffer_size - 260
           self.negotiated_smb_version = 1
           self.session_encrypt_data = false
+          self.negotiation_security_buffer = packet.data_block.security_blob
           'SMB1'
         when RubySMB::SMB2::Packet::NegotiateResponse
           self.smb1 = false
@@ -137,6 +138,7 @@ module RubySMB
           self.server_start_time = packet.server_start_time.to_time if packet.server_start_time != 0
           self.server_system_time = packet.system_time.to_time if packet.system_time != 0
           self.server_supports_multi_credit = self.dialect != '0x0202' && packet&.capabilities&.large_mtu == 1
+          self.negotiation_security_buffer = packet.security_buffer
           case self.dialect
           when '0x02ff'
           when '0x0300', '0x0302'

data/lib/ruby_smb/client.rb

@@ -295,6 +295,12 @@ module RubySMB
     #   false otherwise
     attr_accessor :server_supports_multi_credit
 
+    # The negotiated security buffer. This is nil until the negotiation process
+    # has finished.
+    # @!attribute [rw] negotiation_security_buffer
+    #   @return [String] The raw security buffer bytes
+    attr_accessor :negotiation_security_buffer
+
     # @param dispatcher [RubySMB::Dispatcher::Socket] the packet dispatcher to use
     # @param smb1 [Boolean] whether or not to enable SMB1 support
     # @param smb2 [Boolean] whether or not to enable SMB2 support

data/lib/ruby_smb/error.rb

@@ -99,6 +99,10 @@ module RubySMB
     # unsupported protocol.
     class NegotiationFailure < RubySMBError; end
 
+    # Raised when Authentication fails, possibly due to an
+    # unsupported GSS mechanism type.
+    class AuthenticationFailure < RubySMBError; end
+
     # Raised when trying to parse raw binary into a BitField and the data
     # is invalid.
     class InvalidBitField < RubySMBError; end

data/lib/ruby_smb/gss.rb

@@ -14,6 +14,7 @@ module RubySMB
     # @param asn The ASN object to apply the traversal path on.
     # @param [Array] path The path to traverse, each element is passed to the
     #   ASN object's #value's #[] operator.
+    # @return [OpenSSL::ASN1::Sequence, nil]
     def self.asn1dig(asn, *path)
       path.each do |part|
         return nil unless asn&.value

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

@@ -40,6 +40,17 @@ module RubySMB
         parameter_block   :parameter_block
         data_block        :data_block
 
+        # Takes the specified security buffer string and sets it in the {RubySMB::SMB1::Packet::SessionSetupRequest::DataBlock#security_blob}
+        # field. It also automatically sets the length in
+        # {RubySMB::SMB1::Packet::SessionSetupRequest::ParameterBlock#security_blob_length}
+        #
+        # @param buffer [String] the security buffer
+        # @return [void]
+        def set_security_buffer(buffer)
+          parameter_block.security_blob_length = buffer.length
+          data_block.security_blob = buffer
+        end
+
         # Takes an NTLM Type 1 Message and creates the GSS Security Blob
         # for it and sets it in the {RubySMB::SMB1::Packet::SessionSetupRequest::DataBlock#security_blob}
         # field. It also automatically sets the length in

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '3.1.3'.freeze
+  VERSION = '3.1.4'.freeze
 end

metadata

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