mongo 2.13.3 → 2.14.0.rc1

data/spec/support/session_registry.rb

@@ -0,0 +1,52 @@
+require 'singleton'
+
+module Mongo
+  class Client
+    alias :get_session_without_tracking :get_session
+
+    def get_session(options = {})
+      get_session_without_tracking(options).tap do |session|
+        SessionRegistry.instance.register(session)
+      end
+    end
+  end
+
+  class Session
+    alias :end_session_without_tracking :end_session
+
+    def end_session
+      SessionRegistry.instance.unregister(self)
+      end_session_without_tracking
+    end
+  end
+end
+
+
+class SessionRegistry
+  include Singleton
+
+  def initialize
+    @registry = {}
+  end
+
+  def register(session)
+    @registry[session.session_id] = session if session
+  end
+
+  def unregister(session)
+    @registry.delete(session.session_id) unless session.ended?
+  end
+
+  def verify_sessions_ended!
+    @registry.delete_if { |_, session| session.ended? }
+
+    unless @registry.empty?
+      sessions = @registry.map { |_, session| session }
+      raise "Session registry contains live sessions: #{sessions.join(', ')}"
+    end
+  end
+
+  def clear_registry
+    @registry = {}
+  end
+end

data/spec/support/spec_config.rb

@@ -110,14 +110,6 @@ class SpecConfig
     !!(RUBY_PLATFORM =~ /\bjava\b/)
   end
 
-  def linux?
-    !!(RbConfig::CONFIG['host_os'].downcase =~ /\blinux/)
-  end
-
-  def macos?
-    !!(RbConfig::CONFIG['host_os'].downcase =~ /\bdarwin/)
-  end
-
   def platform
     RUBY_PLATFORM
   end
@@ -130,6 +122,24 @@ class SpecConfig
     %w(1 true yes).include?(ENV['FORK']&.downcase)
   end
 
+  # OCSP tests require python and various dependencies.
+  # Assumes an OCSP responder is running on port 8100 (configured externally
+  # to the test suite).
+  def ocsp?
+    %w(1 true yes).include?(ENV['OCSP']&.downcase)
+  end
+
+  # OCSP tests require python and various dependencies.
+  # When testing OCSP verifier, there cannot be a responder running on
+  # port 8100 or the tests will fail.
+  def ocsp_verifier?
+    %w(1 true yes).include?(ENV['OCSP_VERIFIER']&.downcase)
+  end
+
+  def ocsp_connectivity?
+    ENV.key?('OCSP_CONNECTIVITY') && ENV['OCSP_CONNECTIVITY'] != ''
+  end
+
   # Test suite configuration
 
   def client_debug?
@@ -229,6 +239,10 @@ EOT
     Pathname.new("#{spec_root}/support/certificates")
   end
 
+  def ocsp_files_dir
+    Pathname.new("#{spec_root}/../.mod/drivers-evergreen-tools/.evergreen/ocsp")
+  end
+
   # TLS certificates & keys
 
   def local_client_key_path
@@ -350,10 +364,6 @@ EOT
     end
   end
 
-  def auth?
-    x509_auth? || user
-  end
-
   # Option hashes
 
   def auth_options

data/spec/support/spec_setup.rb

@@ -8,50 +8,38 @@ class SpecSetup
       return
     end
 
