mongo 2.11.4 → 2.12.3

data/spec/integration/client_side_encryption/views_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'Client-Side Encryption' do
+  describe 'Prose tests: Data key and double encryption' do
+    require_libmongocrypt
+    require_enterprise
+    min_server_fcv '4.2'
+
+    include_context 'define shared FLE helpers'
+
+    let(:client) do
+      new_local_client(
+        SpecConfig.instance.addresses,
+        SpecConfig.instance.test_options
+      )
+    end
+
+    let(:client_encrypted) do
+      new_local_client(
+        SpecConfig.instance.addresses,
+        SpecConfig.instance.test_options.merge(
+          auto_encryption_options: {
+            kms_providers: local_kms_providers,
+            key_vault_namespace: 'admin.datakeys',
+            # Spawn mongocryptd on non-default port for sharded cluster tests
+            extra_options: extra_options,
+          },
+          database: 'db',
+        )
+      )
+    end
+
+    before do
+      client.use('db')['view'].drop
+      client.use('db').database.command(create: 'view', viewOn: 'coll')
+    end
+
+    it 'does not perform encryption on views' do
+      expect do
+        client_encrypted['view'].insert_one({})
+      end.to raise_error(Mongo::Error::CryptError, /cannot auto encrypt a view/)
+    end
+  end
+end

data/spec/integration/client_update_spec.rb

@@ -0,0 +1,154 @@
+require 'spec_helper'
+
+describe Mongo::Client do
+  clean_slate
+
+  context 'auto encryption options' do
+    require_libmongocrypt
+    min_server_fcv '4.2'
+    require_enterprise
+
+    include_context 'define shared FLE helpers'
+    include_context 'with local kms_providers'
+
+    before do
+      authorized_client.use(:admin)[:datakeys].drop
+      authorized_client.use(:admin)[:datakeys].insert_one(data_key)
+      authorized_client.use(:auto_encryption)[:users].drop
+      authorized_client.use(:auto_encryption)[:users,
+        {
+          'validator' => { '$jsonSchema' => schema_map }
+        }
+      ].create
+    end
+
+    describe '#with' do
+      let(:old_client) do
+        new_local_client(
+          SpecConfig.instance.addresses,
+          SpecConfig.instance.test_options.merge(
+            auto_encryption_options: {
+              kms_providers: kms_providers,
+              key_vault_namespace: key_vault_namespace,
+              # Spawn mongocryptd on non-default port for sharded cluster tests
+              extra_options: extra_options,
+            },
+            database: :auto_encryption
+          ),
+        )
+      end
+
+      context 'with new, invalid auto_encryption_options' do
+        let(:new_auto_encryption_options) { { kms_providers: nil } }
+
+        let(:new_client) do
+          old_client.with(auto_encryption_options: new_auto_encryption_options)
+        end
+
+        # Detection of leaked background threads only, these tests do not
+        # actually require a clean slate. https://jira.mongodb.org/browse/RUBY-2138
+        clean_slate
+
+        it 'raises an exception' do
+          expect do
+            new_client
+          end.to raise_error(ArgumentError)
+        end
+
+        it 'allows the original client to keep encrypting' do
+          old_client[:users].insert_one(ssn: ssn)
+          document = authorized_client.use(:auto_encryption)[:users].find.first
+          expect(document['ssn']).to be_ciphertext
+        end
+      end
+
+      context 'with new auto_encryption_options' do
+        let!(:new_client) do
+          old_client.with(auto_encryption_options: new_auto_encryption_options)
+        end
+
+        let(:new_auto_encryption_options) do
+          {
+            kms_providers: kms_providers,
+            key_vault_namespace: key_vault_namespace,
+            schema_map: { 'auto_encryption.users' => schema_map },
+            # Spawn mongocryptd on non-default port for sharded cluster tests
+            extra_options: extra_options,
+          }
+        end
+
+        it 'creates a new client' do
+          expect(new_client).not_to eq(old_client)
+        end
+
+        it 'maintains the old client\'s auto encryption options' do
+          expect(old_client.encrypter.options[:schema_map]).to be_nil
+        end
+
+        it 'updates the client\'s auto encryption options' do
+          expect(new_client.encrypter.options[:schema_map]).to eq('auto_encryption.users' => schema_map)
+        end
+
+        it 'shares a cluster with the old client' do
+          expect(old_client.cluster).to eq(new_client.cluster)
+        end
+
+        it 'allows the original client to keep encrypting' do
+          old_client[:users].insert_one(ssn: ssn)
+          document = authorized_client.use(:auto_encryption)[:users].find.first
+          expect(document['ssn']).to be_ciphertext
+        end
+
+        it 'allows the new client to keep encrypting' do
+          old_client[:users].insert_one(ssn: ssn)
+          document = authorized_client.use(:auto_encryption)[:users].find.first
+          expect(document['ssn']).to be_ciphertext
+        end
+      end
+
+      context 'with nil auto_encryption_options' do
+        let!(:new_client) do
+          old_client.with(auto_encryption_options: new_auto_encryption_options)
+        end
+
+        let(:new_auto_encryption_options) { nil }
+
+        it 'removes auto encryption options' do
+          expect(new_client.encrypter).to be_nil
+        end
+
+        it 'allows original client to keep encrypting' do
+          old_client[:users].insert_one(ssn: ssn)
+          document = authorized_client.use(:auto_encryption)[:users].find.first
+          expect(document['ssn']).to be_ciphertext
+        end
+      end
+    end
+
+    describe '#use' do
+      let(:old_client) do
+        new_local_client(
+          SpecConfig.instance.addresses,
+          SpecConfig.instance.test_options.merge(
+            auto_encryption_options: {
+              kms_providers: kms_providers,
+              key_vault_namespace: key_vault_namespace,
+              # Spawn mongocryptd on non-default port for sharded cluster tests
+              extra_options: extra_options,
+            }
+          )
+        )
+      end
+
+      let(:new_client) do
+        old_client.use(:auto_encryption)
+      end
+
+      it 'creates a new client with encryption enabled' do
+        new_client[:users].insert_one(ssn: ssn)
+        document = authorized_client.use(:auto_encryption)[:users].find.first
+        expect(document['ssn']).to be_ciphertext
+      end
+    end
+  end
+end

