mongo 2.11.1 → 2.11.6

data/lib/mongo/server/monitor.rb

@@ -204,7 +204,7 @@ module Mongo
             connection.ismaster
           end
           if exc
-            log_debug("Error running ismaster on #{server.address}: #{exc.class}: #{exc.message}")
+            log_debug("Error running ismaster on #{server.address}: #{exc.class}: #{exc}:\n#{exc.backtrace[0..5].join("\n")}")
             if monitoring.monitoring?
               monitoring.failed(
                 Monitoring::SERVER_HEARTBEAT,

data/lib/mongo/server/monitor/connection.rb

@@ -162,8 +162,7 @@ module Mongo
         # @since 2.0.0
         def connect!
           unless @socket
-            socket = address.socket(socket_timeout, ssl_options,
-              connect_timeout: address.connect_timeout)
+            socket = address.socket(socket_timeout, ssl_options, address.options)
             handshake!(socket)
             @socket = socket
           end
@@ -232,7 +231,7 @@ module Mongo
             log_warn("Asked to handshake with #{address} but there was no app metadata provided")
           end
         rescue => e
-          log_warn("Failed to handshake with #{address}: #{e.class}: #{e}")
+          log_warn("Failed to handshake with #{address}: #{e.class}: #{e}:\n#{e.backtrace[0..5].join("\n")}")
           raise
         end
 

data/lib/mongo/session.rb

@@ -881,21 +881,21 @@ module Mongo
       end
     end
 
-    # Validate the session.
+    # Validate the session for use by the specified client.
     #
-    # @example
-    #   session.validate!(cluster)
+    # The session must not be ended and must have been created by a client
+    # with the same cluster as the client that the session is to be used with.
     #
-    # @param [ Cluster ] cluster The cluster the session is attempted to be used with.
+    # @param [ Client ] client The client the session is to be used with.
     #
-    # @return [ nil ] nil if the session is valid.
+    # @return [ Session ] self, if the session is valid.
     #
-    # @raise [ Mongo::Error::InvalidSession ] Raise error if the session is not valid.
+    # @raise [ Mongo::Error::InvalidSession ] Exception raised if the session is not valid.
     #
     # @since 2.5.0
     # @api private
-    def validate!(cluster)
-      check_matching_cluster!(cluster)
+    def validate!(client)
+      check_matching_cluster!(client)
       check_if_ended!
       self
     end
@@ -1041,8 +1041,8 @@ module Mongo
       raise Mongo::Error::InvalidSession.new(SESSION_ENDED_ERROR_MSG) if ended?
     end
 
-    def check_matching_cluster!(cluster)
-      if @client.cluster != cluster
+    def check_matching_cluster!(client)
+      if @client.cluster != client.cluster
         raise Mongo::Error::InvalidSession.new(MISMATCHED_CLUSTER_ERROR_MSG)
       end
     end

data/lib/mongo/socket.rb

@@ -63,7 +63,16 @@ module Mongo
     def alive?
       sock_arr = [ @socket ]
       if Kernel::select(sock_arr, nil, sock_arr, 0)
-        eof?
+        # The eof? call is supposed to return immediately since select
+        # indicated the socket is readable. However, if @socket is an SSL
+        # socket, eof? can block anyway - see RUBY-2140.
+        begin
+          Timeout.timeout(0.1) do
+            eof?
+          end
+        rescue ::Timeout::Error
+          true
+        end
       else
         true
       end

data/lib/mongo/uri.rb

@@ -454,7 +454,7 @@ module Mongo
     end
 
     def decode(value)
-      ::URI.decode(value)
+      ::URI::DEFAULT_PARSER.unescape(value)
     end
 
     def encode(value)

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.11.1'.freeze
+  VERSION = '2.11.6'.freeze
 end

data/mongo.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.3"
 
-  s.add_dependency 'bson', '>=4.6.0', '<5.0.0'
+  s.add_dependency 'bson', '>=4.4.2', '<5.0.0'
 end

data/spec/README.md

@@ -74,6 +74,19 @@ configuration is needed:
 
     rake
 
+### Replica Set With Arbiter
+
+Some tests require an arbiter to be present in the replica set. Such a
+deployment can be obtained by providing `--arbiter` argument to mlaunch:
+
+    mlaunch init --replicaset --arbiter --name ruby-driver-rs \
+      --dir /tmp/mdb-rs --setParameter enableTestCommands=1
+
+To indicate to the test suite that the deployment contains an arbiter, set
+HAVE_ARBITER environment variable as follows:
+
+    HAVE_ARBITER=1 rake
+
 ### Sharded Cluster
 
 A sharded cluster can be configured with mlaunch:

data/spec/integration/auth_spec.rb

@@ -41,7 +41,7 @@ describe 'Auth' do
           it 'indicates scram-sha-1 was used' do
             expect do
               connection.connect!
-            end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram\) is not authorized to access admin.*\(used mechanism: SCRAM-SHA-1\)/)
+            end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram\) is not authorized to access admin.*used mechanism: SCRAM-SHA-1/)
           end
         end
 
