mongo 2.2.5 → 2.2.6

data/spec/mongo/auth/x509_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Auth::X509 do
 
   let(:address) do
-    Mongo::Address.new(DEFAULT_ADDRESS)
+    default_address
   end
 
   let(:monitoring) do

data/spec/mongo/client_spec.rb

@@ -2,14 +2,6 @@ require 'spec_helper'
 
 describe Mongo::Client do
 
-  before do
-    if running_ssl?
-      allow_any_instance_of(Mongo::Server::Monitor).to receive(:ismaster) do
-        [{}, 1]
-      end
-    end
-  end
-
   describe '#==' do
 
     let(:client) do
@@ -482,7 +474,7 @@ describe Mongo::Client do
     context 'when the read preference is printed' do
 
       let(:client) do
-        described_class.new([ DEFAULT_ADDRESS ], options)
+        described_class.new([ default_address.to_s ], options)
       end
 
       let(:options) do

data/spec/mongo/operation/result_spec.rb

@@ -292,14 +292,14 @@ describe Mongo::Operation::Result do
 
     before do
       class Result
-        def get_result
-          Mongo::Client.new([DEFAULT_ADDRESS], TEST_OPTIONS).database.command(:ping => 1)
+        def get_result(address)
+          Mongo::Client.new([address], TEST_OPTIONS).database.command(:ping => 1)
         end
       end
     end
 
     let(:result) do
-      Result.new.get_result
+      Result.new.get_result(default_address.to_s)
     end
 
     it 'uses the Result class of the operation' do

data/spec/mongo/operation/write/update_spec.rb

@@ -95,7 +95,7 @@ describe Mongo::Operation::Write::Update do
       context 'when the update succeeds' do
 
         let(:document) do
-          { 'q' => { name: 'test' }, 'u' => { '$set' => { field: 'blah' }}, limit: 1 }
+          { 'q' => { name: 'test' }, 'u' => { '$set' => { field: 'blah' }} }
         end
 
         let(:result) do

data/spec/mongo/server/connection_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Server::Connection do
 
   let(:address) do
-    Mongo::Address.new(DEFAULT_ADDRESS)
+    default_address
   end
 
   let(:monitoring) do
@@ -117,10 +117,21 @@ describe Mongo::Server::Connection do
           )
         end
 
+        let!(:error) do
+          e = begin; connection.send(:ensure_connected); rescue => ex; ex; end
+        end
+
         it 'raises an error' do
-          expect {
-            connection.connect!
-          }.to raise_error(Mongo::Auth::Unauthorized)
+          expect(error).to be_a(Mongo::Auth::Unauthorized)
+        end
+
+        it 'disconnects the socket' do
+          expect(connection.send(:socket)).to be(nil)
+        end
+
+        it 'marks the server as unknown' do
+          pending 'Server must be set as unknown'
+          expect(server).to be_unknown
         end
       end
 
@@ -239,6 +250,89 @@ describe Mongo::Server::Connection do
       end
     end
 
+    context 'when the response_to does not match the request_id' do
+
+      let(:documents) do
+        [{ 'name' => 'bob' }, { 'name' => 'alice' }]
+      end
+
+      let(:insert) do
+        Mongo::Protocol::Insert.new(TEST_DB, TEST_COLL, documents)
+      end
+
+      let(:query_bob) do
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'bob' })
+      end
+
+      let(:query_alice) do
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'alice' })
+      end
+
+      after do
+        authorized_collection.delete_many
+      end
+
+      before do
+        # Fake a query for which we did not read the response. See RUBY-1117
+        allow(query_bob).to receive(:replyable?) { false }
+        connection.dispatch([ insert, query_bob ])
+      end
+
+      it 'raises an UnexpectedResponse' do
+        expect {
+          connection.dispatch([ query_alice ])
+        }.to raise_error(Mongo::Error::UnexpectedResponse,
+          /Got response for request ID \d+ but expected response for request ID \d+/)
+      end
+
+      it "doesn't break subsequent requests" do
+        expect {
+          connection.dispatch([ query_alice ])
+        }.to raise_error(Mongo::Error::UnexpectedResponse)
+
+        expect(connection.dispatch([ query_alice ]).documents.first['name']).to eq('alice')
+      end
+    end
+
+    context 'when a request is brutaly interrupted (Thread.kill)' do
+
+      let(:documents) do
+        [{ 'name' => 'bob' }, { 'name' => 'alice' }]
+      end
+
+      let(:insert) do
+        Mongo::Protocol::Insert.new(TEST_DB, TEST_COLL, documents)
+      end
+
+      let(:query_bob) do
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'bob' })
+      end
+
+      let(:query_alice) do
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'alice' })
+      end
+
+      before do
+        connection.dispatch([ insert ])
+      end
+
+      after do
+        authorized_collection.delete_many
+      end
+
+      it "closes the socket and does not use it for subsequent requests" do
+        t = Thread.new {
+          # Kill the thread just before the reply is read
+          allow(Mongo::Protocol::Reply).to receive(:deserialize_header) { t.kill }
+          connection.dispatch([ query_bob ])
+        }
+        t.join
+        allow(Mongo::Protocol::Reply).to receive(:deserialize_header).and_call_original
+        expect(connection.dispatch([ query_alice ]).documents.first['name']).to eq('alice')
+      end
+    end
+
+
     context 'when the message exceeds the max size' do
 
       context 'when the message is an insert' do
