ruby_smb 2.0.3 → 2.0.8

data/lib/ruby_smb/smb2/tree.rb

@@ -50,13 +50,20 @@ module RubySMB
           raise RubySMB::Error::InvalidPacket.new(
             expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
             expected_cmd:   RubySMB::SMB2::Packet::TreeDisconnectResponse::COMMAND,
-            received_proto: response.smb2_header.protocol,
-            received_cmd:   response.smb2_header.command
+            packet:         response
           )
         end
         response.status_code
       end
 
+      def open_pipe(opts)
+        # Make sure we don't modify the caller's hash options
+        opts = opts.dup
+        opts[:filename] = opts[:filename].dup
+        opts[:filename] = opts[:filename][1..-1] if opts[:filename].start_with? '\\'
+        open_file(opts)
+      end
+
       def open_file(filename:, attributes: nil, options: nil, disposition: RubySMB::Dispositions::FILE_OPEN,
                     impersonation: RubySMB::ImpersonationLevels::SEC_IMPERSONATE, read: true, write: false, delete: false)
 
@@ -108,8 +115,7 @@ module RubySMB
           raise RubySMB::Error::InvalidPacket.new(
             expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
             expected_cmd:   RubySMB::SMB2::Packet::CreateResponse::COMMAND,
-            received_proto: response.smb2_header.protocol,
-            received_cmd:   response.smb2_header.command
+            packet:         response
           )
         end
         unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS
@@ -167,8 +173,7 @@ module RubySMB
             raise RubySMB::Error::InvalidPacket.new(
               expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
               expected_cmd:   RubySMB::SMB2::Packet::QueryDirectoryResponse::COMMAND,
-              received_proto: directory_response.smb2_header.protocol,
-              received_cmd:   directory_response.smb2_header.command
+              packet:         directory_response
             )
           end
 
@@ -212,8 +217,7 @@ module RubySMB
           raise RubySMB::Error::InvalidPacket.new(
             expected_proto: RubySMB::SMB2::SMB2_PROTOCOL_ID,
             expected_cmd:   RubySMB::SMB2::Packet::CreateResponse::COMMAND,
-            received_proto: response.smb2_header.protocol,
-            received_cmd:   response.smb2_header.command
+            packet:         response
           )
         end
         unless response.status_code == WindowsError::NTStatus::STATUS_SUCCESS

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.8'.freeze
 end

data/spec/lib/ruby_smb/client_spec.rb

@@ -332,23 +332,28 @@ RSpec.describe RubySMB::Client do
       expect(smb2_client.sequence_counter).to eq(1)
     end
 
-    it 'updates #msb2_message_id with SMB2 header #credit_charge if the dialect is not 0x0202' do
+    it 'updates #smb2_message_id with SMB2 header #credit_charge if the server supports multi credits' do
       allow(smb2_client).to receive(:is_status_pending?).and_return(false)
       smb2_client.smb2_message_id = 0
-      smb2_client.dialect = '0x0210'
+      smb2_client.server_supports_multi_credit = true
       smb2_header.credit_charge = 5
       smb2_client.send_recv(smb2_request)
       expect(smb2_client.smb2_message_id).to eq(5)
     end
 
-    it 'does not update #msb2_message_id with SMB2 header #credit_charge if the dialect is 0x0202' do
+    it 'does not update #msb2_message_id with SMB2 header #credit_charge if the server does not support multi credits' do
       allow(smb2_client).to receive(:is_status_pending?).and_return(false)
       smb2_client.smb2_message_id = 0
-      smb2_client.dialect = '0x0202'
+      smb2_client.server_supports_multi_credit = false
       smb2_header.credit_charge = 5
       smb2_client.send_recv(smb2_request)
       expect(smb2_client.smb2_message_id).to eq(1)
     end
+
+    it 'ignores errors thrown when parsing the SMB2 header' do
+      allow(RubySMB::SMB2::SMB2Header).to receive(:read).and_raise(IOError)
+      expect { smb2_client.send_recv(smb2_request) }.to_not raise_error
+    end
   end
 
   describe '#is_status_pending?' do
@@ -2354,7 +2359,7 @@ RSpec.describe RubySMB::Client do
         let(:named_pipe){ double("Named Pipe") }
 
         before :example do
-          allow(tree).to receive(:open_file).and_return(named_pipe)
+          allow(tree).to receive(:open_pipe).and_return(named_pipe)
           allow(named_pipe).to receive(:net_share_enum_all)
         end
 