@@ -53,7 +53,7 @@ describe 'Auth' do
           it 'indicates scram-sha-1 was used' do
             expect do
               connection.connect!
-            end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram\) is not authorized to access admin.*\(used mechanism: SCRAM-SHA-1\)/)
+            end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram\) is not authorized to access admin.*used mechanism: SCRAM-SHA-1/)
           end
         end
       end
@@ -73,7 +73,7 @@ describe 'Auth' do
           it 'indicates scram-sha-1 was used' do
             expect do
               connection.connect!
-            end.to raise_error(Mongo::Auth::Unauthorized, /User existing_user \(mechanism: scram\) is not authorized to access admin.*\(used mechanism: SCRAM-SHA-1\)/)
+            end.to raise_error(Mongo::Auth::Unauthorized, /User existing_user \(mechanism: scram\) is not authorized to access admin.*used mechanism: SCRAM-SHA-1/)
           end
         end
 
@@ -85,7 +85,7 @@ describe 'Auth' do
           it 'indicates scram-sha-256 was used' do
             expect do
               connection.connect!
-            end.to raise_error(Mongo::Auth::Unauthorized, /User existing_user \(mechanism: scram256\) is not authorized to access admin.*\(used mechanism: SCRAM-SHA-256\)/)
+            end.to raise_error(Mongo::Auth::Unauthorized, /User existing_user \(mechanism: scram256\) is not authorized to access admin.*used mechanism: SCRAM-SHA-256/)
           end
         end
       end
@@ -101,7 +101,7 @@ describe 'Auth' do
         it 'indicates scram-sha-1 was requested and used' do
           expect do
             connection.connect!
-          end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram\) is not authorized to access admin.*\(used mechanism: SCRAM-SHA-1\)/)
+          end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram\) is not authorized to access admin.*used mechanism: SCRAM-SHA-1/)
         end
       end
 
@@ -114,7 +114,7 @@ describe 'Auth' do
         it 'indicates scram-sha-256 was requested and used' do
           expect do
             connection.connect!
-          end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram256\) is not authorized to access admin.*\(used mechanism: SCRAM-SHA-256\)/)
+          end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user \(mechanism: scram256\) is not authorized to access admin.*used mechanism: SCRAM-SHA-256/)
         end
       end
     end
@@ -123,10 +123,29 @@ describe 'Auth' do
       let(:options) { SpecConfig.instance.ssl_options.merge(
         user: 'nonexistent_user', password: 'foo') }
 
-      it 'reports auth source used' do
+      it 'reports which server authentication was attempted against' do
         expect do
           connection.connect!
