ruby_smb 3.0.6 → 3.1.0

data/spec/lib/ruby_smb/smb1/packet/trans2/query_path_information_request_spec.rb

@@ -0,0 +1,79 @@
+include RubySMB::Fscc::FileInformation
+
+RSpec.describe RubySMB::SMB1::Packet::Trans2::QueryPathInformationRequest do
+  subject(:packet) { described_class.new }
+
+  describe '#smb_header' do
+    subject(:header) { packet.smb_header }
+
+    it 'is a standard SMB Header' do
+      expect(header).to be_a RubySMB::SMB1::SMBHeader
+    end
+
+    it 'should have the command set to SMB_COM_TRANSACTION2' do
+      expect(header.command).to eq RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+    end
+
+    it 'should not have the response flag set' do
+      expect(header.flags.reply).to eq 0
+    end
+  end
+
+  describe '#parameter_block' do
+    subject(:parameter_block) { packet.parameter_block }
+
+    it 'is a standard ParameterBlock' do
+      expect(parameter_block).to be_a RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
+    end
+
+    it 'should have the setup set to the QUERY_PATH_INFORMATION subcommand' do
+      expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_PATH_INFORMATION
+    end
+  end
+
+  describe '#data_block' do
+    subject(:data_block) { packet.data_block }
+
+    it 'is a standard DataBlock' do
+      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+    end
+
+    it { is_expected.to respond_to :name }
+    it { is_expected.to respond_to :trans2_parameters }
+    it { is_expected.to respond_to :trans2_data }
+
+    it 'should keep #trans2_parameters 4-byte aligned' do
+      expect(data_block.trans2_parameters.abs_offset % 4).to eq 0
+    end
+
+    it 'should keep #trans2_data 4-byte aligned' do
+      data_block.trans2_parameters.information_level = FILE_DISPOSITION_INFORMATION + SMB_INFO_PASSTHROUGH
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
+    end
+
+    describe '#trans2_parameters' do
+      subject(:parameters) { data_block.trans2_parameters }
+
+      it { is_expected.to respond_to :information_level }
+      it { is_expected.to respond_to :filename }
+
+      describe '#information_level' do
+        it 'is a 16-bit field' do
+          expect(parameters.information_level).to be_a BinData::Uint16le
+        end
+      end
+
+      describe '#filename' do
+        it 'is a BinData::Choice' do
+          expect(parameters.filename).to be_a BinData::Choice
+        end
+
+        it 'responds to #encode' do
+          expect(parameters.filename).to respond_to :encode
+          expect(parameters.filename.encode).to be_a String
+        end
+      end
+    end
+  end
+end
+

data/spec/lib/ruby_smb/smb1/packet/trans2/query_path_information_response_spec.rb

