mongo 1.10.2 → 1.11.1

data/test/functional/pool_test.rb

@@ -59,4 +59,77 @@ class PoolTest < Test::Unit::TestCase
     end
     threads.each(&:join)
   end
+
+  def test_auth_network_error
+    # Make sure there's no semaphore leak if we get a network error
+    # when authenticating a new socket with cached credentials.
+
+    # Get a client with one socket so we detect if it's leaked.
+    client = MongoClient.new(TEST_HOST, TEST_PORT, :pool_size => 1, :pool_timeout => 1)
+    assert_equal 1, client.pool_size
+
+    # Set up the client with a pool
+    client[TEST_DB].command(:ping => 1)
+
+    # Close the one socket in the pool
+    pool = client.primary_pool
+    socket = pool.instance_variable_get(:@sockets).first
+    socket.close
+
+    # Simulate an authenticate() call on a different socket.
+    # Cache the creds on the client.
+    creds = {
+        :db_name   => TEST_DB,
+        :username  => TEST_USER,
+        :password  => TEST_USER_PWD,
+        :source    => TEST_DB,
+        :mechanism => Mongo::Authentication::DEFAULT_MECHANISM,
+        :extra     => {}
+    }
+    client.auths << creds
+
+    # The client authenticates its socket with the
+    # new credential, but gets a socket.error.
+    client[TEST_DB]['ruby-test'].find_one
+
+    # # No semaphore leak, the pool is allowed to make a new socket.
+    assert_equal 1, pool.instance_variable_get(:@sockets).size
+  end
+
+  def test_socket_cleanup
+    # Get a client with one socket so we detect if it's leaked.
+    client = MongoClient.new(TEST_HOST, TEST_PORT, :pool_size => 1, :pool_timeout => 1)
+    assert_equal 1, client.pool_size
+
+    # Set up the client with a pool
+    client[TEST_DB].command(:ping => 1)
+
+    # Simulate an authenticate() call on a different socket.
+    # Cache the creds on the client.
+    creds = {
+        :db_name   => TEST_DB,
+        :username  => TEST_USER,
+        :password  => TEST_USER_PWD,
+        :source    => TEST_DB,
+        :mechanism => Mongo::Authentication::DEFAULT_MECHANISM,
+        :extra     => {}
+    }
+    client.auths << creds
+
+    # Mock the socket to raise a ConnectionFailure when applying auths
+    pool   = client.primary_pool
+    socket = pool.instance_variable_get(:@sockets).first
+    socket.expects(:send).raises(ConnectionFailure)
+
+    # Checkout a socket from the pool to force it to get a new socket
+    pool.checkout
+    new_socket = pool.instance_variable_get(:@sockets).first
+
+    # Make sure the pool is cleaned up properly
+    assert_not_equal socket, new_socket
+    assert_equal 1, pool.instance_variable_get(:@sockets).size
+    assert_equal 1, pool.instance_variable_get(:@thread_ids_to_sockets).size
+    assert !pool.instance_variable_get(:@checked_out).include?(socket)
+    assert !pool.instance_variable_get(:@sockets).include?(socket)
+  end
 end

data/test/functional/timeout_test.rb

@@ -17,6 +17,7 @@ require 'test_helper'
 class TimeoutTest < Test::Unit::TestCase
 
   def test_op_timeout
+    grant_admin_user_eval_role(standard_connection)
     connection = standard_connection(:op_timeout => 0.5)
 
     admin = connection.db('admin')
@@ -36,6 +37,7 @@ class TimeoutTest < Test::Unit::TestCase
     client = standard_connection
     db     = client[TEST_DB]
     coll   = db['timeout-tests']
+    grant_admin_user_eval_role(client)
 
     # prepare the database
     coll.drop

data/test/helpers/test_unit.rb

@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TEST_DB   = 'ruby_test' unless defined? TEST_DB
-TEST_HOST = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost' unless defined? TEST_HOST
-TEST_DATA = File.join(File.dirname(__FILE__), 'fixtures/data')
-TEST_BASE = Test::Unit::TestCase
+TEST_HOST     = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost' unless defined? TEST_HOST
+TEST_DATA     = File.join(File.dirname(__FILE__), 'fixtures/data')
+TEST_BASE     = Test::Unit::TestCase
 
 unless defined? TEST_PORT
   TEST_PORT = if ENV['MONGO_RUBY_DRIVER_PORT']
@@ -59,6 +58,11 @@ class Test::Unit::TestCase
 
     cluster_instance.start
     instance_variable_set("@#{kind}", cluster_instance)
