ruby_smb 2.0.2 → 2.0.7

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

@@ -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
@@ -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
@@ -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.2
+  version: 2.0.7
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -68,20 +68,20 @@ cert_chain:
   -----END CERTIFICATE-----
 - |
   -----BEGIN CERTIFICATE-----
-  MIIFIzCCBAugAwIBAgIQDX9ZkVJ2eNVTlibR5ALyJTANBgkqhkiG9w0BAQsFADBy
+  MIIFIzCCBAugAwIBAgIQCMePMbkSxvnPeJhYXIfaxzANBgkqhkiG9w0BAQsFADBy
   MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
   d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhEaWdpQ2VydCBTSEEyIEFzc3VyZWQg
-  SUQgQ29kZSBTaWduaW5nIENBMB4XDTE5MTAxNjAwMDAwMFoXDTIwMTAxOTEyMDAw
+  SUQgQ29kZSBTaWduaW5nIENBMB4XDTIwMTAwNzAwMDAwMFoXDTIzMTEwNjEyMDAw
   MFowYDELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxDzANBgNV
   BAcTBkJvc3RvbjETMBEGA1UEChMKUmFwaWQ3IExMQzETMBEGA1UEAxMKUmFwaWQ3
-  IExMQzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHnKegPAghKuZk4
-  Gy1jKaZEXbWc4fxioTemv/F1yIYzAjCWP65qjKtyeeFDe4/kJzG9nseF9oa93YBf
-  1nyEqxNSZMw/sCAZ87lOl713dRi73uxOoszy2PT5xEB+Q5R6cbzExkWG2zrLdXDr
-  so0Bd6VHw+IsAoBBkAq5FrZOJQYGn5VY20xw/2DqtCeoW4QDWyqTnbJmwO9tZrfr
-  3Le2crfk2eOgafaPNhLon5uuIKCZsk2YkUSNURSS3M7gosMwU9Gg4JTBi7X5+oww
-  rY43dJT28YklxmNVu8o5kJxW4dqLKJLOIgSXZ63nceT/EaCSg7DcofHNcUzejFwb
-  M7Zbb2kCAwEAAaOCAcUwggHBMB8GA1UdIwQYMBaAFFrEuXsqCqOl6nEDwGD5LfZl
-  dQ5YMB0GA1UdDgQWBBR18CAeMsIEU+0pXal/XXw9LCtMADAOBgNVHQ8BAf8EBAMC
+  IExMQzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNTz4zvAy7h/vQp
+  4dr1txXHlABAagkwYYwTMCtHs5PXsJITx/5SAjx5swuaLfze5kPBNF2YImvFlOXY
+  WaB+0PsOnXnaARsDZU683xFlj8izU6IN6VrAHzDLKFBzruJENrOJD/ikbEtbjO/q
+  gFbmS9J9v5ohG/pcRSS0t4ZPAwymf8eCp6QsvOKK/Aymp1RhlRaP8N6N5CIpkhz1
+  9p968iCE+DjOXVYxcWE+jE/7uB1dbgrXykNBujMSS3GULOvVEY28n6NCmrPlo23g
+  yRjYVJ2Vy14nBqnxDZ/yRIfWRVjWoT9TsAEbe9gY29oDpSCSs4wSmLQd5zGCpZ9h
+  r0HDFB8CAwEAAaOCAcUwggHBMB8GA1UdIwQYMBaAFFrEuXsqCqOl6nEDwGD5LfZl
+  dQ5YMB0GA1UdDgQWBBTLBL7DTwumVEKtdCdpHVYMXOFeDzAOBgNVHQ8BAf8EBAMC
   B4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDov
   L2NybDMuZGlnaWNlcnQuY29tL3NoYTItYXNzdXJlZC1jcy1nMS5jcmwwNaAzoDGG
   L2h0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9zaGEyLWFzc3VyZWQtY3MtZzEuY3Js
@@ -90,14 +90,14 @@ cert_chain:
   JAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBOBggrBgEFBQcw
   AoZCaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMkFzc3Vy
   ZWRJRENvZGVTaWduaW5nQ0EuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEL
-  BQADggEBAFpzR9s7lcYKDzSJucOHztEPj+iSIeCzxEw34NTE9M2AfkYIu82c4r2a
-  bzIGmzZWiCGufjOp0gF5xW6sSSJ9n0TqH0nhHhvjtZQkmkGtOBbN1zeYDFS2ozAp
-  sljF/g68Y1eYs3NaFf7kQUa6vb6RdjW3J8M9AQ8gthBt7gr/guVxd/gJUYbdDdBX
-  cWfJJi/X7GVBOBmmvA43qoKideuhOBrVGBHvIF/yO9p23dIiUrGmW9kxXCSxgute
-  JI/W23RbIRksG2pioMhd4dCXq3FLLlkOV1YfCwWixNB+iIhQPPZVaPNfgPhCn4Dt
-  DeGjje/qA4fkLtRmOtb9PUBq3ToRDE4=
+  BQADggEBAN+GL5/myPWg7oH4mVrG7/OhXF1MoYQF0ddaNiqaweEHMuKJBQCVZRbL
+  37HojoKXXv2yyRJBCeTB+ojrxX+5PdLVZa0ss7toWzJ2A1poPXZ1eZvm5xeFD32z
+  YQaTmmNWNI3PCDTyJ2PXUc+bDiNNwcZ7yc5o78UNRvp9Jxghya17Q76c9Ov9wvnv
+  dxxQKWGOQy0m4fBrkyjAyH9Djjn81RbQrqYgPuhd5nD0HjN3VUQLhQbIJrk9TVs0
+  EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
+  9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-11-19 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