@@ -0,0 +1,96 @@
+RSpec.describe RubySMB::SMB1::Packet::Trans2::QueryPathInformationResponse do
+  subject(:packet) { described_class.new }
+
+  describe '#smb_header' do
+    subject(:header) { packet.smb_header }
+
+    it 'is a standard SMB Header' do
+      expect(header).to be_a RubySMB::SMB1::SMBHeader
+    end
+
+    it 'should have the command set to SMB_COM_TRANSACTION2' do
+      expect(header.command).to eq RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+    end
+
+    it 'should have the response flag set' do
+      expect(header.flags.reply).to eq 1
+    end
+  end
+
+  describe '#parameter_block' do
+    subject(:parameter_block) { packet.parameter_block }
+
+    it 'should have the setup set to the QUERY_PATH_INFORMATION subcommand' do
+      expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_PATH_INFORMATION
+    end
+  end
+
+  describe '#data_block' do
+    subject(:data_block) { packet.data_block }
+
+    it 'is a standard DataBlock' do
+      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+    end
+
+    it { is_expected.to respond_to :name }
+    it { is_expected.to respond_to :trans2_parameters }
+    it { is_expected.to respond_to :trans2_data }
+
+    it 'should keep #trans2_parameters 4-byte aligned' do
+      expect(data_block.trans2_parameters.abs_offset % 4).to eq 0
+    end
+
+    describe '#trans2_parameters' do
+      subject(:parameters) { data_block.trans2_parameters }
+
+      it { is_expected.to respond_to :ea_error_offset }
+
+      describe '#ea_error_offset' do
+        it 'is a 16-bit field' do
+          expect(parameters.ea_error_offset).to be_a BinData::Uint16le
+        end
+      end
+    end
+
+    describe '#trans2_data' do
+      subject(:data) { data_block.trans2_data }
+
+      it { is_expected.to respond_to :buffer }
+
+      describe '#buffer' do
+        it 'is a String field' do
+          expect(data.buffer).to be_a BinData::String
+        end
+      end
+
+      context 'when the buffer is empty' do
+        before :each do
+          data.buffer = ''
+        end
+
+        it 'should not be padded' do
+          expect(data_block.pad2.num_bytes).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq ''
+        end
+      end
+
+      context 'when the buffer is not empty' do
+        before :each do
+          data.buffer = 'test'
+        end
+
+        it 'should be padded to a 4-byte boundary' do
+          expect(data_block.trans2_data.abs_offset % 4).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq 'test'
+        end
+      end
+    end
+  end
+
+end

data/spec/lib/ruby_smb/smb1/packet/trans2/request_spec.rb

@@ -75,7 +75,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::Request do
     subject(:data_block) { packet.data_block }
 
     it 'is a standard DataBlock' do
-      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+      expect(data_block).to be_a BinData::Choice
     end
 
     it { is_expected.to respond_to :name }
@@ -88,7 +88,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::Request do
 
     it 'should keep #trans2_data 4-byte aligned' do
       data_block.trans2_parameters = 'a'
-      expect(data_block.trans2_data.abs_offset % 4).to eq 0
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
     end
   end
 end

data/spec/lib/ruby_smb/smb1/packet/trans2/response_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::Response do
     end
 
     describe 'parameter_offset' do
-      it ' contains the absolute_offset to the data_block trans2_parameters field' do
+      it 'contains the absolute_offset to the data_block trans2_parameters field' do
         expect(parameter_block.parameter_offset).to eq packet.data_block.trans2_parameters.abs_offset
       end
     end
@@ -67,7 +67,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::Response do
     subject(:data_block) { packet.data_block }
 
     it 'is a Trans2 DataBlock' do
-      expect(data_block).to be_a RubySMB::SMB1::Packet::Trans2::DataBlock
+      expect(data_block).to be_a BinData::Choice
     end
 
     it { is_expected.to respond_to :trans2_parameters }
@@ -79,7 +79,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::Response do
 
     it 'should keep #trans2_data 4-byte aligned' do
       data_block.trans2_parameters = 'a'
-      expect(data_block.trans2_data.abs_offset % 4).to eq 0
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
     end
   end
 end

data/spec/lib/ruby_smb/smb1/packet/trans2/set_file_information_request_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::SetFileInformationRequest do
       expect(parameter_block).to be_a RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
     end
 
-    it 'should have the setup set to the OPEN2 subcommand' do
+    it 'should have the setup set to the SET_FILE_INFORMATION subcommand' do
       expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::SET_FILE_INFORMATION
     end
   end
@@ -47,7 +47,8 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::SetFileInformationRequest do
     end
 
     it 'should keep #trans2_data 4-byte aligned' do
-      expect(data_block.trans2_data.abs_offset % 4).to eq 0
+      data_block.trans2_parameters.information_level = FILE_DISPOSITION_INFORMATION + SMB_INFO_PASSTHROUGH
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
     end
 
     describe '#trans2_parameters' do

data/spec/lib/ruby_smb/smb1/packet/trans2/set_file_information_response_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::SetFileInformationResponse do
       expect(header).to be_a RubySMB::SMB1::SMBHeader
     end
 
