mongo 1.2.0 → 1.2.1

data/lib/mongo/repl_set_connection.rb

@@ -125,6 +125,7 @@ module Mongo
         end
       end
     end
+    alias :reconnect :connect
 
     def connecting?
       @nodes_to_try.length > 0
@@ -167,6 +168,20 @@ module Mongo
       @read_secondary || @slave_ok
     end
 
+    def authenticate_pools
+      super
+      @secondary_pools.each do |pool|
+        pool.authenticate_existing
+      end
+    end
+
+    def logout_pools(db)
+      super
+      @secondary_pools.each do |pool|
+        pool.logout_existing(db)
+      end
+    end
+
     private
 
     def check_is_master(node)
@@ -175,7 +190,7 @@ module Mongo
         socket = TCPSocket.new(host, port)
         socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
-        config = self['admin'].command({:ismaster => 1}, :sock => socket)
+        config = self['admin'].command({:ismaster => 1}, :socket => socket)
 
         check_set_name(config, socket)
       rescue OperationFailure, SocketError, SystemCallError, IOError => ex
@@ -218,7 +233,7 @@ module Mongo
     def check_set_name(config, socket)
       if @replica_set
         config = self['admin'].command({:replSetGetStatus => 1},
-                   :sock => socket, :check_response => false)
+                   :socket => socket, :check_response => false)
 
         if !Mongo::Support.ok?(config)
           raise ReplicaSetConnectionError, config['errmsg']

data/lib/mongo/util/pool.rb

@@ -37,6 +37,9 @@ module Mongo
       # Condition variable for signal and wait
       @queue = ConditionVariable.new
 
+      # Operations to perform on a socket
+      @socket_ops = Hash.new { |h, k| h[k] = [] }
+
       @sockets      = []
       @checked_out  = []
     end
@@ -75,11 +78,42 @@ module Mongo
       rescue => ex
         raise ConnectionFailure, "Failed to connect socket: #{ex}"
       end
+
+      # If any saved authentications exist, we want to apply those
+      # when creating new sockets.
+      @connection.apply_saved_authentication(:socket => socket)
+
       @sockets << socket
       @checked_out << socket
       socket
     end
 
+    # If a user calls DB#authenticate, and several sockets exist,
+    # then we need a way to apply the authentication on each socket.
+    # So we store the apply_authentication method, and this will be
+    # applied right before the next use of each socket.
+    def authenticate_existing
+      @connection_mutex.synchronize do
+        @sockets.each do |socket|
+          @socket_ops[socket] << Proc.new do
+            @connection.apply_saved_authentication(:socket => socket)
+          end
+        end
+      end
+    end
+
+    # Store the logout op for each existing socket to be applied before
+    # the next use of each socket.
+    def logout_existing(db)
+      @connection_mutex.synchronize do
+        @sockets.each do |socket|
+          @socket_ops[socket] << Proc.new do
+            @connection.db(db).issue_logout(:socket => socket)
+          end
+        end
+      end
+    end
+
     # Checks out the first available socket from the pool.
     #
     # This method is called exclusively from #checkout;
@@ -110,14 +144,24 @@ module Mongo
                      checkout_new_socket
                    end
 
-          return socket if socket
+          if socket
+
+          # This call all procs, in order, scoped to existing sockets.
+          # At the moment, we use this to lazily authenticate and
+          # logout existing socket connections.
+          @socket_ops[socket].reject! do |op|
+            op.call
+          end
 
-          # Otherwise, wait
-          if @logger
-            @logger.warn "MONGODB Waiting for available connection; " +
-              "#{@checked_out.size} of #{@size} connections checked out."
+            return socket
+          else
+            # Otherwise, wait
+            if @logger
+              @logger.warn "MONGODB Waiting for available connection; " +
+                "#{@checked_out.size} of #{@size} connections checked out."
+            end
+            @queue.wait(@connection_mutex)
           end
-          @queue.wait(@connection_mutex)
         end
       end
     end

data/test/auxillary/repl_set_auth_test.rb