@@ -438,4 +532,74 @@ describe Mongo::Server::Connection do
       end
     end
   end
+
+  describe '#auth_mechanism' do
+
+    let(:connection) do
+      described_class.new(server)
+    end
+
+    let(:reply) do
+      double('reply').tap do |r|
+        allow(r).to receive(:documents).and_return([ ismaster ])
+      end
+    end
+
+    before do
+      connection.connect!
+      socket = connection.instance_variable_get(:@socket)
+      max_message_size = connection.send(:max_message_size)
+      allow(Mongo::Protocol::Reply).to receive(:deserialize).with(socket, max_message_size).and_return(reply)
+    end
+
+    context 'when the ismaster response indicates the auth mechanism is :scram' do
+
+      let(:ismaster) do
+        {
+            'maxWireVersion' => 3,
+            'minWireVersion' => 0,
+            'ok' => 1
+        }
+      end
+
+      context 'when the server auth mechanism is scram', if: scram_sha_1_enabled? do
+
+        it 'uses scram' do
+          expect(connection.send(:default_mechanism)).to eq(:scram)
+        end
+      end
+
+      context 'when the server auth mechanism is the default (mongodb_cr)', unless: scram_sha_1_enabled?  do
+
+        it 'uses scram' do
+          expect(connection.send(:default_mechanism)).to eq(:scram)
+        end
+      end
+    end
+
+    context 'when the ismaster response indicates the auth mechanism is :mongodb_cr' do
+
+      let(:ismaster) do
+        {
+            'maxWireVersion' => 2,
+            'minWireVersion' => 0,
+            'ok' => 1
+        }
+      end
+
+      context 'when the server auth mechanism is scram', if: scram_sha_1_enabled? do
+
+        it 'uses scram' do
+          expect(connection.send(:default_mechanism)).to eq(:scram)
+        end
+      end
+
+      context 'when the server auth mechanism is the default (mongodb_cr)', unless: scram_sha_1_enabled?  do
+
+        it 'uses mongodb_cr' do
+          expect(connection.send(:default_mechanism)).to eq(:mongodb_cr)
+        end
+      end
+    end
+  end
 end

data/spec/mongo/server/monitor_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Server::Monitor do
 
   let(:address) do
-    Mongo::Address.new(DEFAULT_ADDRESS)
+    default_address
   end
 
   let(:listeners) do
@@ -26,6 +26,36 @@ describe Mongo::Server::Monitor do
       end
     end
 
+    context 'when the ismaster fails the first time' do
+
+      let(:monitor) do
+        described_class.new(address, listeners, TEST_OPTIONS)
+      end
+
+      let(:socket) do
+        monitor.connection.connect!
+        monitor.connection.__send__(:socket)
+      end
+
+      before do
+        expect(socket).to receive(:write).once.and_raise(Mongo::Error::SocketError)
+        expect(socket).to receive(:write).and_call_original
+        monitor.scan!
+      end
+
+      it 'retries the ismaster', if: standalone? do
+        expect(monitor.description).to be_standalone
+      end
+
+      it 'retries the ismaster', if: replica_set? do
+        expect(monitor.description).to be_primary
+      end
+
+      it 'retries the ismaster', if: sharded? do
+        expect(monitor.description).to be_mongos
+      end
+    end
+
     context 'when the ismaster command succeeds' do
 
       let(:monitor) do
