mongo 2.18.0.beta1 → 2.18.0

data/spec/integration/client_side_encryption/kms_tls_options_spec.rb

@@ -292,14 +292,44 @@ describe 'Client-Side Encryption' do
 
       context 'with valid certificate' do
         it 'TLS handshake passes' do
-          expect do
-            client_encryption_with_tls.create_data_key(
-              kms_provider,
-              {
-                master_key: master_key
-             }
-            )
-          end.to raise_error(Mongo::Error::KmsError, /libmongocrypt error code/)
+          if should_raise_with_tls
+            expect do
+              client_encryption_with_tls.create_data_key(
+                kms_provider,
+                {
+                  master_key: master_key
+              }
+              )
+            end.to raise_error(Mongo::Error::KmsError, /libmongocrypt error code/)
+          else
+            expect do
+              client_encryption_with_tls.create_data_key(
+                kms_provider,
+                {
+                  master_key: master_key
+              }
+              )
+            end.not_to raise_error
+          end
+        end
+
+        it 'raises KmsError directly without wrapping CryptError' do
+          if should_raise_with_tls
+            begin
+              client_encryption_with_tls.create_data_key(
+                kms_provider,
+                {
+                  master_key: master_key
+              }
+              )
+            rescue Mongo::Error::KmsError => exc
+              exc.message.should =~ /Error when connecting to KMS provider/
+              exc.message.should =~ /libmongocrypt error code/
+              exc.message.should_not =~ /CryptError/
+            else
+              fail 'Expected to raise KmsError'
+            end
+          end
         end
       end
 
@@ -358,6 +388,10 @@ describe 'Client-Side Encryption' do
         }
       end
 
+      let(:should_raise_with_tls) do
+        true
+      end
+
       it_behaves_like 'it respect KMS TLS options'
     end
 
@@ -375,6 +409,10 @@ describe 'Client-Side Encryption' do
         }
       end
 
+      let(:should_raise_with_tls) do
+        true
+      end
+
       it_behaves_like 'it respect KMS TLS options'
     end
 
@@ -387,6 +425,10 @@ describe 'Client-Side Encryption' do
         {}
       end
 
+      let(:should_raise_with_tls) do
+        false
+      end
+
       it_behaves_like 'it respect KMS TLS options'
     end
 

data/spec/integration/client_side_encryption/unique_index_on_key_alt_names_prose_spec.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe "Decryption events" do
+  require_enterprise
+  min_server_fcv "4.2"
+  require_libmongocrypt
+  include_context "define shared FLE helpers"
+
+  let(:client) do
+    ClientRegistry.instance.new_local_client(
+      SpecConfig.instance.addresses,
+      SpecConfig.instance.test_options.merge(
+        database: SpecConfig.instance.test_db,
+      )
+    )
+  end
+
+  let(:client_encryption) do
+    Mongo::ClientEncryption.new(
+      client,
+      key_vault_namespace: "#{key_vault_db}.#{key_vault_coll}",
+      kms_providers: local_kms_providers
+    )
+  end
+
+  let(:existing_key_alt_name) do
+    'def'
+  end
+
+  let(:existing_key_id) do
+    client_encryption.create_data_key('local', key_alt_names: [existing_key_alt_name])
+  end
+
+  before(:each) do
+    client.use(key_vault_db)[key_vault_coll].drop
+    client.use(key_vault_db).command({
+      createIndexes: key_vault_coll,
+      indexes: [
+        {
+          name: "keyAltNames_1",
+          key: { "keyAltNames": 1 },
+          unique: true,
+          partialFilterExpression: { keyAltNames: { "$exists" => true } },
+        },
+      ],
+      writeConcern: { w: "majority" },
+    })
+    # Force key creation
+    existing_key_id
+  end
+
+  it 'tests create_data_key' do
+    expect do
+      client_encryption.create_data_key('local', key_alt_names: ['abc'])
+    end.not_to raise_error
+
+    expect do
+      client_encryption.create_data_key('local', key_alt_names: [existing_key_alt_name])
+    end.to raise_error(Mongo::Error::OperationFailure, /E11000/) # duplicate key error
+  end
+
+  it 'tests add_key_alt_name' do
+    key_id = client_encryption.create_data_key('local')
+    expect do
+      client_encryption.add_key_alt_name(key_id, 'abc')
+    end.not_to raise_error
+
+    expect do
+      key_document = client_encryption.add_key_alt_name(key_id, 'abc')
+      expect(key_document['keyAltNames']).to include('abc')
+    end.not_to raise_error
+
+    expect do
+      client_encryption.add_key_alt_name(key_id, existing_key_alt_name)
+    end.to raise_error(Mongo::Error::OperationFailure, /E11000/) # duplicate key error
+
+    expect do
+      key_document = client_encryption.add_key_alt_name(existing_key_id, existing_key_alt_name)
+      expect(key_document['keyAltNames']).to include(existing_key_alt_name)
+    end.not_to raise_error
+  end
+end