data/spec/integration/command_monitoring_spec.rb

@@ -21,6 +21,7 @@ describe 'Command monitoring' do
     started_event = started_events.first
     expect(started_event.command_name).to eql('ismaster')
     expect(started_event.address).to be_a(Mongo::Address)
+    expect(started_event.command).to have_key('$db')
 
     succeeded_events = subscriber.succeeded_events.select do |event|
       event.command_name == 'ismaster'
@@ -30,6 +31,7 @@ describe 'Command monitoring' do
     expect(succeeded_event.command_name).to eql('ismaster')
     expect(succeeded_event.reply).to be_a(BSON::Document)
     expect(succeeded_event.reply['ismaster']).to eql(true)
+    expect(succeeded_event.reply['ok']).to eq(1)
     expect(succeeded_event.address).to be_a(Mongo::Address)
     expect(succeeded_event.duration).to be_a(Float)
 
@@ -109,7 +111,7 @@ describe 'Command monitoring' do
 
       subscriber.clear_events!
       expect do
-        command.execute(server)
+        command.execute(server, client: nil)
       end.to raise_error(Mongo::Error::OperationFailure, /Not enough data-bearing nodes \(100\)/)
 
       expect(subscriber.started_events.length).to eq(1)

data/spec/integration/command_spec.rb

@@ -47,7 +47,10 @@ describe 'Command' do
 
       let(:expected_payload) do
         {
-          'command' => {'commitTransaction' => 1},
+          'command' => {
+            'commitTransaction' => 1,
+            '$db' => 'admin',
+          },
           'command_name' => 'commitTransaction',
           'database_name' => 'admin',
           'request_id' => 42,
@@ -75,6 +78,7 @@ describe 'Command' do
               'commitTransaction' => 1,
               'lsid' => session.session_id,
               'txnNumber' => BSON::Int64.new(123),
+              '$db' => 'admin',
             },
             'command_name' => 'commitTransaction',
             'database_name' => 'admin',
@@ -93,6 +97,7 @@ describe 'Command' do
         let(:expected_payload) do
           {
             'command' => {
+              '$db' => 'admin',
               'commitTransaction' => 1,
               'writeConcern' => {'w' => 'majority'},
             },
@@ -121,17 +126,46 @@ describe 'Command' do
         )
       end
 
-      let(:expected_payload) do
-        {
-          'command' => {'find' => 'collection_name'},
-          'command_name' => 'find',
-          'database_name' => 'foo',
-          'request_id' => 42,
-        }
+      context 'OP_MSG-capable servers' do
+        min_server_fcv '3.6'
+
+        let(:expected_payload) do
+          {
+            'command' => {
+              '$db' => 'foo',
+              'find' => 'collection_name',
+            },
+            'command_name' => 'find',
+            'database_name' => 'foo',
+            'request_id' => 42,
+          }
+        end
+
+        it 'returns expected payload' do
+          expect(payload).to eq(expected_payload)
+        end
       end
 
-      it 'returns expected payload' do
-        expect(payload).to eq(expected_payload)
+      # Servers using legacy wire protocol message do not have $db in payload.
+      # $db is added to the payload later when the command monitoring event is
+      # published.
+      context 'pre-OP_MSG servers' do
+        max_server_version '3.4'
+
+        let(:expected_payload) do
+          {
+            'command' => {
+              'find' => 'collection_name',
+            },
+            'command_name' => 'find',
+            'database_name' => 'foo',
+            'request_id' => 42,
+          }
+        end
+
+        it 'returns expected payload' do
+          expect(payload).to eq(expected_payload)
+        end
       end
     end
 

data/spec/integration/connection_spec.rb

@@ -168,6 +168,63 @@ describe 'Connections' do
           it_behaves_like 'is 1 per connection'
         end
       end