+
+    uri = "mongodb://#{TEST_USER}:#{TEST_USER_PWD}@" +
+            "#{cluster_instance.members_uri}"
+    uri += "?replicaset=#{@rs.repl_set_name}" if cluster_instance.replica_set?
+    instance_variable_set("@uri", uri)
   end
 
   # Generic helper to rescue and retry from a connection failure.
@@ -86,9 +90,15 @@ class Test::Unit::TestCase
   # @return [MongoClient] The client instance.
   def self.standard_connection(options={}, legacy=false)
     if legacy
-      Connection.new(TEST_HOST, TEST_PORT, options)
+      silently do
+        # We have to create the Connection object directly here instead of using TEST_URI
+        # because Connection#from_uri ends up creating a MongoClient object.
+        conn = Connection.new(TEST_HOST, TEST_PORT, options)
+        conn[TEST_DB].authenticate(TEST_USER, TEST_USER_PWD)
+        conn
+      end
     else
-      MongoClient.new(TEST_HOST, TEST_PORT, options)
+      MongoClient.from_uri(TEST_URI, options)
     end
   end
 
@@ -218,6 +228,7 @@ class Test::Unit::TestCase
   end
 
   def with_forced_timeout(client, &block)
+    authenticate_client(client)
     cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['argv']
     if cmd_line_args.include?('enableTestCommands=1') && client.server_version >= "2.5.3"
       begin
@@ -233,12 +244,8 @@ class Test::Unit::TestCase
     end
   end
 
-  def with_auth(client, &block)
-    cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['parsed']
-    yield if cmd_line_args.include?('auth')
-  end
-
   def with_default_journaling(client, &block)
+    authenticate_client(client)
     cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['parsed']
     unless client.server_version < "2.0" || cmd_line_args.include?('nojournal')
       yield
@@ -252,6 +259,7 @@ class Test::Unit::TestCase
   end
 
   def with_no_journaling(client, &block)
+    authenticate_client(client)
     cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['parsed']
     unless client.server_version < "2.0" || !cmd_line_args.include?('nojournal')
       yield
@@ -259,6 +267,7 @@ class Test::Unit::TestCase
   end
 
   def with_ipv6_enabled(client, &block)
+    authenticate_client(client)
     cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['parsed']
     if cmd_line_args.include?('ipv6')
       yield
@@ -310,14 +319,140 @@ class Test::Unit::TestCase
   def subject_to_server_4754?(client)
     # Until SERVER-4754 is resolved, profiling info is not collected
     # when mongod is started with --auth in versions < 2.2
+    authenticate_client(client)
     cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['parsed']
     client.server_version < '2.2' && cmd_line_args.include?('auth')
   end