data/spec/integration/ocsp_verifier_spec.rb

@@ -7,7 +7,7 @@ require 'webrick'
 describe Mongo::Socket::OcspVerifier do
   require_ocsp_verifier
   with_openssl_debug
-  retry_test
+  retry_test sleep: 5
 
   shared_examples 'verifies' do
     context 'mri' do

data/spec/integration/reconnect_spec.rb

@@ -73,6 +73,7 @@ describe 'Client after reconnect' do
   end
 
   context 'SRV monitor thread' do
+    require_external_connectivity
 
     let(:uri) do
       "mongodb+srv://test1.test.build.10gen.cc/?tls=#{SpecConfig.instance.ssl?}"
@@ -140,6 +141,7 @@ describe 'Client after reconnect' do
     end
 
     context 'in unknown topology' do
+      require_external_connectivity
 
       # JRuby apparently does not implement non-blocking UDP I/O which is used
       # by RubyDNS:

data/spec/integration/sdam_events_spec.rb

@@ -135,4 +135,44 @@ describe 'SDAM events' do
       end
     end
   end
+
+  describe 'server description changed' do
+    require_topology :single
+
+    let(:sdam_proc) do
+      Proc.new do |client|
+        client.subscribe(Mongo::Monitoring::SERVER_DESCRIPTION_CHANGED, subscriber)
+      end
+    end
+
+    let(:client) do
+      new_local_client(SpecConfig.instance.addresses,
+        # Heartbeat interval is bound by 500 ms
+        SpecConfig.instance.test_options.merge(client_options).merge(
+          heartbeat_frequency: 0.5,
+          sdam_proc: sdam_proc,
+        ),
+      )
+    end
+
+    let(:client_options) do
+      {}
+    end
+
+    it 'is not published when there are no changes in server state' do
+      client
+      sleep 6
+      client.close
+
+      events = subscriber.select_succeeded_events(Mongo::Monitoring::Event::ServerDescriptionChanged)
+
+      # In 6 seconds we should have about 10 or 12 heartbeats.
+      # We expect 1 or 2 description changes:
+      # The first one from unknown to known,
+      # The second one because server changes the fields it returns based on
+      # driver server check payload (e.g. ismaster/isWritablePrimary).
+      events.length.should >= 1
+      events.length.should <= 2
+    end
+  end
 end

data/spec/integration/srv_monitoring_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 
 describe 'SRV Monitoring' do
   clean_slate_for_all
+  require_external_connectivity
 
   context 'with SRV lookups mocked at Resolver' do
     let(:srv_result) do

data/spec/integration/srv_spec.rb

@@ -5,6 +5,7 @@ require 'spec_helper'
 
 describe 'SRV lookup' do
   context 'end to end' do
+    require_external_connectivity
 
     # JRuby apparently does not implement non-blocking UDP I/O which is used
     # by RubyDNS:

data/spec/lite_spec_helper.rb

@@ -10,8 +10,6 @@ SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam/**/*.yml
 SDAM_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam_monitoring/*.yml").sort
 SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection_rtt/*.yml").sort
 CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud/**/*.yml").sort