-        end.to raise_error(Mongo::Auth::Unauthorized, /User nonexistent_user.*is not authorized to access admin \(auth source: admin\)/)
+        end.to raise_error(Mongo::Auth::Unauthorized, /used server: #{connection.address.to_s}/)
+      end
+
+      context 'with default auth source' do
+        it 'reports auth source used' do
+          expect do
+            connection.connect!
+          end.to raise_error(Mongo::Auth::Unauthorized, /auth source: admin/)
+        end
+      end
+
+      context 'with custom auth source' do
+        let(:options) { SpecConfig.instance.ssl_options.merge(
+          user: 'nonexistent_user', password: 'foo', auth_source: 'authdb') }
+
+        it 'reports auth source used' do
+          expect do
+            connection.connect!
+          end.to raise_error(Mongo::Auth::Unauthorized, /auth source: authdb/)
+        end
       end
     end
 

data/spec/integration/bson_symbol_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe 'Symbol encoding to BSON' do
+  let(:value) { :foo }
+
+  let(:hash) do
+    {'foo' => value}
+  end
+
+  let(:serialized) do
+    hash.to_bson.to_s
+  end
+
+  let(:expected) do
+    "\x12\x00\x00\x00\x0Efoo\x00\x04\x00\x00\x00foo\x00\x00".force_encoding('binary')
+  end
+
+  it 'encodes symbol to BSON symbol' do
+    serialized.should == expected
+  end
+
+  it 'round-trips symbol values' do
+    buffer = BSON::ByteBuffer.new(serialized)
+    Hash.from_bson(buffer).should == hash
+  end
+
+  it 'round-trips symbol values using the same byte buffer' do
+    if BSON::Environment.jruby?
+      pending 'https://jira.mongodb.org/browse/RUBY-2128'
+    end
+
+    Hash.from_bson(hash.to_bson).should == hash
+  end
+end

data/spec/integration/client_construction_spec.rb

@@ -82,6 +82,20 @@ describe 'Client construction' do
       expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::Single)
       expect(client.options[:connect]).to eq :direct
     end
+
+    context 'direct connection with mismached me' do
+      let(:address) { ClusterConfig.instance.alternate_address.to_s }
+
+      let(:client) do
+        new_local_client([address], SpecConfig.instance.test_options)
+      end
+
+      let(:server) { client.cluster.next_primary }
+
+      it 'sets server type to primary' do
+        expect(server.description).to be_primary
+      end
+    end
   end
 
   context 'in sharded topology' do

data/spec/integration/client_options_spec.rb

@@ -38,7 +38,7 @@ describe 'Client options' do
     end
   end
 
-  shared_examples_for 'auth mechanism that uses database or default auth source' do |default_auth_source:|
+  shared_examples_for 'auth mechanism that uses database or default auth source' do |default_auth_source|
     context 'where no database is provided' do
       context 'with URI options' do
         let(:credentials) { "#{user}:#{pwd}@" }
@@ -198,7 +198,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :mongodb_cr }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
+    it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end
 
@@ -207,7 +207,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :scram }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
+    it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end
 
@@ -216,7 +216,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :scram256 }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: 'admin'
+    it_behaves_like 'auth mechanism that uses database or default auth source', 'admin'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end
 
@@ -263,7 +263,7 @@ describe 'Client options' do
     let(:auth_mech_sym) { :plain }
 
     it_behaves_like 'a supported auth mechanism'
-    it_behaves_like 'auth mechanism that uses database or default auth source', default_auth_source: '$external'
+    it_behaves_like 'auth mechanism that uses database or default auth source', '$external'
     it_behaves_like 'an auth mechanism with ssl'
     it_behaves_like 'an auth mechanism that doesn\'t support auth_mech_properties'
   end

data/spec/integration/connection_spec.rb

@@ -12,17 +12,18 @@ describe 'Connections' do
   let(:server) { client.cluster.servers.first }
 
   describe '#connect!' do
-    # On JRuby 9.2.7.0, this line:
-    # expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(exception)
-    # ... appears to produce a moment in which Mongo::Socket#write is undefined
-    # entirely, resulting in this failure:
-    # RSpec::Expectations::ExpectationNotMetError: expected Mongo::Error::SocketError, got #<NameError: undefined method `write' for class `Mongo::Socket'>
-    fails_on_jruby
+
+    let(:connection) do
+      Mongo::Server::Connection.new(server, server.options)
+    end
 
     context 'network error during handshake' do
