ruby_smb 2.0.0 → 2.0.5

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

@@ -26,7 +26,7 @@ RSpec.describe RubySMB::SMB2::Tree do
   it { is_expected.to respond_to :permissions }
   it { is_expected.to respond_to :share }
   it { is_expected.to respond_to :id }
-  it { is_expected.to respond_to :encryption_required }
+  it { is_expected.to respond_to :tree_connect_encrypt_data }
 
   it 'inherits the client that spawned it' do
     expect(tree.client).to eq client
@@ -51,7 +51,7 @@ RSpec.describe RubySMB::SMB2::Tree do
 
     it 'calls Client #send_recv with encryption set if required' do
       allow(tree).to receive(:set_header_fields).and_return(disco_req)
-      tree.encryption_required = true
+      tree.tree_connect_encrypt_data = true
       expect(client).to receive(:send_recv).with(disco_req, encrypt: true).and_return(disco_resp.to_binary_s)
       tree.disconnect!
     end
@@ -147,7 +147,7 @@ RSpec.describe RubySMB::SMB2::Tree do
 
     it 'calls Client #send_recv with encryption set if required' do
       allow(tree).to receive(:open_directory_packet).and_return(create_req)
-      tree.encryption_required = true
+      tree.tree_connect_encrypt_data = true
       expect(client).to receive(:send_recv).with(create_req, encrypt: true).and_return(create_response.to_binary_s)
       tree.open_directory
     end
@@ -195,7 +195,7 @@ RSpec.describe RubySMB::SMB2::Tree do
       allow(client).to receive(:send_recv) do |packet|
         expect(packet.file_information_class).to eq RubySMB::Fscc::FileInformation::FileIdFullDirectoryInformation::CLASS_LEVEL
         expect(packet.name).to eq '*'.encode('UTF-16LE')
-        expect(packet.output_length).to eq 65_535
+        expect(packet.output_length).to eq 65_536
       end
       tree.list
     end
@@ -229,7 +229,7 @@ RSpec.describe RubySMB::SMB2::Tree do
 
     it 'calls Client #send_recv with encryption set if required' do
       allow(tree).to receive(:set_header_fields).and_return(query_dir_req)
-      tree.encryption_required = true
+      tree.tree_connect_encrypt_data = true
       expect(client).to receive(:send_recv).with(query_dir_req, encrypt: true)
       tree.list
     end
@@ -288,6 +288,40 @@ RSpec.describe RubySMB::SMB2::Tree do
       end
     end
 
+    context 'when the dialect is 0x0202' do
+      it 'sets the packet output_length to 65536 and credit_charge header to 0' do
+        client.dialect = '0x0202'
+        allow(client).to receive(:send_recv) do |packet|
+          expect(packet.output_length).to eq(65536)
+          expect(packet.smb2_header.credit_charge).to eq(0)
+        end
+        tree.list
+      end
+    end
+
+    context 'when the server does not support multi credits' do
+      it 'sets the packet output_length to 65536 and credit_charge header to 0' do
+        client.server_supports_multi_credit = false
+        allow(client).to receive(:send_recv) do |packet|
+          expect(packet.output_length).to eq(65536)
+          expect(packet.smb2_header.credit_charge).to eq(0)
+        end
+        tree.list
+      end
+    end
+
+    context 'when the dialect is not 0x0202 and the server supports multi credits' do
+      it 'sets the packet output_length to server_max_read_size and credit_charge header to the expected value' do
+        client.server_supports_multi_credit = true
+        credit_charge = (90000 - 1) / 65536 + 1
+        client.server_max_read_size = 90000
+        allow(client).to receive(:send_recv) do |packet|
+          expect(packet.output_length).to eq(90000)
+          expect(packet.smb2_header.credit_charge).to eq(credit_charge)
+        end
+        tree.list
+      end
+    end
   end
 
   describe '#open_file' do
@@ -437,7 +471,7 @@ RSpec.describe RubySMB::SMB2::Tree do
     end
 
     it 'calls Client #send_recv with encryption set if required' do
-      tree.encryption_required = true
+      tree.tree_connect_encrypt_data = true
       expect(client).to receive(:send_recv).with(create_request, encrypt: true).and_return(create_response.to_binary_s)
       tree.open_file(filename: filename)
     end
@@ -459,7 +493,7 @@ RSpec.describe RubySMB::SMB2::Tree do
         context 'when encryption is required' do
           it 'returns the expected RubySMB::SMB2::File object' do
             file_obj = RubySMB::SMB2::File.new(name: filename, tree: tree, response: create_response, encrypt: true)