-CRUD2_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud_v2/**/*.yml").sort
-COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/command_monitoring/**/*.yml").sort
 CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/connection_string/*.yml").sort
 URI_OPTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/uri_options/*.yml").sort
 GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/gridfs/*.yml").sort
@@ -34,7 +32,10 @@ else
   begin
     require 'byebug'
   rescue LoadError
-    require 'ruby-debug'
+    begin
+      require 'ruby-debug'
+    rescue LoadError
+    end
   end
 end
 
@@ -90,7 +91,7 @@ require 'support/background_thread_registry'
 require 'mrss/session_registry'
 require 'support/local_resource_registry'
 
-if SpecConfig.instance.mri?
+if SpecConfig.instance.mri? && !SpecConfig.instance.windows?
   require 'timeout_interrupt'
 else
   require 'timeout'

data/spec/mongo/bulk_write_spec.rb

@@ -55,6 +55,19 @@ describe Mongo::BulkWrite do
         end
       end
 
+      context 'when providing no requests' do
+
+        let(:requests) do
+          []
+        end
+
+        it 'raises an exception' do
+          expect {
+            bulk_write.execute
+          }.to raise_error(ArgumentError, /Bulk write requests cannot be empty/)
+        end
+      end
+
       context 'when the operations do not need to be split' do
 
         context 'when a write error occurs' do

data/spec/mongo/client_construction_spec.rb

@@ -844,6 +844,20 @@ describe Mongo::Client do
               expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
             end
           end
+
+          context 'when max_pool_size is zero (unlimited)' do
+            let(:options) do
+              {
+                  :min_pool_size => 10,
+                  :max_pool_size => 0
+              }
+            end
+
+            it 'sets the option' do
+              expect(client.options[:min_pool_size]).to eq(options[:min_pool_size])
+              expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
+            end
+          end
         end
 
         context 'when max_pool_size is not provided' do
@@ -852,7 +866,7 @@ describe Mongo::Client do
 
             let(:options) do
               {
-                  :min_pool_size => 10
+                  :min_pool_size => 30
               }
             end
 
@@ -891,6 +905,24 @@ describe Mongo::Client do
         end
       end
 
+      context 'when max_pool_size is provided' do
+        let(:client) do
+          new_local_client_nmio(['127.0.0.1:27017'], options)
+        end
+
+        context 'when max_pool_size is 0 (unlimited)' do
+          let(:options) do
+            {
+                :max_pool_size => 0
+            }
+          end
+
+          it 'sets the option' do
+            expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
+          end
+        end
+      end
+
       context 'when max_pool_size and min_pool_size are both nil' do
 
         let(:client) do
@@ -1081,6 +1113,17 @@ describe Mongo::Client do
                 expect(client.options[:max_pool_size]).to eq(10)
               end
             end
+
+            context 'when max_pool_size is 0 (unlimited)' do
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=10&maxPoolSize=0'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(10)
+                expect(client.options[:max_pool_size]).to eq(0)
+              end
+            end
           end
 
           context 'when max_pool_size is not provided' do
@@ -1088,7 +1131,7 @@ describe Mongo::Client do
             context 'when the min_pool_size is greater than the default max_pool_size' do
 
               let(:uri) do
-                'mongodb://127.0.0.1:27017/?minPoolSize=10'
+                'mongodb://127.0.0.1:27017/?minPoolSize=30'
               end
 
               it 'raises an Exception' do

data/spec/mongo/client_encryption_spec.rb

@@ -148,16 +148,6 @@ describe Mongo::ClientEncryption do
         end
       end
 
-      context 'with empty options' do
-        let(:options) { {} }
-
-        it 'raises an exception' do
-          expect do
-            data_key_id
-          end.to raise_error(ArgumentError, /Key document options must contain a key named :master_key with a Hash value/)
-        end
-      end
-
       context 'with nil master key' do
         let(:options) { { master_key: nil } }
 
@@ -297,8 +287,6 @@ describe Mongo::ClientEncryption do
         end
 
         it 'raises an exception' do
-          # RUBY-2129: This error message could be more specific and inform the user
-          # that there is a problem with their KMS endpoint
           expect do
             data_key_id
           end.to raise_error(Mongo::Error::KmsError, /SocketError/)

data/spec/mongo/client_spec.rb

@@ -836,7 +836,7 @@ describe Mongo::Client do
         expect(session).to be_a(Mongo::Session)
       end
 
-      retry_test 4
+      retry_test tries: 4
       it 'sets the last use field to the current time' do
         expect(session.instance_variable_get(:@server_session).last_use).to be_within(1).of(Time.now)
       end

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

@@ -651,4 +651,123 @@ describe Mongo::Collection::View::Aggregation do
       end
     end
   end
+
+  context "when there is a filter on the view" do
+
+    context "when broken_view_aggregate is turned off" do
+      config_override :broken_view_aggregate, false
+
+      let(:documents) do
+        [
+          { city: "Berlin", pop: 18913, neighborhood: "Kreuzberg" },
+          { city: "Berlin", pop: 84143, neighborhood: "Mitte" },
+          { city: "New York", pop: 40270, neighborhood: "Brooklyn" }
+        ]
+      end
+
+      let(:pipeline) do
+        [{
+          "$project" => {
+            city: 1
+          }
+        }]
+      end
+
+      let(:view) do
+        authorized_collection.find(city: "Berlin")
+      end
+
+      before do
+        authorized_collection.delete_many
+        authorized_collection.insert_many(documents)
+      end
+
+      it "uses the filter on the view" do
+        expect(aggregation.to_a.length).to eq(2)
+      end
+
+      it "adds a match stage" do
+        expect(aggregation.pipeline.length).to eq(2)
+        expect(aggregation.pipeline.first).to eq({ :$match => { "city" => "Berlin" } })
+      end
+    end
+
+    context "when broken_view_aggregate is turned on" do
+      config_override :broken_view_aggregate, true
+
+      let(:documents) do
+        [
+          { city: "Berlin", pop: 18913, neighborhood: "Kreuzberg" },
+          { city: "Berlin", pop: 84143, neighborhood: "Mitte" },
+          { city: "New York", pop: 40270, neighborhood: "Brooklyn" }
+        ]
+      end
+
+      let(:pipeline) do
+        [{
+          "$project" => {
+            city: 1
+          }
+        }]
+      end
+
+      let(:view) do
+        authorized_collection.find(city: "Berlin")
+      end
+
+      before do
+        authorized_collection.delete_many
+        authorized_collection.insert_many(documents)
+      end
+
+      it "ignores the view filter" do
+        expect(aggregation.to_a.length).to eq(3)
+      end
+
+      it "does not add a match stage" do
+        expect(aggregation.pipeline.length).to eq(1)
+        expect(aggregation.pipeline).to eq([ { "$project" => { city: 1 } } ])
+      end
+    end
+  end
+
+  context "when there is no filter on the view" do
+
+    with_config_values :broken_view_aggregate, true, false do
+
+      let(:documents) do
+        [
+          { city: "Berlin", pop: 18913, neighborhood: "Kreuzberg" },
+          { city: "Berlin", pop: 84143, neighborhood: "Mitte" },
+          { city: "New York", pop: 40270, neighborhood: "Brooklyn" }
+        ]
+      end
+
+      let(:pipeline) do
+        [{
+          "$project" => {
+            city: 1
+          }
+        }]
+      end
+
+      let(:view) do
+        authorized_collection.find
+      end
+
+      before do
+        authorized_collection.delete_many
+        authorized_collection.insert_many(documents)
+      end
+
+      it "ignores the view filter" do
+        expect(aggregation.to_a.length).to eq(3)
+      end
+
+      it "does not add a match stage" do
+        expect(aggregation.pipeline.length).to eq(1)
+        expect(aggregation.pipeline).to eq([ { "$project" => { city: 1 } } ])
+      end
+    end
+  end
 end