@@ -73,7 +103,7 @@ describe Mongo::Server::Monitor do
       context 'when the socket gets an exception' do
 
         let(:bad_address) do
-          Mongo::Address.new(DEFAULT_ADDRESS)
+          default_address
         end
 
         let(:monitor) do
@@ -86,7 +116,7 @@ describe Mongo::Server::Monitor do
         end
 
         before do
-          expect(socket).to receive(:write).and_raise(Mongo::Error::SocketError)
+          expect(socket).to receive(:write).twice.and_raise(Mongo::Error::SocketError)
           monitor.scan!
         end
 
@@ -120,7 +150,7 @@ describe Mongo::Server::Monitor do
         described_class.new(address, listeners)
       end
 
-      it 'defaults to 5' do
+      it 'defaults to 10' do
         expect(monitor.heartbeat_frequency).to eq(10)
       end
     end

data/spec/mongo/server_selector/nearest_spec.rb

@@ -85,10 +85,10 @@ describe Mongo::ServerSelector::Nearest do
     context 'tag sets provided' do
       let(:tag_sets) { [tag_set] }
       let(:matching_primary) do
-        server(:primary, :tags => server_tags)
+        server(:primary, :tags => server_tags, address: default_address)
       end
       let(:matching_secondary) do
-        server(:secondary, :tags => server_tags)
+        server(:secondary, :tags => server_tags, address: default_address)
       end
 
       context 'single candidate' do
@@ -173,8 +173,8 @@ describe Mongo::ServerSelector::Nearest do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 113) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 114) }
+      let(:far_primary) { server(:primary, :average_round_trip_time => 113, address: default_address) }
+      let(:far_secondary) { server(:secondary, :average_round_trip_time => 114, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -81,11 +81,11 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:tag_sets) { [tag_set] }
 
       let(:matching_primary) do
-        server(:primary, :tags => server_tags )
+        server(:primary, :tags => server_tags, address: default_address )
       end
 
       let(:matching_secondary) do
-        server(:secondary, :tags => server_tags )
+        server(:secondary, :tags => server_tags, address: default_address )
       end
 
       context 'single candidate' do
@@ -171,8 +171,8 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113) }
+      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/primary_spec.rb

@@ -76,8 +76,8 @@ describe Mongo::ServerSelector::Primary do
     end
 
     context 'high latency candidates' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 120) }
+      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { server(:secondary, :average_round_trip_time => 120, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -87,11 +87,11 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       end
 
       let(:matching_primary) do
-        server(:primary, :tags => server_tags)
+        server(:primary, :tags => server_tags, address: default_address)
       end
 
       let(:matching_secondary) do
-        server(:secondary, :tags => server_tags)
+        server(:secondary, :tags => server_tags, address: default_address)
       end
 
       context 'single candidate' do
@@ -170,8 +170,8 @@ describe Mongo::ServerSelector::SecondaryPreferred do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113) }
+      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/secondary_spec.rb

@@ -76,7 +76,7 @@ describe Mongo::ServerSelector::Secondary do
 
     context 'tag sets provided' do
       let(:tag_sets) { [tag_set] }
-      let(:matching_secondary) { server(:secondary, :tags => server_tags) }
+      let(:matching_secondary) { server(:secondary, :tags => server_tags, address: default_address) }
 
       context 'single candidate' do
 
@@ -134,8 +134,8 @@ describe Mongo::ServerSelector::Secondary do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113) }
+      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_spec.rb

@@ -15,7 +15,7 @@ describe Mongo::Server do
   end
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    default_address
   end
 
   let(:pool) do
@@ -167,11 +167,11 @@ describe Mongo::Server do
     end
 
     it 'sets the address host' do
-      expect(server.address.host).to eq('127.0.0.1')
+      expect(server.address.host).to eq(default_address.host)
     end
 
     it 'sets the address port' do
-      expect(server.address.port).to eq(27017)
+      expect(server.address.port).to eq(default_address.port)
     end
 
     it 'sets the options' do