ruby_smb 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5143b8e8c62f4e51a00da4db3379ee8060a6f650bc91c0b5476f7587df3a513
-  data.tar.gz: 5005cf21af243f8925ddd7fc221b39589ec036df3b57a03af8e26a29cf8bf03a
+  metadata.gz: 3a4881649381520e25f5f014f66baac4130dd8a58d4eadd3476198fec3fc9e8d
+  data.tar.gz: 809b581025c19ab7ca1162a7b73d342d63b24edd77835744191a0d7c930425fd
 SHA512:
-  metadata.gz: a69b666d6a0199e0efa5df505ef03c312a9701cec10cc0774b4bed4e006c2c63ff461c1a0472060191dea0737ed483229bd7e78057f950d40c81fa02a5754683
-  data.tar.gz: cb87a7b4cef92975dac1ddc4e9edc72e170b6066a30f2cd9c321ef0f3e25557eae862dd2fe46b147a1ecd8c192ee81782f024858625e0a064c9ab9156084b715
+  metadata.gz: 4e340189b0ae87ec98e7ca6bde9d4c30c1eb3a0d3e1f69383869e4803bf3d3d9bbc502cef143a83bad9f91dc1de10ca3bcd4132a8d518a1bb2121a7d4490309d
+  data.tar.gz: 0c7198d84416da8b995e50c17f7826abba21affa03cc1c2404e2e2ecaac1322178f76c356d8d026c4a75b7e9d356bd134f1a0df12fe327eca1240b87afaeee0d

data/lib/ruby_smb/client/negotiation.rb

@@ -251,7 +251,7 @@ module RubySMB
           raise ArgumentError, 'Must be an array of strings' unless dialect.is_a? String
           packet.add_dialect(dialect.to_i(16))
         end
-        packet.capabilities.encryption = 1
+        packet.capabilities.encryption = @session_encrypt_data ? 1 : 0
 
         if packet.dialects.include?(0x0311)
           nc = RubySMB::SMB2::NegotiateContext.new(

data/lib/ruby_smb/client.rb

@@ -29,10 +29,26 @@ module RubySMB
     # It indicates that the server implements SMB 2.1 or future dialect revisions
     # Note that this must be used for SMB3
     SMB1_DIALECT_SMB2_WILDCARD = 'SMB 2.???'.freeze
+
+    SMB2_DIALECT_0202 = '0x0202'.freeze
+    SMB2_DIALECT_0210 = '0x0210'.freeze
+    SMB2_DIALECT_0300  = '0x0300'.freeze
+    SMB2_DIALECT_0302  = '0x0302'.freeze
+    SMB2_DIALECT_0311  = '0x0311'.freeze
+
     # Dialect values for SMB2
-    SMB2_DIALECT_DEFAULT = ['0x0202', '0x0210']
+    SMB2_DIALECT_DEFAULT = [
+      SMB2_DIALECT_0202,
+      SMB2_DIALECT_0210,
+    ].freeze
+
     # Dialect values for SMB3
-    SMB3_DIALECT_DEFAULT = ['0x0300', '0x0302', '0x0311']
+    SMB3_DIALECT_DEFAULT = [
+      SMB2_DIALECT_0300,
+      SMB2_DIALECT_0302,
+      SMB2_DIALECT_0311
+    ].freeze
+
     # The default maximum size of a SMB message that the Client accepts (in bytes)
     MAX_BUFFER_SIZE = 64512
     # The default maximum size of a SMB message that the Server accepts (in bytes)

data/lib/ruby_smb/server/session.rb

@@ -13,6 +13,7 @@ module RubySMB
         @user_id = user_id
         @state = state
         @signing_required = false
+        @metadata = {}
         # tree id => provider processor instance
         @tree_connect_table = {}
         @creation_time = Time.now
@@ -62,6 +63,11 @@ module RubySMB
       #   @return [Hash]
       attr_accessor :tree_connect_table
 
+      # Untyped hash for storing additional arbitrary metadata about the current session
+      # @!attribute [rw] metadaa
+      #   @return [Hash]
+      attr_accessor :metadata
+
       # The time at which this session was created.
       # @!attribute [r] creation_time
       #   @return [Time]

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

@@ -18,6 +18,17 @@ module RubySMB
         uint64                     :previous_session_id,     label: 'Previous Session ID'
         string                     :buffer,                  label: 'Security Buffer', length: -> { security_buffer_length }
 
+        # Takes the specified security buffer string and inserts it into the {RubySMB::SMB2::Packet::SessionSetupRequest#buffer}
+        # as well as updating the {RubySMB::SMB2::Packet::SessionSetupRequest#security_buffer_length}
+        # This method DOES NOT wrap the security buffer in any way.
+        #
+        # @param buffer [String] the security buffer
+        # @return [void]
+        def set_security_buffer(buffer)
+          self.security_buffer_length = buffer.length
+          self.buffer = buffer
+        end
+
         # Takes a serialized NTLM Type 1 message and wraps it in the GSS ASN1 encoding
         # and inserts it into the {RubySMB::SMB2::Packet::SessionSetupRequest#buffer}
         # as well as updating the {RubySMB::SMB2::Packet::SessionSetupRequest#security_buffer_length}

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '3.0.4'.freeze
+  VERSION = '3.0.5'.freeze
 end

data/spec/lib/ruby_smb/smb1/tree_spec.rb

@@ -118,6 +118,11 @@ RSpec.describe RubySMB::SMB1::Tree do
         end
         tree.open_file(filename: unicode_filename.chop)
       end
+
+      it 'removes the leading \\ from the filename if needed' do
+        expect(tree).to receive(:_open).with(filename: filename)
+        tree.open_file(filename: '\\' + filename)
+      end
     end
 
     describe 'flags' do

data/spec/lib/ruby_smb/smb2/tree_spec.rb

@@ -348,6 +348,11 @@ RSpec.describe RubySMB::SMB2::Tree do
         end
         tree.open_file(filename: filename)
       end
+
+       it 'removes the leading \\ from the filename if needed' do
+        expect(tree).to receive(:_open).with(filename: filename)
+        tree.open_file(filename: "\\".encode('UTF-16LE') + filename)
+      end
     end
 
     describe 'attributes' do
@@ -544,7 +549,7 @@ RSpec.describe RubySMB::SMB2::Tree do
       tree.open_pipe(**opts)
     end
 
-    it 'remove the leading \\ from the filename if needed' do
+    it 'removes the leading \\ from the filename if needed' do
       expect(tree).to receive(:_open).with(filename: 'test', write: true)
       tree.open_pipe(**opts)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -97,7 +97,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet

metadata.gz.sig

@@ -1,2 +1,2 @@
-�5Ф\y�Q.�n��g�Ho�{F�Y����E��g9�9�)��.�i~0-�1휡�Sθ�� ��Q��P
-��X.���&�k��na����k���&SP
+� �F�K��Y3]*����$��')�rp2��Uxj�z�N�D
+��(wT���B���J#߽dü�F�Q�nA�39B5�s�����<�Iy�{#���(�	)��Q���2O0��`����@���(뿅���Zw�^�L��;:�h�0m���a7Щ�c9$\m��:{}��!)V.���t��g6^S���.˃?!c5n��5��%���s=WD���x�ۘ�	k�_���HnMm�%'�Z�R��@���