-            tree.encryption_required = true
+            tree.tree_connect_encrypt_data = true
             expect(RubySMB::SMB2::File).to receive(:new).with(name: filename, tree: tree, response: create_response, encrypt: true).and_return(file_obj)
             expect(tree.open_file(filename: filename)).to eq(file_obj)
           end
@@ -497,4 +531,27 @@ RSpec.describe RubySMB::SMB2::Tree do
       end
     end
   end
+
+  describe '#open_pipe' do
+    let(:opts) { { filename: '\\test', write: true } }
+    before :example do
+      allow(tree).to receive(:open_file)
+    end
+
+    it 'calls #open_file with the provided options' do
+      opts[:filename] ='test'
+      expect(tree).to receive(:open_file).with(opts)
+      tree.open_pipe(opts)
+    end
+
+    it 'remove the leading \\ from the filename if needed' do
+      expect(tree).to receive(:open_file).with( { filename: 'test', write: true } )
+      tree.open_pipe(opts)
+    end
+
+    it 'does not modify the original option hash' do
+      tree.open_pipe(opts)
+      expect(opts).to eq( { filename: '\\test', write: true } )
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_smb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.5
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -97,7 +97,7 @@ cert_chain:
   JI/W23RbIRksG2pioMhd4dCXq3FLLlkOV1YfCwWixNB+iIhQPPZVaPNfgPhCn4Dt
   DeGjje/qA4fkLtRmOtb9PUBq3ToRDE4=
   -----END CERTIFICATE-----
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -267,6 +267,7 @@ files:
 - examples/negotiate_with_netbios_service.rb
 - examples/net_share_enum_all.rb
 - examples/pipes.rb
+- examples/query_service_status.rb
 - examples/read_file.rb
 - examples/read_file_encryption.rb
 - examples/read_registry_key_value.rb
@@ -289,18 +290,46 @@ files:
 - lib/ruby_smb/dcerpc/bind_ack.rb
 - lib/ruby_smb/dcerpc/error.rb
 - lib/ruby_smb/dcerpc/ndr.rb
+- lib/ruby_smb/dcerpc/netlogon.rb
+- lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_request.rb
+- lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_response.rb
+- lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_request.rb
+- lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_response.rb
+- lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_request.rb
+- lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_response.rb
 - lib/ruby_smb/dcerpc/p_syntax_id_t.rb
 - lib/ruby_smb/dcerpc/pdu_header.rb
 - lib/ruby_smb/dcerpc/ptypes.rb
 - lib/ruby_smb/dcerpc/request.rb
 - lib/ruby_smb/dcerpc/response.rb
+- lib/ruby_smb/dcerpc/rpc_security_attributes.rb
 - lib/ruby_smb/dcerpc/rrp_unicode_string.rb
 - lib/ruby_smb/dcerpc/srvsvc.rb
 - lib/ruby_smb/dcerpc/srvsvc/net_share_enum_all.rb
+- lib/ruby_smb/dcerpc/svcctl.rb
+- lib/ruby_smb/dcerpc/svcctl/change_service_config_w_request.rb
+- lib/ruby_smb/dcerpc/svcctl/change_service_config_w_response.rb
+- lib/ruby_smb/dcerpc/svcctl/close_service_handle_request.rb
+- lib/ruby_smb/dcerpc/svcctl/close_service_handle_response.rb
+- lib/ruby_smb/dcerpc/svcctl/control_service_request.rb
+- lib/ruby_smb/dcerpc/svcctl/control_service_response.rb
+- lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_request.rb
+- lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_response.rb
+- lib/ruby_smb/dcerpc/svcctl/open_service_w_request.rb
+- lib/ruby_smb/dcerpc/svcctl/open_service_w_response.rb
+- lib/ruby_smb/dcerpc/svcctl/query_service_config_w_request.rb
+- lib/ruby_smb/dcerpc/svcctl/query_service_config_w_response.rb
+- lib/ruby_smb/dcerpc/svcctl/query_service_status_request.rb
+- lib/ruby_smb/dcerpc/svcctl/query_service_status_response.rb
+- lib/ruby_smb/dcerpc/svcctl/service_status.rb
+- lib/ruby_smb/dcerpc/svcctl/start_service_w_request.rb
+- lib/ruby_smb/dcerpc/svcctl/start_service_w_response.rb
 - lib/ruby_smb/dcerpc/uuid.rb
 - lib/ruby_smb/dcerpc/winreg.rb
 - lib/ruby_smb/dcerpc/winreg/close_key_request.rb
 - lib/ruby_smb/dcerpc/winreg/close_key_response.rb
