mongo 2.11.6 → 2.12.0.rc0

data/spec/mongo/cluster/cursor_reaper_spec.rb

@@ -91,18 +91,16 @@ describe Mongo::Cluster::CursorReaper do
 
   describe '#register_cursor' do
 
-    before do
-      reaper.register_cursor(cursor_id)
-    end
-
     context 'when the cursor id is nil' do
 
       let(:cursor_id) do
         nil
       end
 
-      it 'does not register the cursor' do
-        expect(active_cursors.size).to be(0)
+      it 'raises exception' do
+        expect do
+          reaper.register_cursor(cursor_id)
+        end.to raise_error(ArgumentError, /register_cursor called with nil cursor_id/)
       end
     end
 
@@ -112,8 +110,10 @@ describe Mongo::Cluster::CursorReaper do
         0
       end
 
-      it 'does not register the cursor' do
-        expect(active_cursors.size).to be(0)
+      it 'raises exception' do
+        expect do
+          reaper.register_cursor(cursor_id)
+        end.to raise_error(ArgumentError, /register_cursor called with cursor_id=0/)
       end
     end
 
@@ -123,6 +123,10 @@ describe Mongo::Cluster::CursorReaper do
         2
       end
 
+      before do
+        reaper.register_cursor(cursor_id)
+      end
+
       it 'registers the cursor id as active' do
         expect(active_cursors).to eq(Set.new([2]))
       end

data/spec/mongo/cluster/socket_reaper_spec.rb

@@ -20,13 +20,24 @@ describe Mongo::Cluster::SocketReaper do
   describe '#execute' do
 
     before do
-      cluster.servers.each do |s|
-        expect(s.pool).to receive(:close_idle_sockets).and_call_original
+      # Ensure all servers are discovered
+      cluster.servers_list.each do |server|
+        server.scan!
       end
+
+      # Stop the reaper that is attached to the cluster, since it
+      # runs the same code we are running and can interfere with our assertions
+      cluster.instance_variable_get('@periodic_executor').stop!
     end
 
     it 'calls close_idle_sockets on each connection pool in the cluster' do
-      reaper.execute
+      RSpec::Mocks.with_temporary_scope do
+        cluster.servers.each do |s|
+          expect(s.pool).to receive(:close_idle_sockets).and_call_original
+        end
+
+        reaper.execute
+      end
     end
   end
 end

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

@@ -306,8 +306,6 @@ describe Mongo::Collection::View::Aggregation do
           min_server_fcv '4.2'
 
           let(:result) do
-            skip 'RUBY-1827 / upgrading evergreen 4.1 server binary'
-
             aggregation.explain['queryPlanner']['collation']['locale']
           end
 

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

@@ -372,7 +372,7 @@ describe Mongo::Collection::View::ChangeStream do
     context 'when documents have not been retrieved and the stream is closed' do
 
       before do
-        expect(cursor).to receive(:kill_cursors)
+        expect(cursor).to receive(:close).and_call_original
         change_stream.close
       end
 
@@ -448,7 +448,7 @@ describe Mongo::Collection::View::ChangeStream do
       max_server_version '4.0'
 
       it 'driver raises an exception and closes the cursor' do
-        expect(cursor).to receive(:kill_cursors).and_call_original
+        expect(cursor).to receive(:close).and_call_original
         expect {
           change_stream.to_enum.next
         }.to raise_exception(Mongo::Error::MissingResumeToken)
@@ -459,7 +459,7 @@ describe Mongo::Collection::View::ChangeStream do
       min_server_fcv '4.2'
 
       it 'server errors, driver closes the cursor' do
-        expect(cursor).to receive(:kill_cursors).and_call_original
+        expect(cursor).to receive(:close).and_call_original
         expect {
           change_stream.to_enum.next
         }.to raise_exception(Mongo::Error::OperationFailure, /Encountered an event whose _id field, which contains the resume token, was modified by the pipeline. Modifying the _id field of an event makes it impossible to resume the stream from that point. Only transformations that retain the unmodified _id field are allowed./)
@@ -663,7 +663,7 @@ describe Mongo::Collection::View::ChangeStream do
           enum.next
           collection.insert_one(a: 2)
           expect(cursor).to receive(:get_more).once.and_raise(error)