+
+  # When testing under narrowed localhost exception, the admin user must have
+  # special permissions to run the db_eval command.
+  def grant_admin_user_eval_role(client)
+    if auth_enabled?(client) && client.server_version >= "2.6"
+      # we need to have anyAction on anyResource to run db_eval()
+      admin = client['admin']
+      any_priv = BSON::OrderedHash.new
+      any_priv[:resource] = { :anyResource => true }
+      any_priv[:actions] = ['anyAction']
+
+      create_role = BSON::OrderedHash.new
+      create_role[:createRole] = 'db_eval'
+      create_role[:privileges] = [any_priv]
+      create_role[:roles] = []
+
+      begin
+        admin.command(create_role)
+      rescue Mongo::OperationFailure => ex
+        # role already exists
+      end
+
+      grant_role = BSON::OrderedHash.new
+      grant_role[:grantRolesToUser] = TEST_USER
+      grant_role[:roles] = ['db_eval']
+      admin.command(grant_role)
+    end
+  end
+
+  # Return true if auth is enabled, false otherwise.
+  def auth_enabled?(client)
+    begin
+      cmd_line_args = client['admin'].command({ :getCmdLineOpts => 1 })['parsed']
+      return true if cmd_line_args.include?('auth') || cmd_line_args.include?('keyFile')
+      if security = cmd_line_args["security"]
+        return true if security["authorization"] == "enabled"
+      end
+    rescue OperationFailure => ex
+      # under narrowed localhost exception in > 2.7.1, getCmdLineOpts is not allowed
+      # unless you're authenticated.
+      return true if ex.message.include?("authorized") ||
+                      (client.server_version >= "2.7.1" &&
+                      ex.error_code == Mongo::ErrorCode::UNAUTHORIZED)
+    end
+  end
+
+  def with_auth(client, &block)
+    yield if auth_enabled?(client)
+  end
+
+  def authenticate_client(client)
+    client[TEST_DB].authenticate(TEST_USER, TEST_USER_PWD) unless client.auths.any? {|a| a[:source] == TEST_DB}
+    client
+  end
+
+  def self.ensure_admin_user
+    10.times do
+      begin
+        client = Mongo::MongoClient.new(TEST_HOST, TEST_PORT)
+        db = client[TEST_DB]
+        begin
+          db.authenticate(TEST_USER, TEST_USER_PWD)
+        rescue Mongo::AuthenticationError => ex
+          roles = [ 'dbAdminAnyDatabase',
+                    'userAdminAnyDatabase',
+                    'readWriteAnyDatabase',
+                    'clusterAdmin' ]
+          db.add_user(TEST_USER, TEST_USER_PWD, nil, :roles => roles)
+        end
+        TEST_BASE.class_eval { class_variable_set("@@connected_single_mongod", true) }
+        break
+      rescue Mongo::ConnectionFailure
+        # mongod not available yet, wait a second and try again
+        sleep(1)
+      end
+      #puts "Not connected to a MongoD" unless client.connected?
+    end
+  end
+
+  def self.cleanup_users_and_dbs
+    not_cluster = TEST_BASE.class_eval { class_variables }.none? { |v| v =~ /@@cluster_/ }
+
+    if @@connected_single_mongod && not_cluster
+      client = Mongo::MongoClient.from_uri(TEST_URI)
+      db = client[TEST_DB]
+      begin
+        begin
+          db.authenticate(TEST_USER, TEST_USER_PWD)
+
+        rescue Mongo::ConnectionFailure, Mongo::MongoArgumentError
+        rescue Mongo::AuthenticationError
+          Test::Unit::TestCase.ensure_admin_user
+          db.authenticate(TEST_USER, TEST_USER_PWD)
+        end
+
+        client.database_names.each do |db_name|
+          if db_name =~ /^ruby_test*/
+            puts "[CLEAN-UP] Dropping '#{db_name}'..."
+            client.drop_database(db_name)
+          end
+        end
+
+        if client.server_version < '2.5'
+          db['system.users'].remove
+        else
+          db.command(:dropAllUsersFromDatabase => 1)
+        end
+
+      rescue Mongo::ConnectionFailure
+        # Nothing we can do about the mongod not being available
+      end
+    end
+  end
+end
+
+
+Test::Unit.at_start do
+  TEST_DB       = ENV['TEST_DB']       || 'admin'
+  TEST_USER     = ENV['TEST_USER']     || 'admin_user'
+  TEST_USER_PWD = ENV['TEST_USER_PWD'] || 'password'
+  TEST_URI      = ENV['TEST_URI']      ||
+      "mongodb://#{TEST_USER}:#{TEST_USER_PWD}@#{TEST_HOST}:#{TEST_PORT}/#{TEST_DB}"
+  TEST_BASE.class_eval { class_variable_set("@@connected_single_mongod", false) }
+  Test::Unit::TestCase.ensure_admin_user
 end
 
 # Before and after hooks for the entire test run
 # handles mop up after the cluster manager is done.
 Test::Unit.at_exit do
+  Test::Unit::TestCase.cleanup_users_and_dbs
   TEST_BASE.class_eval { class_variables }.select { |v| v =~ /@@cluster_/ }.each do |cluster|
     TEST_BASE.class_eval { class_variable_get(cluster) }.stop
   end

data/test/replica_set/authentication_test.rb

@@ -20,6 +20,7 @@ require 'shared/authentication/gssapi_shared'
 
 class ReplicaSetAuthenticationTest < Test::Unit::TestCase
   include Mongo
+
   include BasicAuthTests
   include SASLPlainTests
   include BulkAPIAuthTests
@@ -27,9 +28,10 @@ class ReplicaSetAuthenticationTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client    = MongoReplicaSetClient.new(@rs.repl_set_seeds)
+    @client    = MongoReplicaSetClient.from_uri(@uri)
+    @admin     = @client['admin']
     @version   = @client.server_version
-    @db        = @client[TEST_DB]
+    @db        = @client['ruby-test']
     @host_info = @rs.repl_set_seeds.join(',')
   end
 end

data/test/replica_set/basic_test.rb

@@ -73,9 +73,7 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
   end
 
   def test_accessors
-    seeds = @rs.repl_set_seeds
-    args = {:name => @rs.repl_set_name}
-    client = MongoReplicaSetClient.new(seeds, args)
+    client = MongoReplicaSetClient.from_uri(@uri)
     assert_equal @rs.primary_name, [client.host, client.port].join(':')
     assert_equal client.host, client.primary_pool.host
     assert_equal client.port, client.primary_pool.port
@@ -89,9 +87,7 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
   end
 
   def test_write_commands_and_operations