+
+      context 'when socket connection fails' do
+
+        before do
+          server
+        end
+
+        let(:socket_cls) { ::Socket }
+
+        let(:socket) do
+          double('socket').tap do |socket|
+            allow(socket).to receive(:setsockopt)
+            allow(socket).to receive(:set_encoding)
+            allow(socket).to receive(:getsockopt)
+            expect(socket).to receive(:connect).and_raise(IOError, 'test error')
+
+            # This test is testing for the close call:
+            expect(socket).to receive(:close)
+          end
+        end
+
+        it 'closes the socket' do
+          RSpec::Mocks.with_temporary_scope do
+            expect(::Socket).to receive(:new).with(
+              Socket::AF_INET, Socket::SOCK_STREAM, 0).and_return(socket)
+
+            lambda do
+              connection.connect!
+            end.should raise_error(Mongo::Error::SocketError, /test error/)
+          end
+        end
+
+        context 'with tls' do
+          require_tls
+
+          let(:socket) do
+            double('socket').tap do |socket|
+              allow(socket).to receive(:hostname=)
+              allow(socket).to receive(:sync_close=)
+              expect(socket).to receive(:connect).and_raise(IOError, 'test error')
+
+              # This test is testing for the close call:
+              expect(socket).to receive(:close)
+            end
+          end
+
+          it 'closes the SSL socket' do
+            RSpec::Mocks.with_temporary_scope do
+              expect(OpenSSL::SSL::SSLSocket).to receive(:new).and_return(socket)
+
+              lambda do
+                connection.connect!
+              end.should raise_error(Mongo::Error::SocketError, /test error/)
+            end
+          end
+        end
+      end
     end
 
     describe 'wire protocol version range update' do

data/spec/integration/crud_spec.rb

@@ -7,6 +7,95 @@ describe 'CRUD operations' do
     collection.delete_many
   end
 
+  describe 'insert' do
+    context 'inserting a BSON::Int64' do
+      before do
+        collection.insert_one(int64: BSON::Int64.new(42))
+      end
+
+      it 'is stored as the correct type' do
+        # 18 is the number that represents the Int64 type for the $type
+        # operator; string aliases in the $type operator are only supported on
+        # server versions 3.2 and newer.
+        result = collection.find(int64: { '$type' => 18 }).first
+        expect(result).not_to be_nil
+        expect(result['int64']).to eq(42)
+      end
+    end
+
+    context 'inserting a BSON::Int32' do
+      before do
+        collection.insert_one(int32: BSON::Int32.new(42))
+      end
+
+      it 'is stored as the correct type' do
+        # 16 is the number that represents the Int32 type for the $type
+        # operator; string aliases in the $type operator are only supported on
+        # server versions 3.2 and newer.
+        result = collection.find(int32: { '$type' => 16 }).first
+        expect(result).not_to be_nil
+        expect(result['int32']).to eq(42)
+      end
+    end
+
+    context 'with automatic encryption' do
+      require_libmongocrypt
+      require_enterprise
+      min_server_fcv '4.2'
+
+      include_context 'define shared FLE helpers'
+      include_context 'with local kms_providers'
+
+      let(:encrypted_collection) do
+        new_local_client(
+          SpecConfig.instance.addresses,
+          SpecConfig.instance.test_options.merge(
+            auto_encryption_options: {
+              kms_providers: kms_providers,
+              key_vault_namespace: key_vault_namespace,
+              schema_map: { 'auto_encryption.users' => schema_map },
+              # Spawn mongocryptd on non-default port for sharded cluster tests
+              extra_options: extra_options,
+            },
+            database: 'auto_encryption'
+          )
+        )['users']
+      end
+
+      let(:collection) { authorized_client.use('auto_encryption')['users'] }
+
+      context 'inserting a BSON::Int64' do
+        before do
+          encrypted_collection.insert_one(ssn: '123-456-7890', int64: BSON::Int64.new(42))
+        end
+
+        it 'is stored as the correct type' do
+          # 18 is the number that represents the Int64 type for the $type
+          # operator; string aliases in the $type operator are only supported on
+          # server versions 3.2 and newer.
+          result = collection.find(int64: { '$type' => 18 }).first
+          expect(result).not_to be_nil
+          expect(result['int64']).to eq(42)
+        end
+      end
+
+      context 'inserting a BSON::Int32' do
+        before do
+          encrypted_collection.insert_one(ssn: '123-456-7890', int32: BSON::Int32.new(42))
+        end
+
+        it 'is stored as the correct type' do
+          # 16 is the number that represents the Int32 type for the $type
+          # operator; string aliases in the $type operator are only supported on
+          # server versions 3.2 and newer.
+          result = collection.find(int32: { '$type' => 16 }).first
+          expect(result).not_to be_nil
+          expect(result['int32']).to eq(42)
+        end
+      end
+    end
+  end
+
   describe 'upsert' do
     context 'with default write concern' do
       it 'upserts' do