-          expect(cursor).to receive(:kill_cursors).and_call_original
+          expect(cursor).to receive(:close).and_call_original
           expect(view.send(:server_selector)).to receive(:select_server).once.and_call_original
           expect(Mongo::Operation::Aggregate).to receive(:new).and_call_original
         end
@@ -723,7 +723,7 @@ describe Mongo::Collection::View::ChangeStream do
 
         let(:error) do
           Mongo::Error::OperationFailure.new('not master',
-            Mongo::Operation::GetMore::Result.new([]))
+            Mongo::Operation::GetMore::Result.new(nil))
         end
 
         it_behaves_like 'a change stream that encounters an error from a getMore'
@@ -733,7 +733,7 @@ describe Mongo::Collection::View::ChangeStream do
 
         let(:error) do
           Mongo::Error::OperationFailure.new('node is recovering',
-            Mongo::Operation::GetMore::Result.new([]))
+            Mongo::Operation::GetMore::Result.new(nil))
         end
 
         it_behaves_like 'a change stream that encounters an error from a getMore'
@@ -748,7 +748,7 @@ describe Mongo::Collection::View::ChangeStream do
         enum.next
         collection.insert_one(a: 2)
         expect(cursor).to receive(:get_more).and_raise(Mongo::Error::MissingResumeToken)
-        expect(cursor).to receive(:kill_cursors).and_call_original
+        expect(cursor).to receive(:close).and_call_original
         expect(Mongo::Operation::Aggregate).not_to receive(:new)
       end
 

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

@@ -66,7 +66,7 @@ describe Mongo::Collection::View::MapReduce do
 
   describe '#reduce_function' do
 
-    it 'returns the map function' do
+    it 'returns the reduce function' do
       expect(map_reduce.reduce_function).to eq(reduce)
     end
   end
@@ -80,7 +80,7 @@ describe Mongo::Collection::View::MapReduce do
     end
 
     it 'calls the Enumerable method' do
-      expect(results).to eq(map_reduce.to_a)
+      expect(results.sort_by { |d| d['_id'] }).to eq(map_reduce.to_a.sort_by { |d| d['_id'] })
     end
   end
 
@@ -186,7 +186,7 @@ describe Mongo::Collection::View::MapReduce do
         end
 
         it 'executes the map reduce' do
-          expect(map_reduce.to_a).to eq(new_map_reduce.to_a)
+          expect(new_map_reduce.to_a.sort_by { |d| d['_id'] }).to eq(map_reduce.to_a.sort_by { |d| d['_id'] })
         end
       end
 

data/spec/mongo/collection/view_spec.rb

@@ -147,7 +147,7 @@ describe Mongo::Collection::View do
       end
 
       it 'sends a kill cursors command for the cursor' do
-        expect(cursor).to receive(:kill_cursors).and_call_original
+        expect(cursor).to receive(:close).and_call_original
         view.close_query
       end
     end

data/spec/mongo/collection_spec.rb

@@ -203,11 +203,11 @@ describe Mongo::Collection do
     end
 
     let(:database) do
-      Mongo::Database.new(client, :test)
+      Mongo::Database.new(client, SpecConfig.instance.test_db)
     end
 
     let(:collection) do
-      database.collection(:users)
+      database.collection('test-collection')
     end
 
     let(:new_collection) do
@@ -241,12 +241,9 @@ describe Mongo::Collection do
       end
 
       context 'when the client has a read preference set' do
-        clean_slate_on_evergreen
 
         let(:client) do
-          authorized_client.with(SpecConfig.instance.auth_options.merge(
-            client_options
-          )).tap do |client|
+          authorized_client.with(client_options).tap do |client|
             expect(client.options[:read]).to eq(Mongo::Options::Redacted.new(
               mode: :primary_preferred))
           end
@@ -278,9 +275,7 @@ describe Mongo::Collection do
           require_topology :replica_set
 
           let(:client_options) do
-            SpecConfig.instance.auth_options.merge(
-              read: { mode: :primary_preferred },
-            )
+            {read: { mode: :primary_preferred }}
           end
 
           let(:subscriber) { EventSubscriber.new }
@@ -945,30 +940,6 @@ describe Mongo::Collection do
         it_behaves_like 'a failed operation using a session'
       end
     end