-      let(:connection) do
-        Mongo::Server::Connection.new(server, server.options)
-      end
+      # On JRuby 9.2.7.0, this line:
+      # expect_any_instance_of(Mongo::Socket).to receive(:write).and_raise(exception)
+      # ... appears to produce a moment in which Mongo::Socket#write is undefined
+      # entirely, resulting in this failure:
+      # RSpec::Expectations::ExpectationNotMetError: expected Mongo::Error::SocketError, got #<NameError: undefined method `write' for class `Mongo::Socket'>
+      fails_on_jruby
 
       let(:exception) { Mongo::Error::SocketError }
 
@@ -120,6 +121,53 @@ describe 'Connections' do
           expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::ReplicaSetNoPrimary)
         end
       end
+
+      describe 'number of sockets created' do
+
+        before do
+          server
+        end
+
+        shared_examples_for 'is 1 per connection' do
+          it 'is 1 per connection' do
+            # Instantiating a connection object should not create any sockets
+            RSpec::Mocks.with_temporary_scope do
+              expect(socket_cls).not_to receive(:new)
+
+              connection
+            end
+
+            # When the connection connects, exactly one socket should be created
+            # (and subsequently connected)
+            RSpec::Mocks.with_temporary_scope do
+              expect(socket_cls).to receive(:new).and_call_original
+
+              connection.connect!
+            end
+          end
+        end
+
+        let(:socket_cls) { ::Socket }
+
+        it_behaves_like 'is 1 per connection'
+
+        context 'connection to Unix domain socket' do
+          # Server does not allow Unix socket connections when TLS is enabled
+          require_no_tls
+
+          let(:port) { SpecConfig.instance.any_port }
+
+          let(:client) do
+            new_local_client(["/tmp/mongodb-#{port}.sock"], connect: :direct).tap do |client|
+              stop_monitoring(client)
+            end
+          end
+
+          let(:socket_cls) { ::UNIXSocket }
+
+          it_behaves_like 'is 1 per connection'
+        end
+      end
     end
 
     describe 'wire protocol version range update' do

data/spec/integration/crud_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe 'CRUD operations' do
+  let(:collection) { authorized_client['crud_integration'] }
+
+  before do
+    collection.delete_many
+  end
+
+  describe 'upsert' do
+    context 'with default write concern' do
+      it 'upserts' do
+        collection.count_documents({}).should == 0
+
+        res = collection.find(_id: 'foo').update_one({'$set' => {foo: 'bar'}}, upsert: true)
+
+        res.documents.first['upserted'].length.should == 1
+
+        collection.count_documents({}).should == 1
+      end
+    end
+
+    context 'unacknowledged write' do
+      let(:unack_collection) do
+        collection.with(write_concern: {w: 0})
+      end
+
+      before do
+        unack_collection.write_concern.acknowledged?.should be false
+      end
+
+      it 'upserts' do
+        unack_collection.count_documents({}).should == 0
+
+        res = unack_collection.find(_id: 'foo').update_one({'$set' => {foo: 'bar'}}, upsert: true)
+
+        # since write concern is unacknowledged, wait for the data to be
+        # persisted (hopefully)
+        sleep 0.25
+
+        unack_collection.count_documents({}).should == 1
+      end
+    end
+  end
+end

data/spec/integration/cursor_reaping_spec.rb

@@ -59,7 +59,8 @@ describe 'Cursor reaping' do
       client.cluster.instance_variable_get('@periodic_executor').execute
 
       started_event = EventSubscriber.started_events.detect do |event|
-        event.command['killCursors'] && event.command['cursors'].map(&:value).include?(cursor_id)
+        event.command['killCursors'] &&
+        event.command['cursors'].map { |c| Utils.int64_value(c) }.include?(cursor_id)
       end
 
       expect(started_event).not_to be_nil