@@ -2369,8 +2374,8 @@ RSpec.describe RubySMB::Client do
             smb1_client.net_share_enum_all(sock.peeraddr)
           end
 
-          it 'it calls the Tree #open_file method to open "srvsvc" named pipe' do
-            expect(tree).to receive(:open_file).with(filename: "srvsvc", write: true, read: true).and_return(named_pipe)
+          it 'it calls the Tree #open_pipe method to open "srvsvc" named pipe' do
+            expect(tree).to receive(:open_pipe).with(filename: "srvsvc", write: true, read: true).and_return(named_pipe)
             smb1_client.net_share_enum_all(sock.peeraddr)
           end
 
@@ -2392,8 +2397,8 @@ RSpec.describe RubySMB::Client do
             smb2_client.net_share_enum_all(sock.peeraddr)
           end
 
-          it 'it calls the Tree #open_file method to open "srvsvc" named pipe' do
-            expect(tree).to receive(:open_file).with(filename: "srvsvc", write: true, read: true).and_return(named_pipe)
+          it 'it calls the Tree #open_pipe method to open "srvsvc" named pipe' do
+            expect(tree).to receive(:open_pipe).with(filename: "srvsvc", write: true, read: true).and_return(named_pipe)
             smb2_client.net_share_enum_all(sock.peeraddr)
           end
 
@@ -2474,7 +2479,7 @@ RSpec.describe RubySMB::Client do
       before :example do
         allow(ipc_tree).to receive_messages(
           :share     => share,
-          :open_file => named_pipe
+          :open_pipe => named_pipe
         )
         allow(client).to receive(:tree_connect).and_return(ipc_tree)
       end
@@ -2496,9 +2501,9 @@ RSpec.describe RubySMB::Client do
         expect(client).to have_received(:tree_connect).with(share)
       end
 
-      it 'open \'winreg\' file on the IPC$ Tree' do
+      it 'open \'winreg\' pipe on the IPC$ Tree' do
         client.connect_to_winreg(host)
-        expect(ipc_tree).to have_received(:open_file).with(filename: "winreg", write: true, read: true)
+        expect(ipc_tree).to have_received(:open_pipe).with(filename: "winreg", write: true, read: true)
       end
 
       it 'returns the expected opened named pipe' do

data/spec/lib/ruby_smb/compression/lznt1_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe RubySMB::Compression::LZNT1 do
+  describe '.compress' do
+    it 'generates an empty blob when provided an empty blob' do
+      expected = "".b
+      expect(described_class.compress('')).to eq(expected)
+    end
+
+    it 'generates a compressed blob when provided a string with non-reoccurring characters' do
+      expect(described_class.compress('RubySMB')).to eq("\x060RubySMB".b)
+    end
+
+    it 'generates a compressed blob when provided a string of reoccurring characters' do
+      expect(described_class.compress("\x01" * 0x200)).to eq("\x03\xB0\x02\x01\xFC\x01".b)
+    end
+  end
+
+  describe '.decompress' do
+    it 'generates a decompressed blob for a string with non-reoccurring characters' do
+      expect(described_class.decompress("\x060RubySMB".b)).to eq('RubySMB')
+    end
+
+    it 'generates a decompressed blob for a string of reoccurring characters' do
+      expect(described_class.decompress("\x03\xB0\x02\x01\xFC\x01".b)).to eq("\x01" * 0x200)
+    end
+
+    it 'raises an EncodingError when the length is invalid' do
+      expect { described_class.decompress("\x010".b) }.to raise_error(EncodingError)
+    end
+  end
+end

data/spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_request_spec.rb