-
-    context 'when collation has a strength' do
-      min_server_fcv '3.4'
-
-      let(:band_collection) do
-        described_class.new(database, :bands)
-      end
-
-      before do
-        band_collection.delete_many
-        band_collection.insert_many([{ name: "Depeche Mode" }, { name: "New Order" }])
-      end
-
-      let(:options) do
-        { collation: { locale: 'en_US', strength: 2 } }
-      end
-      let(:band_result) do
-        band_collection.find({ name: 'DEPECHE MODE' }, options)
-      end
-
-      it 'finds Capitalize from UPPER CASE' do
-        expect(band_result.count_documents).to eq(1)
-      end
-    end
   end
 
   describe '#drop' do

data/spec/mongo/crypt/auto_decryption_context_spec.rb

@@ -0,0 +1,90 @@
+require 'mongo'
+require 'lite_spec_helper'
+
+describe Mongo::Crypt::AutoDecryptionContext do
+  require_libmongocrypt
+  include_context 'define shared FLE helpers'
+
+  let(:mongocrypt) { Mongo::Crypt::Handle.new(kms_providers, logger: logger) }
+  let(:context) { described_class.new(mongocrypt, io, command) }
+
+  let(:logger) { nil }
+
+  let(:io) { double("Mongo::ClientEncryption::IO") }
+  let(:command) do
+    {
+      "find": "test",
+      "filter": {
+          "ssn": "457-55-5462"
+      }
+    }
+  end
+
+  describe '#initialize' do
+    shared_examples 'a functioning AutoDecryptionContext' do
+      it 'initializes without error' do
+        expect do
+          context
+        end.not_to raise_error
+      end
+
+      context 'with nil command' do
+        let(:command) { nil }
+
+        it 'raises an exception' do
+          expect do
+            context
+          end.to raise_error(Mongo::Error::CryptError, /Attempted to pass nil data to libmongocrypt/)
+        end
+      end
+
+      context 'with non-document command' do
+        let(:command) { 'command-to-decrypt' }
+
+        it 'raises an exception' do
+          expect do
+            context
+          end.to raise_error(Mongo::Error::CryptError, /Attempted to pass invalid data to libmongocrypt/)
+        end
+      end
+    end
+
+    context 'when mongocrypt is initialized with local KMS provider options' do
+      include_context 'with local kms_providers'
+      it_behaves_like 'a functioning AutoDecryptionContext'
+    end
+
+    context 'when mongocrypt is initialized with AWS KMS provider options' do
+      include_context 'with AWS kms_providers'
+      it_behaves_like 'a functioning AutoDecryptionContext'
+    end
+
+    context 'with verbose logging' do
+      include_context 'with local kms_providers'
+
+      before(:all) do
+        # Logging from libmongocrypt requires the C library to be built with the -DENABLE_TRACE=ON
+        # option; none of the pre-built packages on Evergreen have been built with logging enabled.
+        #
+        # It is still useful to be able to run these tests locally to confirm that logging is working
+        # while debugging any problems.
+        #
+        # For now, skip this test by default and revisit once we have determined how we want to
+        # package libmongocrypt with the Ruby driver (see: https://jira.mongodb.org/browse/RUBY-1966)
+        skip "These tests require libmongocrypt to be built with the '-DENABLE_TRACE=ON' cmake option." +
+          " They also require the MONGOCRYPT_TRACE environment variable to be set to 'ON'."
+      end
+
+      let(:logger) do
+        ::Logger.new($stdout).tap do |logger|
+          logger.level = ::Logger::DEBUG
+        end
+      end
+
+      it 'receives log messages from libmongocrypt' do
+        expect(logger).to receive(:debug).with(/mongocrypt_ctx_decrypt_init/)
+        context
+      end
+    end
+  end
+end

data/spec/mongo/crypt/auto_encrypter_spec.rb