@@ -0,0 +1,58 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require './test/test_helper'
+require './test/tools/auth_repl_set_manager'
+
+class AuthTest < Test::Unit::TestCase
+  include Mongo
+
+  def setup
+    @manager = AuthReplSetManager.new(:start_port => 40000)
+    @manager.start_set
+  end
+
+  def teardown
+    @manager.cleanup_set
+  end
+
+  def test_repl_set_auth
+    @conn = ReplSetConnection.new([@manager.host, @manager.ports[0]], [@manager.host, @manager.ports[1]],
+      [@manager.host, @manager.ports[2]], :name => @manager.name)
+
+    # Add an admin user
+    @conn['admin'].add_user("me", "secret")
+
+    # Ensure that insert fails
+    assert_raise_error Mongo::OperationFailure, "unauthorized" do
+      @conn['foo']['stuff'].insert({:a => 2}, :safe => {:w => 3})
+    end
+
+    # Then authenticate
+    assert @conn['admin'].authenticate("me", "secret")
+
+    # Insert should succeed now
+    assert @conn['foo']['stuff'].insert({:a => 2}, :safe => {:w => 3})
+
+    # So should a query
+    assert @conn['foo']['stuff'].find_one
+
+    # But not when we logout
+    @conn['admin'].logout
+
+    assert_raise_error Mongo::OperationFailure, "unauthorized" do
+      @conn['foo']['stuff'].find_one
+    end
+
+    # Same should apply to a random secondary
+    @slave1 = Connection.new(@conn.secondary_pools[0].host,
+      @conn.secondary_pools[0].port, :slave_ok => true)
+
+    # Find should fail
+    assert_raise_error Mongo::OperationFailure, "unauthorized" do
+      @slave1['foo']['stuff'].find_one
+    end
+
+    # But not when authenticated
+    @slave1['admin'].authenticate("me", "secret")
+    assert @slave1['foo']['stuff'].find_one
+  end
+end

data/test/auxillary/threaded_authentication_test.rb

@@ -0,0 +1,101 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'mongo'
+require 'thread'
+require 'test/unit'
+require './test/test_helper'
+
+# NOTE: This test requires bouncing the server.
+# It also requires that a user exists on the admin database.
+class AuthenticationTest < Test::Unit::TestCase
+  include Mongo
+
+  def setup
+    @conn = standard_connection(:pool_size => 10)
+    @db1 = @conn.db('mongo-ruby-test-auth1')
+    @db2 = @conn.db('mongo-ruby-test-auth2')
+    @admin = @conn.db('admin')
+  end
+
+  def teardown
+    @db1.authenticate('user1', 'secret')
+    @db2.authenticate('user2', 'secret')
+    @conn.drop_database('mongo-ruby-test-auth1')
+    @conn.drop_database('mongo-ruby-test-auth2')
+  end
+
+  def threaded_exec
+    threads = []
+
+    100.times do
+      threads << Thread.new do
+        yield
+      end
+    end
+
+    100.times do |n|
+      threads[n].join
+    end
+  end
+
+  def test_authenticate
+    @admin.authenticate('bob', 'secret')
+    @db1.add_user('user1', 'secret')
+    @db2.add_user('user2', 'secret')
+    @admin.logout
+
+    threaded_exec do
+      assert_raise Mongo::OperationFailure do
+        @db1['stuff'].insert({:a => 2}, :safe => true)
+      end
+    end
+
+    threaded_exec do
+      assert_raise Mongo::OperationFailure do
+        @db2['stuff'].insert({:a => 2}, :safe => true)
+      end
+    end
+
+    @db1.authenticate('user1', 'secret')
+    @db2.authenticate('user2', 'secret')
+
+    threaded_exec do
+      assert @db1['stuff'].insert({:a => 2}, :safe => true)
+    end
+
+    threaded_exec do
+      assert @db2['stuff'].insert({:a => 2}, :safe => true)
+    end
+
+    puts "Please bounce the server."
+    gets
+
+    # Here we reconnect.
+    begin
+      @db1['stuff'].find.to_a
+      rescue Mongo::ConnectionFailure
+    end
+
+    threaded_exec do
+      assert @db1['stuff'].insert({:a => 2}, :safe => true)
+    end
+
+    threaded_exec do
+      assert @db2['stuff'].insert({:a => 2}, :safe => true)
+    end
+
+    @db1.logout
+    threaded_exec do
+      assert_raise Mongo::OperationFailure do
+        @db1['stuff'].insert({:a => 2}, :safe => true)
+      end
+    end
+
+    @db2.logout
+    threaded_exec do
+      assert_raise Mongo::OperationFailure do
+        assert @db2['stuff'].insert({:a => 2}, :safe => true)
+      end
+    end
+  end
+
+end

data/test/bson/bson_test.rb

@@ -562,4 +562,47 @@ class BSONTest < Test::Unit::TestCase
     end
   end
 