-    it 'should have the command set to SMB_COM_NEGOTIATE' do
+    it 'should have the command set to SMB_COM_TRANSACTION2' do
       expect(header.command).to eq RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
     end
 
@@ -20,7 +20,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::SetFileInformationResponse do
   describe '#parameter_block' do
     subject(:parameter_block) { packet.parameter_block }
 
-    it 'should have the setup set to the OPEN2 subcommand' do
+    it 'should have the setup set to the SET_FILE_INFORMATION subcommand' do
       expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::SET_FILE_INFORMATION
     end
   end
@@ -28,7 +28,12 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::SetFileInformationResponse do
   describe '#data_block' do
     subject(:data_block) { packet.data_block }
 
+    it 'is a standard DataBlock' do
+      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+    end
+
     it { is_expected.to respond_to :trans2_parameters }
+    it { is_expected.to_not respond_to :trans2_data }
 
     it 'should keep #trans2_parameters 4-byte aligned' do
       expect(data_block.trans2_parameters.abs_offset % 4).to eq 0

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

@@ -95,7 +95,7 @@ RSpec.describe RubySMB::SMB1::Tree do
     describe 'filename' do
       it 'takes the filename as an argument' do
         allow(client).to receive(:send_recv) do |packet|
-          expect(packet.data_block.file_name).to eq(filename)
+          expect(packet.data_block.file_name.to_binary_s).to eq(filename)
           nt_create_andx_response.to_binary_s
         end
         tree.open_file(filename: filename)
@@ -103,7 +103,7 @@ RSpec.describe RubySMB::SMB1::Tree do
 
       it 'adds the null termination to the filename if missing' do
         allow(client).to receive(:send_recv) do |packet|
-          expect(packet.data_block.file_name).to eq(filename)
+          expect(packet.data_block.file_name.to_binary_s).to eq(filename)
           nt_create_andx_response.to_binary_s
         end
         tree.open_file(filename: filename.chop)
@@ -113,7 +113,7 @@ RSpec.describe RubySMB::SMB1::Tree do
         unicode_filename = filename.encode('UTF-16LE')
         nt_create_andx_req.smb_header.flags2.unicode = 1
         allow(client).to receive(:send_recv) do |packet|
-          expect(packet.data_block.file_name).to eq(unicode_filename.b)
+          expect(packet.data_block.file_name.to_binary_s).to eq(unicode_filename.b)
           nt_create_andx_response.to_binary_s
         end
         tree.open_file(filename: unicode_filename.chop)

data/spec/lib/ruby_smb/smb2/packet/transform_header_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe RubySMB::SMB2::Packet::TransformHeader do
     it 'raises the expected exception if the given algorithm is invalid' do
       expect { packet.decrypt(key, algorithm: 'RC4') }.to raise_error(
         RubySMB::Error::EncryptionError,
-        'Error while decrypting with \'RC4\' (ArgumentError: Invalid algorithm, must be either AES-128-CCM or AES-128-GCM)'
+        'Error while decrypting with \'RC4\' (ArgumentError: Invalid algorithm, must be one of AES-128-CCM, AES-128-GCM, AES-256-CCM, or AES-256-GCM)'
       )
     end
 