@@ -0,0 +1,182 @@
+require 'spec_helper'
+
+describe Mongo::Crypt::AutoEncrypter do
+  require_libmongocrypt
+  min_server_fcv '4.2'
+  require_enterprise
+  clean_slate
+
+  include_context 'define shared FLE helpers'
+
+  let(:auto_encrypter) do
+    described_class.new(auto_encryption_options.merge(client: authorized_client.use(:auto_encryption)))
+  end
+
+  let(:client) { authorized_client }
+
+  let(:db_name) { 'auto_encryption' }
+  let(:collection_name) { 'users' }
+
+  let(:command) do
+    {
+      'insert' => collection_name,
+      'ordered' => true,
+      'lsid' => {
+        'id' => BSON::Binary.new(Base64.decode64("CzgjT+byRK+FKUWG6QbyjQ==\n"), :uuid)
+      },
+      'documents' => [
+        {
+          'ssn' => ssn,
+          '_id' => BSON::ObjectId('5e16516e781d8a89b94df6df')
+        }
+      ]
+    }
+  end
+
+  let(:encrypted_command) do
+    command.merge(
+      'documents' => [
+        {
+          'ssn' => BSON::Binary.new(Base64.decode64(encrypted_ssn), :ciphertext),
+          '_id' => BSON::ObjectId('5e16516e781d8a89b94df6df')
+        }
+      ]
+    )
+  end
+
+  shared_context 'with jsonSchema validator' do
+    before do
+      users_collection = client.use(db_name)[collection_name]
+      users_collection.drop
+      client.use(db_name)[collection_name,
+        {
+          'validator' => { '$jsonSchema' => schema_map }
+        }
+      ].create
+    end
+  end
+
+  shared_context 'without jsonSchema validator' do
+    before do
+      users_collection = client.use(db_name)[collection_name]
+      users_collection.drop
+      users_collection.create
+    end
+  end
+
+  shared_examples 'a functioning auto encrypter' do
+    describe '#encrypt' do
+      it 'replaces the ssn field with a BSON::Binary' do
+        result = auto_encrypter.encrypt(db_name, command)
+        expect(result).to eq(encrypted_command)
+      end
+    end
+
+    describe '#decrypt' do
+      it 'returns the unencrypted document' do
+        result = auto_encrypter.decrypt(encrypted_command)
+        expect(result).to eq(command)
+      end
+    end
+  end
+
+  before do
+    key_vault_collection = client.use(key_vault_db)[key_vault_coll]
+    key_vault_collection.drop
+    key_vault_collection.insert_one(data_key)
+  end
+
+  after do
+    auto_encrypter.close
+  end
+
+  context 'with schema map in auto encryption commands' do
+    include_context 'without jsonSchema validator'
+
+    let(:auto_encryption_options) do
+      {
+        kms_providers: kms_providers,
+        key_vault_namespace: key_vault_namespace,
+        schema_map: { "#{db_name}.#{collection_name}": schema_map }
+      }
+    end
+
+    context 'with AWS KMS providers' do
+      include_context 'with AWS kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+
+    context 'with local KMS providers' do
+      include_context 'with local kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+  end
+
+  context 'with schema map collection validator' do
+    include_context 'with jsonSchema validator'
+
+    let(:auto_encryption_options) do
+      {
+        kms_providers: kms_providers,
+        key_vault_namespace: key_vault_namespace
+      }
+    end
+
+    context 'with AWS KMS providers' do
+      include_context 'with AWS kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+
+    context 'with local KMS providers' do
+      include_context 'with local kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+  end
+
+  context 'with no validator or client option' do
+    include_context 'without jsonSchema validator'
+
+    let(:auto_encryption_options) do
+      {
+        kms_providers: kms_providers,
+        key_vault_namespace: key_vault_namespace,
+      }
+    end
+
+    context 'with AWS KMS providers' do
+      include_context 'with AWS kms_providers'
+
+      describe '#encrypt' do
+        it 'does not perform encryption' do
+          result = auto_encrypter.encrypt(db_name, command)
+          expect(result).to eq(command)
+        end
+      end
+
+      describe '#decrypt' do
+        it 'still performs decryption' do
+          result = auto_encrypter.decrypt(encrypted_command)
+          expect(result).to eq(command)
+        end
+      end
+    end
+
+    context 'with local KMS providers' do
+      include_context 'with local kms_providers'
+
+      describe '#encrypt' do
+        it 'does not perform encryption' do
+          result = auto_encrypter.encrypt(db_name, command)
+          expect(result).to eq(command)
+        end
+      end
+
+      describe '#decrypt' do
+        it 'still performs decryption' do
+          result = auto_encrypter.decrypt(encrypted_command)
+          expect(result).to eq(command)
+        end
+      end
+    end
+  end
+end