+  def test_invalid_key_names
+    assert @encoder.serialize({"hello" => "world"}, true)
+    assert @encoder.serialize({"hello" => {"hello" => "world"}}, true)
+
+    assert @encoder.serialize({"he$llo" => "world"}, true)
+    assert @encoder.serialize({"hello" => {"hell$o" => "world"}}, true)
+
+    assert_raise BSON::InvalidDocument do
+      @encoder.serialize({"he\0llo" => "world"}, true)
+    end
+
+    assert_raise_error BSON::InvalidKeyName, "$hello" do
+      @encoder.serialize({"$hello" => "world"}, true)
+    end
+
+    assert_raise BSON::InvalidKeyName do
+      @encoder.serialize({"hello" => {"$hello" => "world"}}, true)
+    end
+
+    assert_raise_error BSON::InvalidKeyName, ".hello" do
+      @encoder.serialize({".hello" => "world"}, true)
+    end
+
+    assert_raise BSON::InvalidKeyName do
+      @encoder.serialize({"hello" => {".hello" => "world"}}, true)
+    end
+
+    assert_raise BSON::InvalidKeyName do
+      @encoder.serialize({"hello." => "world"}, true)
+    end
+
+    assert_raise BSON::InvalidKeyName do
+      @encoder.serialize({"hello" => {"hello." => "world"}}, true)
+    end
+
+    assert_raise BSON::InvalidKeyName do
+      @encoder.serialize({"hel.lo" => "world"}, true)
+    end
+
+    assert_raise BSON::InvalidKeyName do
+      @encoder.serialize({"hello" => {"hel.lo" => "world"}}, true)
+    end
+  end
 end

data/test/connection_test.rb

@@ -167,7 +167,7 @@ class TestConnection < Test::Unit::TestCase
 
   def test_max_bson_size_value
     conn = standard_connection
-    if conn.server_version > "1.6"
+    if conn.server_version > "1.7.2"
       assert_equal conn['admin'].command({:ismaster => 1})['maxBsonObjectSize'], conn.max_bson_size
     end
 

data/test/db_api_test.rb

@@ -621,43 +621,6 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal("mike", @@coll.find_one()["hello"])
   end
 
-  def test_invalid_key_names
-    @@coll.remove
-
-    @@coll.insert({"hello" => "world"})
-    @@coll.insert({"hello" => {"hello" => "world"}})
-
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({"$hello" => "world"})
-    end
-
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({"hello" => {"$hello" => "world"}})
-    end
-
-    @@coll.insert({"he$llo" => "world"})
-    @@coll.insert({"hello" => {"hell$o" => "world"}})
-
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({".hello" => "world"})
-    end
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({"hello" => {".hello" => "world"}})
-    end
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({"hello." => "world"})
-    end
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({"hello" => {"hello." => "world"}})
-    end
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({"hel.lo" => "world"})
-    end
-    assert_raise BSON::InvalidKeyName do
-      @@coll.insert({"hello" => {"hel.lo" => "world"}})
-    end
-  end
-
   def test_collection_names
     assert_raise TypeError do
       @@db.collection(5)

data/test/load/thin/load.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'mongo')
+require 'logger'
+
+$con = Mongo::Connection.new
+$db = $con['foo']
+
+class Load < Sinatra::Base
+
+  configure do
+    LOGGER = Logger.new("sinatra.log")
+    enable :logging, :dump_errors
+    set :raise_errors, true
+  end
+
+  get '/' do
+    3.times do |n|
+      if (v=$db.eval("1 + #{n}")) != 1 + n
+        STDERR << "#{1 + n} expected but got #{v}"
+        raise StandardError, "#{1 + n} expected but got #{v}"
+      end
+    end
+  end
+
+end

data/test/load/unicorn/load.rb

@@ -0,0 +1,23 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'mongo')
+
+$con = Mongo::Connection.new
+$db = $con['foo']
+
+class Load < Sinatra::Base
+
+  configure do
+    LOGGER = Logger.new("sinatra.log")
+    enable :logging, :dump_errors
+    set :raise_errors, true
+  end
+
+  get '/' do
+    3.times do |n|
+      if (v=$db.eval("1 + #{n}")) != 1 + n
+        STDERR << "#{1 + n} expected but got #{v}"
+        raise StandardError, "#{1 + n} expected but got #{v}"
+      end
+    end
+  end
+
+end

data/test/load/unicorn/unicorn.rb

@@ -0,0 +1,29 @@
+# set path to app that will be used to configure unicorn, 
+# # note the trailing slash in this example
+@dir = "/home/kyle/work/10gen/ruby-driver/test/load/"
+
+worker_processes 10
+working_directory @dir
+
+preload_app true
+
+timeout 30
+
+# Specify path to socket unicorn listens to,
+# we will use this in our nginx.conf later
+listen "#{@dir}tmp/sockets/unicorn.sock", :backlog => 64
+
+# Set process id path
+pid "#{@dir}tmp/pids/unicorn.pid"
+
+# # Set log file paths
+stderr_path "#{@dir}log/unicorn.stderr.log"
+stdout_path "#{@dir}log/unicorn.stdout.log" 
+
+# NOTE: You need this when using forking web servers!
+after_fork do |server, worker|
+  $con.close if $con
+  $con = Mongo::Connection.new
+  $db = $con['foo']
+  STDERR << "FORKED #{server} #{worker}"
+end