@@ -141,7 +141,7 @@ RSpec.describe RubySMB::SMB2::Packet::TransformHeader do
     it 'raises the expected exception if the given algorithm is invalid' do
       expect { packet.encrypt(struct, key, algorithm: 'RC4') }.to raise_error(
         RubySMB::Error::EncryptionError,
-        'Error while encrypting with \'RC4\' (ArgumentError: Invalid algorithm, must be either AES-128-CCM or AES-128-GCM)'
+        'Error while encrypting with \'RC4\' (ArgumentError: Invalid algorithm, must be one of AES-128-CCM, AES-128-GCM, AES-256-CCM, or AES-256-GCM)'
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.1.0
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -97,7 +97,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -464,6 +464,7 @@ files:
 - lib/ruby_smb/ntlm.rb
 - lib/ruby_smb/server.rb
 - lib/ruby_smb/server/server_client.rb
+- lib/ruby_smb/server/server_client/encryption.rb
 - lib/ruby_smb/server/server_client/negotiation.rb
 - lib/ruby_smb/server/server_client/session_setup.rb
 - lib/ruby_smb/server/server_client/share_io.rb
@@ -472,6 +473,12 @@ files:
 - lib/ruby_smb/server/share.rb
 - lib/ruby_smb/server/share/provider.rb
 - lib/ruby_smb/server/share/provider/disk.rb
+- lib/ruby_smb/server/share/provider/disk/file_system.rb
+- lib/ruby_smb/server/share/provider/disk/processor.rb
+- lib/ruby_smb/server/share/provider/disk/processor/close.rb
+- lib/ruby_smb/server/share/provider/disk/processor/create.rb
+- lib/ruby_smb/server/share/provider/disk/processor/query.rb
+- lib/ruby_smb/server/share/provider/disk/processor/read.rb
 - lib/ruby_smb/server/share/provider/pipe.rb
 - lib/ruby_smb/server/share/provider/processor.rb
 - lib/ruby_smb/signing.rb
@@ -541,11 +548,23 @@ files:
 - lib/ruby_smb/smb1/packet/trans2/find_first2_request.rb
 - lib/ruby_smb/smb1/packet/trans2/find_first2_response.rb
 - lib/ruby_smb/smb1/packet/trans2/find_information_level.rb
+- lib/ruby_smb/smb1/packet/trans2/find_information_level/find_file_both_directory_info.rb
 - lib/ruby_smb/smb1/packet/trans2/find_information_level/find_file_full_directory_info.rb
 - lib/ruby_smb/smb1/packet/trans2/find_next2_request.rb
 - lib/ruby_smb/smb1/packet/trans2/find_next2_response.rb
 - lib/ruby_smb/smb1/packet/trans2/open2_request.rb
 - lib/ruby_smb/smb1/packet/trans2/open2_response.rb
+- lib/ruby_smb/smb1/packet/trans2/query_file_information_request.rb
+- lib/ruby_smb/smb1/packet/trans2/query_file_information_response.rb
+- lib/ruby_smb/smb1/packet/trans2/query_fs_information_level.rb
+- lib/ruby_smb/smb1/packet/trans2/query_fs_information_level/query_fs_attribute_info.rb
+- lib/ruby_smb/smb1/packet/trans2/query_fs_information_request.rb
+- lib/ruby_smb/smb1/packet/trans2/query_fs_information_response.rb
+- lib/ruby_smb/smb1/packet/trans2/query_information_level.rb
+- lib/ruby_smb/smb1/packet/trans2/query_information_level/query_file_basic_info.rb
+- lib/ruby_smb/smb1/packet/trans2/query_information_level/query_file_standard_info.rb
+- lib/ruby_smb/smb1/packet/trans2/query_path_information_request.rb
+- lib/ruby_smb/smb1/packet/trans2/query_path_information_response.rb
 - lib/ruby_smb/smb1/packet/trans2/request.rb
 - lib/ruby_smb/smb1/packet/trans2/request_secondary.rb
 - lib/ruby_smb/smb1/packet/trans2/response.rb
@@ -816,6 +835,12 @@ files:
 - spec/lib/ruby_smb/smb1/packet/trans2/find_next2_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/open2_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/open2_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_file_information_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_file_information_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_fs_information_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_fs_information_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_path_information_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_path_information_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/request_secondary_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/response_spec.rb
@@ -1100,6 +1125,12 @@ test_files:
 - spec/lib/ruby_smb/smb1/packet/trans2/find_next2_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/open2_request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/open2_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_file_information_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_file_information_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_fs_information_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_fs_information_response_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_path_information_request_spec.rb
+- spec/lib/ruby_smb/smb1/packet/trans2/query_path_information_response_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/request_secondary_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/request_spec.rb
 - spec/lib/ruby_smb/smb1/packet/trans2/response_spec.rb