@@ -0,0 +1,69 @@
+RSpec.describe RubySMB::Dcerpc::Netlogon::NetrServerAuthenticate3Request do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :primary_name }
+  it { is_expected.to respond_to :account_name }
+  it { is_expected.to respond_to :secure_channel_type }
+  it { is_expected.to respond_to :computer_name }
+  it { is_expected.to respond_to :client_credential }
+  it { is_expected.to respond_to :flags }
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  describe '#primary_name' do
+    it 'is a LogonsrvHandle structure' do
+      expect(packet.primary_name).to be_a RubySMB::Dcerpc::Netlogon::LogonsrvHandle
+    end
+  end
+
+  describe '#account_name' do
+    it 'is a NdrString structure' do
+      expect(packet.account_name).to be_a RubySMB::Dcerpc::Ndr::NdrString
+    end
+  end
+
+  describe '#secure_channel_type' do
+    it 'is a NetlogonSecureChannelType enum' do
+      expect(packet.secure_channel_type).to be_a RubySMB::Dcerpc::Netlogon::NetlogonSecureChannelType
+    end
+  end
+
+  describe '#computer_name' do
+    it 'is a NdrString structure' do
+      expect(packet.computer_name).to be_a RubySMB::Dcerpc::Ndr::NdrString
+    end
+  end
+
+  describe '#client_credential' do
+    it 'is a NetlogonCredential structure' do
+      expect(packet.client_credential).to be_a RubySMB::Dcerpc::Netlogon::NetlogonCredential
+    end
+  end
+
+  describe '#flags' do
+    it 'is a 32-bit unsigned integer' do
+      expect(packet.flags).to be_a BinData::Uint32le
+    end
+  end
+
+  describe '#initialize_instance' do
+    it 'sets #opnum to NETR_SERVER_AUTHENTICATE3 constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Netlogon::NETR_SERVER_AUTHENTICATE3)
+    end
+  end
+
+  it 'reads its own binary representation and outputs the same packet' do
+    packet = described_class.new(
+      primary_name: 'primary_name',
+      account_name: 'account_name',
+      secure_channel_type: 0,
+      computer_name: 'computer_name',
+      client_credential: "\x00" * 8,
+      flags: rand(0xffffffff)
+    )
+    binary = packet.to_binary_s
+    expect(described_class.read(binary)).to eq(packet)
+  end
+end

data/spec/lib/ruby_smb/dcerpc/netlogon/netr_server_authenticate3_response_spec.rb

@@ -0,0 +1,53 @@
+RSpec.describe RubySMB::Dcerpc::Netlogon::NetrServerAuthenticate3Response do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :server_credential }
+  it { is_expected.to respond_to :negotiate_flags }
+  it { is_expected.to respond_to :account_rid }
+  it { is_expected.to respond_to :error_status }
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  describe '#server_credential' do
+    it 'is a NetlogonCredential structure' do
+      expect(packet.server_credential).to be_a RubySMB::Dcerpc::Netlogon::NetlogonCredential
+    end
+  end
+
+  describe '#negotiate_flags' do
+    it 'is a 32-bit unsigned integer' do
+      expect(packet.negotiate_flags).to be_a BinData::Uint32le
+    end
+  end
+
+  describe '#account_rid' do
+    it 'is a 32-bit unsigned integer' do
+      expect(packet.account_rid).to be_a BinData::Uint32le
+    end
+  end
+
+  describe '#error_status' do
+    it 'is a 32-bit unsigned integer' do
+      expect(packet.error_status).to be_a BinData::Uint32le
+    end
+  end
+
+  describe '#initialize_instance' do
+    it 'sets #opnum to NETR_SERVER_AUTHENTICATE3 constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Netlogon::NETR_SERVER_AUTHENTICATE3)
+    end
+  end
+
+  it 'reads its own binary representation and outputs the same packet' do
+    packet = described_class.new(
+      server_credential: "\x00" * 8,
+      negotiate_flags: rand(0xffffffff),
+      account_rid: rand(0xffffffff),
+      error_status: rand(0xffffffff)
+    )
+    binary = packet.to_binary_s
+    expect(described_class.read(binary)).to eq(packet)
+  end
+end

data/spec/lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_request_spec.rb