+- lib/ruby_smb/dcerpc/winreg/create_key_request.rb
+- lib/ruby_smb/dcerpc/winreg/create_key_response.rb
 - lib/ruby_smb/dcerpc/winreg/enum_key_request.rb
 - lib/ruby_smb/dcerpc/winreg/enum_key_response.rb
 - lib/ruby_smb/dcerpc/winreg/enum_value_request.rb
@@ -314,6 +343,8 @@ files:
 - lib/ruby_smb/dcerpc/winreg/query_value_request.rb
 - lib/ruby_smb/dcerpc/winreg/query_value_response.rb
 - lib/ruby_smb/dcerpc/winreg/regsam.rb
+- lib/ruby_smb/dcerpc/winreg/save_key_request.rb
+- lib/ruby_smb/dcerpc/winreg/save_key_response.rb
 - lib/ruby_smb/dispatcher.rb
 - lib/ruby_smb/dispatcher/base.rb
 - lib/ruby_smb/dispatcher/socket.rb
@@ -499,16 +530,43 @@ files:
 - spec/lib/ruby_smb/dcerpc/bind_ack_spec.rb
 - spec/lib/ruby_smb/dcerpc/bind_spec.rb
 - spec/lib/ruby_smb/dcerpc/ndr_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/p_syntax_id_t_spec.rb
 - spec/lib/ruby_smb/dcerpc/pdu_header_spec.rb
 - spec/lib/ruby_smb/dcerpc/request_spec.rb
 - spec/lib/ruby_smb/dcerpc/response_spec.rb
+- spec/lib/ruby_smb/dcerpc/rpc_security_attributes_spec.rb
 - spec/lib/ruby_smb/dcerpc/rrp_unicode_string_spec.rb
 - spec/lib/ruby_smb/dcerpc/srvsvc/net_share_enum_all_spec.rb
 - spec/lib/ruby_smb/dcerpc/srvsvc_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/close_service_handle_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/close_service_handle_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/control_service_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/control_service_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_service_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_service_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_status_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_status_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/service_status_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/start_service_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/start_service_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl_spec.rb
 - spec/lib/ruby_smb/dcerpc/uuid_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/close_key_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/close_key_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/create_key_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/create_key_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/enum_key_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/enum_key_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/enum_value_request_spec.rb
@@ -522,6 +580,8 @@ files:
 - spec/lib/ruby_smb/dcerpc/winreg/query_value_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/query_value_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/regsam_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/save_key_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/save_key_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg_spec.rb
 - spec/lib/ruby_smb/dcerpc_spec.rb
 - spec/lib/ruby_smb/dispatcher/base_spec.rb
@@ -704,16 +764,43 @@ test_files:
 - spec/lib/ruby_smb/dcerpc/bind_ack_spec.rb
 - spec/lib/ruby_smb/dcerpc/bind_spec.rb
 - spec/lib/ruby_smb/dcerpc/ndr_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/p_syntax_id_t_spec.rb
 - spec/lib/ruby_smb/dcerpc/pdu_header_spec.rb
 - spec/lib/ruby_smb/dcerpc/request_spec.rb
 - spec/lib/ruby_smb/dcerpc/response_spec.rb
+- spec/lib/ruby_smb/dcerpc/rpc_security_attributes_spec.rb
 - spec/lib/ruby_smb/dcerpc/rrp_unicode_string_spec.rb
 - spec/lib/ruby_smb/dcerpc/srvsvc/net_share_enum_all_spec.rb
 - spec/lib/ruby_smb/dcerpc/srvsvc_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/close_service_handle_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/close_service_handle_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/control_service_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/control_service_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_service_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/open_service_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_status_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/query_service_status_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/service_status_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/start_service_w_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl/start_service_w_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/svcctl_spec.rb
 - spec/lib/ruby_smb/dcerpc/uuid_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/close_key_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/close_key_response_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/create_key_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/create_key_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/enum_key_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/enum_key_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/enum_value_request_spec.rb
@@ -727,6 +814,8 @@ test_files:
 - spec/lib/ruby_smb/dcerpc/winreg/query_value_request_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/query_value_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg/regsam_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/save_key_request_spec.rb
+- spec/lib/ruby_smb/dcerpc/winreg/save_key_response_spec.rb
 - spec/lib/ruby_smb/dcerpc/winreg_spec.rb
 - spec/lib/ruby_smb/dcerpc_spec.rb
 - spec/lib/ruby_smb/dispatcher/base_spec.rb