mongo 2.11.1 → 2.11.2

data/spec/mongo/auth/x509/conversation_spec.rb

@@ -16,7 +16,7 @@ describe Mongo::Auth::X509::Conversation do
   describe '#start' do
 
     let(:query) do
-      conversation.start
+      conversation.start(nil)
     end
 
     let(:selector) do

data/spec/mongo/client_construction_spec.rb

@@ -94,27 +94,7 @@ describe Mongo::Client do
       # cluster during SDAM
       context 'me mismatch on the only initial seed' do
         let(:address) do
-          address = SpecConfig.instance.addresses.first
-          port = address.sub(/^.*:/, '').to_i
-          address = address.sub(/:.*/, '')
-          case address
-          when '127.0.0.1'
-            'localhost'
-          when /^(\d+\.){3}\d+$/
-            skip 'This test requires a hostname or 127.0.0.1 as address'
-          else
-            # We don't know if mongod is listening on ipv4 or ipv6,
-            # in principle.
-            # Our tests use ipv4, so hardcode that for now.
-            # To support both we need to try both addresses
-            # which will make this test more complicated.
-            resolved_address = Addrinfo.getaddrinfo(address, port, Socket::PF_INET).first.ip_address
-            if resolved_address.include?(':')
-              "[#{resolved_address}]"
-            else
-              resolved_address
-            end + ":#{port}"
-          end
+          ClusterConfig.instance.alternate_address.to_s
         end
 
         let(:logger) do

data/spec/mongo/cluster_spec.rb

@@ -575,6 +575,44 @@ describe Mongo::Cluster do
   end
 
   describe '#sessions_supported?' do
+    context 'when client has not contacted any servers' do
+
+      let(:cluster) do
+        described_class.new(SpecConfig.instance.addresses, monitoring,
+          SpecConfig.instance.test_options.merge(
+            monitoring_io: false, server_selection_timeout: 0.183))
+      end
+
+      it 'is false' do
+        expect(cluster.send(:sessions_supported?)).to be false
+      end
+    end
+
+    context 'when client has contacted servers and then disconnected' do
+      min_server_fcv '3.6'
+      require_wired_tiger
+      require_topology :sharded, :replica_set
+
+      let(:cluster) do
+        described_class.new(SpecConfig.instance.addresses, monitoring,
+          SpecConfig.instance.test_options.merge(
+            server_selection_timeout: 0.183)
+        ).tap do |cluster|
+          register_cluster(cluster)
+        end
+      end
+
+      before do
+        cluster.next_primary
+        cluster.servers_list.map(&:disconnect!)
+        cluster.servers_list.map(&:unknown!)
+      end
+
+      it 'is true' do
+        expect(cluster.send(:sessions_supported?)).to be true
+      end
+    end
+
     context 'in server < 3.6' do
       max_server_version '3.4'
 

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -575,7 +575,7 @@ describe Mongo::Collection::View::MapReduce do
         expect(map_reduce.send(:secondary_ok?)).to be false
       end
 
-      context 'when the server is not a valid for writing' do
+      context 'when the server is not valid for writing' do
         clean_slate
 
         before do

data/spec/mongo/server/connection_spec.rb

@@ -419,6 +419,73 @@ describe Mongo::Server::Connection, retry: 3 do
       end
     end
 
+    context 'connecting to arbiter' do
+      require_topology :replica_set
+
+      before(:all) do
+        unless ENV['HAVE_ARBITER']
+          skip 'Test requires an arbiter in the deployment'
+        end
+      end
+
+      let(:arbiter_server) do
+        authorized_client.cluster.servers_list.each do |server|
+          server.scan!
+        end
+        server = authorized_client.cluster.servers_list.detect do |server|
+          server.arbiter?
+        end.tap do |server|
+          raise 'No arbiter in the deployment' unless server
+        end
+      end
+
+      shared_examples_for 'does not authenticate' do
+        let(:client) do
+          new_local_client([address],
+            SpecConfig.instance.test_options.merge(
+              :user => 'bogus',
+              :password => 'bogus',
+              :database => 'bogus'
+            ).merge(connect: :direct),
+          )
+        end
+
+        let(:connection) do
+          described_class.new(
+            server,
+          )
+        end
+
+        let(:ping) do
+          client.database.command(ping: 1)
+        end
+
+        it 'does not authenticate' do
+          ClientRegistry.instance.close_all_clients
+
+          expect_any_instance_of(Mongo::Server::Connection).not_to receive(:authenticate!)
+
+          expect(ping.documents.first['ok']).to eq(1) rescue nil
+        end
+      end
+
+      context 'without me mismatch' do
+        let(:address) do
+          arbiter_server.address.to_s
+        end
+
+        it_behaves_like 'does not authenticate'
+      end
+
+      context 'with me mismatch' do
+        let(:address) do
+          "#{ClusterConfig.instance.alternate_address.host}:#{arbiter_server.address.port}"
+        end
+
+        it_behaves_like 'does not authenticate'
+      end
+    end
+
   end
 
   describe '#disconnect!' do

data/spec/runners/sdam/verifier.rb

@@ -37,10 +37,13 @@ module Sdam
         verify_description_matches(server, desc)
       end
 
+      # Verify actual topology has no servers not also present in the
+      # expected topology description.
+      expected_addresses = expected['servers'].map do |server|
+        server['address']
+      end
       actual.server_descriptions.keys.each do |address_str|
-        expect(
-          expected['servers'].any? { |server| server['address'] == address_str }
-        ).to be true
+        expect(expected_addresses).to include(address_str)
       end
     end
 