-    with_client do |client|
-      # For historical reasons, the test suite always uses
-      # password-authenticated users, even when authentication is not
-      # requested in the configuration. When authentication is requested
-      # and password authentication is used (i.e., not x509 and not kerberos),
-      # a suitable user already exists (it's the one specified in the URI)
-      # and no additional users are needed. In other cases, including x509
-      # auth and kerberos, create the "root user".
-      # TODO redo the test suite so that this password-authenticated root user
-      # is not required and the test suite uses whichever user is specified
-      # in the URI, which could be none.
-      if !SpecConfig.instance.auth? || SpecConfig.instance.x509_auth?
-        # Create the root user administrator as the first user to be added to the
-        # database. This user will need to be authenticated in order to add any
-        # more users to any other databases.
-        begin
-          create_user(client, SpecConfig.instance.root_user)
-        rescue Mongo::Error::OperationFailure => e
-          # When testing a cluster that requires auth, root user is already set up
-          # and it is not creatable without auth.
-          # Seems like every mongodb version has its own error message
-          # for trying to make a user when not authenticated,
-          # and prior to 4.0 or so the codes are supposedly not reliable either.
-          # In order: 4.0, 3.6, 3.4 through 2.6
-          if e.message =~ /command createUser requires authentication|there are no users authenticated|not authorized on admin to execute command.*createUser/
-            # However, if the cluster is configured to require auth but
-            # test suite has wrong credentials, then admin_authorized_test_client
-            # won't be authenticated and the following line will raise an
-            # exception
-            if client.use('admin').database.users.info(SpecConfig.instance.root_user.name).any?
-              warn "Skipping root user creation, likely auth is enabled on cluster"
-            else
-              raise
-            end
-          else
-            raise
-          end
+    # Create the root user administrator as the first user to be added to the
+    # database. This user will need to be authenticated in order to add any
+    # more users to any other databases.
+    begin
+      create_user(admin_unauthorized_client, SpecConfig.instance.root_user)
+    rescue Mongo::Error::OperationFailure => e
+      # When testing a cluster that requires auth, root user is already set up
+      # and it is not creatable without auth.
+      # Seems like every mongodb version has its own error message
+      # for trying to make a user when not authenticated,
+      # and prior to 4.0 or so the codes are supposedly not reliable either.
+      # In order: 4.0, 3.6, 3.4 through 2.6
+      if e.message =~ /command createUser requires authentication|there are no users authenticated|not authorized on admin to execute command.*createUser/
+        # However, if the cluster is configured to require auth but
+        # test suite has wrong credentials, then admin_authorized_test_client
+        # won't be authenticated and the following line will raise an
+        # exception
+        if admin_authorized_test_client.with(database: 'admin').database.users.info(SpecConfig.instance.root_user.name).any?
+          warn "Skipping root user creation, likely auth is enabled on cluster"
+        else
+          raise
         end
+      else
+        raise
       end
-
-      # Adds the test user to the test database with permissions on all
-      # databases that will be used in the test suite.
-      create_user(client, SpecConfig.instance.test_user)
     end
+    admin_unauthorized_client.close
+
+    # Adds the test user to the test database with permissions on all
+    # databases that will be used in the test suite.
+    create_user(admin_authorized_test_client, SpecConfig.instance.test_user)
+    admin_authorized_test_client.close
   end
 
   def create_user(client, user)
@@ -68,13 +56,15 @@ class SpecSetup
     end
   end
 
-  def with_client(&block)
-    Mongo::Client.new(
-      SpecConfig.instance.addresses,
-      SpecConfig.instance.all_test_options.merge(
-        socket_timeout: 5, connect_timeout: 5,
-      ),
-      &block
+  def admin_unauthorized_client
+    ClientRegistry.instance.global_client('admin_unauthorized').with(
+      socket_timeout: 5, connect_timeout: 5,
+    )
+  end
+
+  def admin_authorized_test_client
+    ClientRegistry.instance.global_client('root_authorized').with(
+      socket_timeout: 5, connect_timeout: 5,
     )
   end
 end

data/spec/support/utils.rb

@@ -85,6 +85,13 @@ module Utils
   end
   module_function :camelize
 
+  module_function def downcase_keys(hash)
+    # TODO replace with Hash#transform_keys when we require Ruby 2.5+
+    Hash[hash.map do |k, v|
+      [k.downcase, v]
+    end]
+  end
+
   module_function def disable_retries_client_options
     {
       retry_reads: false,
@@ -98,6 +105,7 @@ module Utils
   # to Ruby driver underscore options.
   def convert_client_options(spec_test_options)
     uri = Mongo::URI.new('mongodb://localhost')
+    mapper = Mongo::URI::OptionsMapper.new
     spec_test_options.reduce({}) do |opts, (name, value)|
       if name == 'autoEncryptOpts'
         opts.merge!(
@@ -111,7 +119,7 @@ module Utils
             )
         )
       else
-        uri.send(:add_uri_option, name, value.to_s, opts)
+        mapper.add_uri_option(name, value.to_s, opts)
       end
 
       opts
@@ -494,4 +502,14 @@ module Utils
 
     subscriber.single_command_started_event(command_name, include_auth: include_auth)
   end
+
+  # Drops and creates a collection for the purpose of starting the test from
+  # a clean slate.
+  #
+  # @param [ Mongo::Client ] client
+  # @param [ String ] collection_name
+  module_function def create_collection(client, collection_name)
+    client[collection_name].drop
+    client[collection_name].create
+  end
 end

data.tar.gz.sig

@@ -1,3 +1 @@
-����3aG��0��"�#8��^�o3V�hi[�~���K>%�~���1�0�yLv{�m�L׸"��E�	�(�Bg�T�!��1沏&��[�t�ɚXT1�G��'�'���}��֛��
-w����q�E}��)܄~Q�XA�jIC;8eA5>�*��܎�R���
-��9���|���x�5�m��2u��pM|M�l<�EQS�;d�������-��҆ͥ�ӆ�r3�������3$�1�v��Gp{�]��
+lb~�{������z�x�%����~��n��3G���k�j*R)ڗ0