@@ -0,0 +1,69 @@
+RSpec.describe RubySMB::Dcerpc::Netlogon::NetrServerPasswordSet2Request do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :primary_name }
+  it { is_expected.to respond_to :account_name }
+  it { is_expected.to respond_to :secure_channel_type }
+  it { is_expected.to respond_to :computer_name }
+  it { is_expected.to respond_to :authenticator }
+  it { is_expected.to respond_to :clear_new_password }
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  describe '#primary_name' do
+    it 'is a LogonsrvHandle structure' do
+      expect(packet.primary_name).to be_a RubySMB::Dcerpc::Netlogon::LogonsrvHandle
+    end
+  end
+
+  describe '#account_name' do
+    it 'is a NdrString structure' do
+      expect(packet.account_name).to be_a RubySMB::Dcerpc::Ndr::NdrString
+    end
+  end
+
+  describe '#secure_channel_type' do
+    it 'is a NetlogonSecureChannelType enum' do
+      expect(packet.secure_channel_type).to be_a RubySMB::Dcerpc::Netlogon::NetlogonSecureChannelType
+    end
+  end
+
+  describe '#computer_name' do
+    it 'is a NdrString structure' do
+      expect(packet.computer_name).to be_a RubySMB::Dcerpc::Ndr::NdrString
+    end
+  end
+
+  describe '#authenticator' do
+    it 'is a NetlogonAuthenticator structure' do
+      expect(packet.authenticator).to be_a RubySMB::Dcerpc::Netlogon::NetlogonAuthenticator
+    end
+  end
+
+  describe '#clear_new_password' do
+    it 'is a NdrFixedByteArray structure' do
+      expect(packet.clear_new_password).to be_a RubySMB::Dcerpc::Ndr::NdrFixedByteArray
+    end
+  end
+
+  describe '#initialize_instance' do
+    it 'sets #opnum to NETR_SERVER_PASSWORD_SET2 constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Netlogon::NETR_SERVER_PASSWORD_SET2)
+    end
+  end
+
+  it 'reads its own binary representation and outputs the same packet' do
+    packet = described_class.new(
+      primary_name: 'primary_name',
+      account_name: 'account_name',
+      secure_channel_type: 0,
+      computer_name: 'computer_name',
+      authenticator: RubySMB::Dcerpc::Netlogon::NetlogonAuthenticator.new,
+      clear_new_password: "\x00" * 516
+    )
+    binary = packet.to_binary_s
+    expect(described_class.read(binary)).to eq(packet)
+  end
+end

data/spec/lib/ruby_smb/dcerpc/netlogon/netr_server_password_set2_response_spec.rb

@@ -0,0 +1,37 @@
+RSpec.describe RubySMB::Dcerpc::Netlogon::NetrServerPasswordSet2Response do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :return_authenticator }
+  it { is_expected.to respond_to :error_status }
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  describe '#return_authenticator' do
+    it 'is a NetlogonAuthenticator structure' do
+      expect(packet.return_authenticator).to be_a RubySMB::Dcerpc::Netlogon::NetlogonAuthenticator
+    end
+  end
+
+  describe '#error_status' do
+    it 'is a 32-bit unsigned integer' do
+      expect(packet.error_status).to be_a BinData::Uint32le
+    end
+  end
+
+  describe '#initialize_instance' do
+    it 'sets #opnum to NETR_SERVER_PASSWORD_SET2 constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Netlogon::NETR_SERVER_PASSWORD_SET2)
+    end
+  end
+
+  it 'reads its own binary representation and outputs the same packet' do
+    packet = described_class.new(
+      return_authenticator: RubySMB::Dcerpc::Netlogon::NetlogonAuthenticator.new,
+      error_status: rand(0xffffffff)
+    )
+    binary = packet.to_binary_s
+    expect(described_class.read(binary)).to eq(packet)
+  end
+end

data/spec/lib/ruby_smb/dcerpc/netlogon/netr_server_req_challenge_request_spec.rb

@@ -0,0 +1,45 @@
+RSpec.describe RubySMB::Dcerpc::Netlogon::NetrServerReqChallengeRequest do
+  subject(:packet) { described_class.new }
+
+  it { is_expected.to respond_to :primary_name }
+  it { is_expected.to respond_to :computer_name }
+  it { is_expected.to respond_to :client_challenge }
+
+  it 'is little endian' do
+    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  end
+
+  describe '#primary_name' do
+    it 'is a LogonsrvHandle structure' do
+      expect(packet.primary_name).to be_a RubySMB::Dcerpc::Netlogon::LogonsrvHandle
+    end
+  end
+
+  describe '#computer_name' do
+    it 'is a NdrString structure' do
+      expect(packet.computer_name).to be_a RubySMB::Dcerpc::Ndr::NdrString
+    end
+  end
+
+  describe '#client_challenge' do
+    it 'is a NetlogonCredential structure' do
+      expect(packet.client_challenge).to be_a RubySMB::Dcerpc::Netlogon::NetlogonCredential
+    end
+  end
+
+  describe '#initialize_instance' do
+    it 'sets #opnum to NETR_SERVER_REQ_CHALLENGE constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Netlogon::NETR_SERVER_REQ_CHALLENGE)
+    end
+  end
+
+  it 'reads its own binary representation and outputs the same packet' do
+    packet = described_class.new(
+      primary_name: 'primary_name',
+      computer_name: 'computer_name',
+      client_challenge: "\x00" * 8,
+    )
+    binary = packet.to_binary_s
+    expect(described_class.read(binary)).to eq(packet)
+  end
+end