-    seeds = @rs.repl_set_seeds
-    args = {:name => @rs.repl_set_name}
-    @client = MongoReplicaSetClient.new(seeds, args)
+    @client = MongoReplicaSetClient.from_uri(@uri)
     @coll = @client[TEST_DB]['test-write-commands-and-operations']
     with_write_commands_and_operations(@client) do
       @coll.remove
@@ -101,7 +97,7 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
   end
 
   def test_wnote_does_not_raise_exception_with_err_nil
-    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :name => @rs.repl_set_name)
+    @client = MongoReplicaSetClient.from_uri(@uri)
     if @client.server_version < '2.5.5'
       @coll = @client[TEST_DB]['test-wnote']
       begin
@@ -117,9 +113,7 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
   context "Socket pools" do
     context "checking out writers" do
       setup do
-        seeds = @rs.repl_set_seeds
-        args = {:name => @rs.repl_set_name}
-        @client = MongoReplicaSetClient.new(seeds, args)
+        @client = MongoReplicaSetClient.from_uri(@uri)
         @coll = @client[TEST_DB]['test-connection-exceptions']
       end
 
@@ -168,9 +162,7 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
 
     context "checking out readers" do
       setup do
-        seeds = @rs.repl_set_seeds
-        args = {:name => @rs.repl_set_name}
-        @client = MongoReplicaSetClient.new(seeds, args)
+        @client = MongoReplicaSetClient.from_uri(@uri)
         @coll = @client[TEST_DB]['test-connection-exceptions']
       end
 

data/test/replica_set/client_test.rb

@@ -26,7 +26,7 @@ class ReplicaSetClientTest < Test::Unit::TestCase
   end
 
   def test_reconnection
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri)
     assert @client.connected?
 
     manager = @client.local_manager
@@ -76,11 +76,12 @@ class ReplicaSetClientTest < Test::Unit::TestCase
   end
 
   def test_connect_with_primary_stepped_down
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri)
     @client[TEST_DB]['bar'].save({:a => 1}, {:w => 3})
     assert @client[TEST_DB]['bar'].find_one
 
     primary = Mongo::MongoClient.new(*@client.primary)
+    authenticate_client(primary)
     assert_raise Mongo::ConnectionFailure do
       perform_step_down(primary)
     end
@@ -93,7 +94,7 @@ class ReplicaSetClientTest < Test::Unit::TestCase
   end
 
   def test_connect_with_primary_killed
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri)
     assert @client.connected?
     @client[TEST_DB]['bar'].save({:a => 1}, {:w => 3})
     assert @client[TEST_DB]['bar'].find_one
@@ -109,10 +110,11 @@ class ReplicaSetClientTest < Test::Unit::TestCase
   end
 
   def test_save_with_primary_stepped_down
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri)
     assert @client.connected?
 
     primary = Mongo::MongoClient.new(*@client.primary)
+    authenticate_client(primary)
     assert_raise Mongo::ConnectionFailure do
       perform_step_down(primary)
     end
@@ -124,7 +126,7 @@ class ReplicaSetClientTest < Test::Unit::TestCase
   end
 
   # def test_connect_with_first_node_removed
-  #   @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+  #   @client = MongoReplicaSetClient.from_uri(@uri)
   #   @client[TEST_DB]['bar'].save({:a => 1}, {:w => 3})
 
   #   # Make sure everyone's views of optimes are caught up
@@ -331,7 +333,7 @@ class ReplicaSetClientTest < Test::Unit::TestCase
   end
 
   def test_find_and_modify_with_secondary_read_preference
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri)
     collection = @client[TEST_DB].collection('test', :read => :secondary)
     id = BSON::ObjectId.new
     collection << { :a => id, :processed => false }

data/test/replica_set/complex_connect_test.rb

@@ -27,6 +27,7 @@ class ComplexConnectTest < Test::Unit::TestCase
   def test_complex_connect
     host = @rs.servers.first.host
     primary = MongoClient.new(host, @rs.primary.port)
+    authenticate_client(primary)
 
     @client = MongoReplicaSetClient.new([
       @rs.servers[2].host_port,
@@ -34,6 +35,7 @@ class ComplexConnectTest < Test::Unit::TestCase
       @rs.servers[0].host_port
     ])
 
+    authenticate_client(@client)
     version = @client.server_version
 
     @client[TEST_DB]['complext-connect-test'].insert({:a => 1})
@@ -70,6 +72,7 @@ class ComplexConnectTest < Test::Unit::TestCase
     end
 
     primary = MongoClient.new(host, @rs.primary.port)
+    authenticate_client(primary)
     assert_raise ConnectionFailure do
       primary['admin'].command({:replSetReconfig => old_config})
     end