data/spec/spec_tests/data/sdam/rs/primary_address_change.yml

@@ -0,0 +1,29 @@
+description: Primary whose address differs from client address but no me mismatch
+uri: mongodb://localhost:27017/?replicaSet=rs
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Both of the hosts in the primary description are added to the topology.
+    # Existing server (localhost:27017) is removed from topology because
+    # its address is not in the list of hosts returned by the primary.
+    servers:
+      a:27017:
+        setName: 
+        type: Unknown
+      b:27017:
+        setName: 
+        type: Unknown
+    setName: rs
+    topologyType: ReplicaSetNoPrimary
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam/rs/primary_mismatched_me.yml

@@ -1,26 +1,30 @@
 description: Primary mismatched me
+uri: mongodb://localhost:27017/?replicaSet=rs
 phases:
-  - outcome:
-      servers:
-        'a:27017':
-          setName: null
-          type: Unknown
-        'b:27017':
-          setName: null
-          type: Unknown
+-
+  responses:
+  -
+    - localhost:27017
+    - me: a:27017
+      hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
       setName: rs
-      topologyType: ReplicaSetNoPrimary
-      logicalSessionTimeoutMinutes: null
-    responses:
-      - - 'localhost:27017'
-        - me: 'a:27017'
-          hosts:
-            - 'a:27017'
-            - 'b:27017'
-          ismaster: true
-          ok: 1
-          setName: rs
-          minWireVersion: 0
-          maxWireVersion: 6
-uri: 'mongodb://localhost:27017/?replicaSet=rs'
-
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Both of the hosts in the primary description are added to the topology.
+    # Existing server (localhost:27017) is removed from topology because
+    # its address is not in the list of hosts returned by the primary.
+    servers:
+      a:27017:
+        setName: 
+        type: Unknown
+      b:27017:
+        setName: 
+        type: Unknown
+    setName: rs
+    topologyType: ReplicaSetNoPrimary
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml

@@ -1,79 +1,56 @@
-description: "Primary to no primary with mismatched me"
-
-uri: "mongodb://a/?replicaSet=rs"
-
-phases: [
-
-    {
-        responses: [
-
-                ["a:27017", {
-
-                    ok: 1,
-                    ismaster: true,
-                    hosts: ["a:27017", "b:27017"],
-                    me: "a:27017",
-                    setName: "rs",
-                    minWireVersion: 0,
-                    maxWireVersion: 6
-                }]
-        ],
-
-        outcome: {
-
-            servers: {
-
-                "a:27017": {
-
-                    type: "RSPrimary",
-                    setName: "rs"
-                },
-
-                "b:27017": {
-
-                    type: "Unknown",
-                    setName:
-                }
-            },
-            topologyType: "ReplicaSetWithPrimary",
-            logicalSessionTimeoutMinutes: null,
-            setName: "rs"
-        }
-    },
-    {
-        responses: [
-
-                ["a:27017", {
-
-                    ok: 1,
-                    ismaster: true,
-                    hosts: ["c:27017", "d:27017"],
-                    me : "c:27017",
-                    setName: "rs",
-                    minWireVersion: 0,
-                    maxWireVersion: 6
-                }]
-        ],
-
-        outcome: {
-
-            servers: {
-
-                "c:27017": {
-
-                    type: "Unknown",
-                    setName:
-                },
-
-                "d:27017": {
-
-                    type: "Unknown",
-                    setName:
-                }
-            },
-            topologyType: "ReplicaSetNoPrimary",
-            logicalSessionTimeoutMinutes: null,
-            setName: "rs"
-        }
-    }
-]
+description: Primary to no primary with mismatched me
+uri: mongodb://a/?replicaSet=rs
+
+phases:
+-
+  responses:
+  -
+    - a:27017
+    - ok: 1
+      ismaster: true
+      hosts:
+      - a:27017
+      - b:27017
+      me: a:27017
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    servers:
+      a:27017:
+        type: RSPrimary
+        setName: rs
+      b:27017:
+        type: Unknown
+        setName: 
+    topologyType: ReplicaSetWithPrimary
+    logicalSessionTimeoutMinutes: 
+    setName: rs
+
+-
+  responses:
+  -
+    - a:27017
+    - ok: 1
+      ismaster: true
+      hosts:
+      - c:27017
+      - d:27017
+      me: c:27017
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Hosts from primary description (c:27017 and d:27017) added to the topoolgy.
+    # Hosts not in primary description (a:27017 and b:27017) are removed from
+    # the topology.
+    servers:
+      c:27017:
+        type: Unknown
+        setName: 
+      d:27017:
+        type: Unknown
+        setName: 
+    topologyType: ReplicaSetNoPrimary
+    logicalSessionTimeoutMinutes: 
+    setName: rs

data/spec/spec_tests/data/sdam/sharded/primary_address_change.yml

@@ -0,0 +1,21 @@
+description: RS Primary whose address differs from client address but no me mismatch
+uri: mongodb://localhost:27017/?connect=sharded
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Since the server is of the wrong type, it is removed from the topology.
+    servers:
+      {}
+    topologyType: Sharded
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam/sharded/primary_mismatched_me.yml

@@ -0,0 +1,22 @@
+description: RS Primary w/mismatched me
+uri: mongodb://localhost:27017/?connect=sharded
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - me: a:27017
+      hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Since the server is of the wrong type, it is removed from the topology.
+    servers:
+      {}
+    topologyType: Sharded
+    logicalSessionTimeoutMinutes: