mongo 1.8.6 → 1.12.5

data/test/functional/uri_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class URITest < Test::Unit::TestCase
@@ -17,6 +31,64 @@ class URITest < Test::Unit::TestCase
     assert_equal 27018, parser.nodes[0][1]
   end
 
+  def test_unix_socket
+    parser = Mongo::URIParser.new('mongodb:///tmp/mongod.sock')
+    assert_equal 1, parser.nodes.length
+    assert_equal '/tmp/mongod.sock', parser.nodes[0][0]
+  end
+
+  def test_unix_socket_with_user
+    parser = Mongo::URIParser.new('mongodb://bob:secret.word@/tmp/mongod.sock')
+    assert_equal 1, parser.nodes.length
+    assert_equal '/tmp/mongod.sock', parser.nodes[0][0]
+    assert_equal "bob", parser.auths.first[:username]
+    assert_equal "secret.word", parser.auths.first[:password]
+    assert_equal 'admin', parser.auths.first[:source]
+  end
+
+  def test_unix_socket_with_db
+    parser = Mongo::URIParser.new('mongodb://bob:secret.word@/tmp/mongod.sock/some_db')
+    assert_equal 1, parser.nodes.length
+    assert_equal '/tmp/mongod.sock', parser.nodes[0][0]
+    assert_equal 'bob', parser.auths.first[:username]
+    assert_equal 'secret.word', parser.auths.first[:password]
+    assert_equal 'some_db', parser.auths.first[:source]
+  end
+
+  def test_ipv6_format
+    parser = Mongo::URIParser.new('mongodb://[::1]:27018')
+    assert_equal 1, parser.nodes.length
+    assert_equal '::1', parser.nodes[0][0]
+    assert_equal 27018, parser.nodes[0][1]
+
+    parser = Mongo::URIParser.new('mongodb://[::1]')
+    assert_equal 1, parser.nodes.length
+    assert_equal '::1', parser.nodes[0][0]
+  end
+
+  def test_ipv6_format_multi
+    parser = Mongo::URIParser.new('mongodb://[::1]:27017,[::1]:27018')
+    assert_equal 2, parser.nodes.length
+    assert_equal '::1', parser.nodes[0][0]
+    assert_equal 27017, parser.nodes[0][1]
+    assert_equal '::1', parser.nodes[1][0]
+    assert_equal 27018, parser.nodes[1][1]
+
+    parser = Mongo::URIParser.new('mongodb://[::1]:27017,localhost:27018')
+    assert_equal 2, parser.nodes.length
+    assert_equal '::1', parser.nodes[0][0]
+    assert_equal 27017, parser.nodes[0][1]
+    assert_equal 'localhost', parser.nodes[1][0]
+    assert_equal 27018, parser.nodes[1][1]
+
+    parser = Mongo::URIParser.new('mongodb://localhost:27017,[::1]:27018')
+    assert_equal 2, parser.nodes.length
+    assert_equal 'localhost', parser.nodes[0][0]
+    assert_equal 27017, parser.nodes[0][1]
+    assert_equal '::1', parser.nodes[1][0]
+    assert_equal 27018, parser.nodes[1][1]
+  end
+
   def test_multiple_uris
     parser = Mongo::URIParser.new('mongodb://a.example.com:27018,b.example.com')
     assert_equal 2, parser.nodes.length
@@ -24,39 +96,89 @@ class URITest < Test::Unit::TestCase
     assert_equal ['b.example.com', 27017], parser.nodes[1]
   end
 
+  def test_username_without_password
+    parser = Mongo::URIParser.new('mongodb://bob:@localhost?authMechanism=GSSAPI')
+    assert_equal "bob", parser.auths.first[:username]
+    assert_equal nil, parser.auths.first[:password]
+
+    parser = Mongo::URIParser.new('mongodb://bob@localhost?authMechanism=GSSAPI')
+    assert_equal nil, parser.auths.first[:password]
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://bob:@localhost')
+    end
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://bob@localhost')
+    end
+  end
+
+  def test_username_without_password_unix_socket
+    parser = Mongo::URIParser.new('mongodb://bob:@/tmp/mongod.sock?authMechanism=GSSAPI')
+    assert_equal "bob", parser.auths.first[:username]
+    assert_equal nil, parser.auths.first[:password]
+
+    parser = Mongo::URIParser.new('mongodb://bob@/tmp/mongod.sock?authMechanism=GSSAPI')
+    assert_equal nil, parser.auths.first[:password]
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://bob:@/tmp/mongod.sock')
+    end
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://bob@/tmp/mongod.sock')
+    end
+  end
+
   def test_complex_passwords
     parser = Mongo::URIParser.new('mongodb://bob:secret.word@a.example.com:27018/test')
-    assert_equal "bob", parser.auths[0][:username]
-    assert_equal "secret.word", parser.auths[0][:password]
+    assert_equal "bob", parser.auths.first[:username]
+    assert_equal "secret.word", parser.auths.first[:password]
 
     parser = Mongo::URIParser.new('mongodb://bob:s-_3#%R.t@a.example.com:27018/test')
-    assert_equal "bob", parser.auths[0][:username]
-    assert_equal "s-_3#%R.t", parser.auths[0][:password]
+    assert_equal "bob", parser.auths.first[:username]
+    assert_equal "s-_3#%R.t", parser.auths.first[:password]
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://doctor:bad:wolf@gallifrey.com:27018/test')
+    end
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://doctor:bow@tie@gallifrey.com:27018/test')
+    end
   end
 
   def test_complex_usernames
-    parser = Mongo::URIParser.new('mongodb://b:ob:secret.word@a.example.com:27018/test')
-    assert_equal "b:ob", parser.auths[0][:username]
-  end
+    parser = Mongo::URIParser.new('mongodb://s-_3#%R.t:secret.word@a.example.com:27018/test')
+    assert_equal "s-_3#%R.t", parser.auths.first[:username]
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://doc:tor:badwolf@gallifrey.com:27018/test')
+    end
 
-  def test_passwords_contain_no_commas
-    assert_raise MongoArgumentError do
-      Mongo::URIParser.new('mongodb://bob:a,b@a.example.com:27018/test')
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new('mongodb://d@ctor:bowtie@gallifrey.com:27018/test')
     end
   end
 
-  def test_multiple_uris_with_auths
-    parser = Mongo::URIParser.new('mongodb://bob:secret@a.example.com:27018,b.example.com/test')
-    assert_equal 2, parser.nodes.length
-    assert_equal ['a.example.com', 27018], parser.nodes[0]
-    assert_equal ['b.example.com', 27017], parser.nodes[1]
-    assert_equal 2, parser.auths.length
-    assert_equal "bob", parser.auths[0][:username]
-    assert_equal "secret", parser.auths[0][:password]
-    assert_equal "test", parser.auths[0][:db_name]
-    assert_equal "bob", parser.auths[1][:username]
-    assert_equal "secret", parser.auths[1][:password]
-    assert_equal "test", parser.auths[1][:db_name]
+  def test_username_with_encoded_symbol
+    parser = Mongo::URIParser.new('mongodb://f%40o:bar@localhost/admin')
+    username = parser.auths.first[:username]
+    assert_equal 'f@o', username
+
+    parser = Mongo::URIParser.new('mongodb://f%3Ao:bar@localhost/admin')
+    username = parser.auths.first[:username]
+    assert_equal 'f:o', username
+  end
+
+  def test_password_with_encoded_symbol
+    parser = Mongo::URIParser.new('mongodb://foo:b%40r@localhost/admin')
+    password = parser.auths.first[:password]
+    assert_equal 'b@r', password
+
+    parser = Mongo::URIParser.new('mongodb://foo:b%3Ar@localhost/admin')
+    password = parser.auths.first[:password]
+    assert_equal 'b:r', password
   end
 
   def test_opts_with_semincolon_separator
@@ -134,6 +256,11 @@ class URITest < Test::Unit::TestCase
     assert_equal :primary, parser.readpreference
   end
 
+  def test_read_preference_option_primary_unix_sock
+    parser = Mongo::URIParser.new("mongodb:///tmp/mongod.sock?readPreference=primary")
+    assert_equal :primary, parser.readpreference
+  end
+
   def test_read_preference_option_primary_preferred
     parser = Mongo::URIParser.new("mongodb://localhost:27018?readPreference=primaryPreferred")
     assert_equal :primary_preferred, parser.readpreference
@@ -175,6 +302,34 @@ class URITest < Test::Unit::TestCase
     assert_equal :nearest, parser.connection_options[:read]
   end
 
+  def test_read_preference_tags
+    parser = Mongo::URIParser.new("mongodb://localhost:27017?replicaset=test&" +
+                                  "readPreferenceTags=dc:ny,rack:1")
+    expected_tags = [{ 'dc' => 'ny', 'rack' => '1' }]
+    assert_equal expected_tags, parser.connection_options[:tag_sets]
+  end
+
+  def test_read_preference_tags_multiple
+    parser = Mongo::URIParser.new("mongodb://localhost:27017?replicaset=test&" +
+                                  "readPreferenceTags=dc:ny,rack:1&readPreferenceTags=dc:bos")
+    expected_tags = [{'dc' => 'ny', 'rack' => '1'}, { 'dc' => 'bos' }]
+    assert_equal expected_tags, parser.connection_options[:tag_sets]
+  end
+
+  def test_invalid_read_preference_tags
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new("mongodb://localhost:27017?replicaset=test&" +
+                                  "readPreferenceTags=dc")
+    end
+  end
+
+  def test_invalid_read_preference_tags_multiple
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new("mongodb://localhost:27017?replicaset=test&" +
+                                  "readPreferenceTags=dc:nyc&readPreferenceTags=dc")
+    end
+  end
+
   def test_connection_when_sharded_with_no_options
     parser = Mongo::URIParser.new("mongodb://localhost:27017,localhost:27018")
     client = parser.connection({}, false, true)
@@ -197,4 +352,95 @@ class URITest < Test::Unit::TestCase
     assert_equal :nearest, client.read
     assert_true client.mongos?
   end
+
+  def test_auth_source
+    parser = Mongo::URIParser.new("mongodb://user:pass@localhost?authSource=foobar")
+    assert_equal 'foobar', parser.authsource
+  end
+
+  def test_auth_mechanism
+    parser = Mongo::URIParser.new("mongodb://user@localhost?authMechanism=MONGODB-X509")
+    assert_equal 'MONGODB-X509', parser.authmechanism
+
+    assert_raise_error MongoArgumentError do
+      Mongo::URIParser.new("mongodb://user@localhost?authMechanism=INVALID")
+    end
+  end
+
+  def test_auth_mechanism_properties
+    uri = "mongodb://user@localhost?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME" +
+            ":mongodb,CANONICALIZE_HOST_NAME:true"
+    parser = Mongo::URIParser.new(uri)
+    properties = {:service_name => "mongodb", :canonicalize_host_name => true}
+    assert_equal properties, parser.authmechanismproperties
+    assert_equal 'GSSAPI', parser.authmechanism
+
+    uri = "mongodb://user@localhost?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME" +
+            ":MongoDB,CANONICALIZE_HOST_NAME:false,SERVICE_REALM:test"
+    parser = Mongo::URIParser.new(uri)
+    properties = {:service_name => "MongoDB", :canonicalize_host_name => false, :service_realm => "test"}
+    assert_equal properties, parser.authmechanismproperties
+    assert_equal 'GSSAPI', parser.authmechanism
+  end
+
+  def test_invalid_auth_mechanism_properties
+    uri = "mongodb://user@localhost?authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME" +
+            ":mongodb,INVALID_PROPERTY:true"
+    assert_raise_error MongoArgumentError do
+      parser = Mongo::URIParser.new(uri)
+    end
+
+    uri = "mongodb://user@localhost?authMechanism=PLAIN&authMechanismProperties="+
+            "SERVICE_NAME:mongodb"
+    assert_raise_error MongoArgumentError do
+      parser = Mongo::URIParser.new(uri)
+    end
+  end
+
+  def test_sasl_plain
+    parser = Mongo::URIParser.new("mongodb://user:pass@localhost?authMechanism=PLAIN")
+    assert_equal 'PLAIN', parser.auths.first[:mechanism]
+    assert_equal 'user', parser.auths.first[:username]
+    assert_equal 'pass', parser.auths.first[:password]
+    assert_equal 'admin', parser.auths.first[:source]
+
+    parser = Mongo::URIParser.new("mongodb://foo%2Fbar%40example.net:pass@localhost/some_db?authMechanism=PLAIN")
+    assert_equal 'PLAIN', parser.auths.first[:mechanism]
+    assert_equal 'foo/bar@example.net', parser.auths.first[:username]
+    assert_equal 'pass', parser.auths.first[:password]
+    assert_equal 'some_db', parser.auths.first[:source]
+
+    assert_raise_error MongoArgumentError  do
+      Mongo::URIParser.new("mongodb://user@localhost/some_db?authMechanism=PLAIN")
+    end
+  end
+
+  def test_gssapi
+    uri = "mongodb://foo%2Fbar%40example.net@localhost?authMechanism=GSSAPI;"
+    parser = Mongo::URIParser.new(uri)
+    assert_equal 'GSSAPI', parser.auths.first[:mechanism]
+    assert_equal 'foo/bar@example.net', parser.auths.first[:username]
+
+
+    uri = "mongodb://foo%2Fbar%40example.net@localhost?authMechanism=GSSAPI;" +
+            "authMechanismProperties=SERVICE_NAME:mongodb,SERVICE_REALM:example," +
+            "CANONICALIZE_HOST_NAME:true"
+    parser = Mongo::URIParser.new(uri)
+    assert_equal 'GSSAPI', parser.auths.first[:mechanism]
+    assert_equal 'foo/bar@example.net', parser.auths.first[:username]
+    assert_equal 'mongodb', parser.auths.first[:extra][:service_name]
+    assert_equal true, parser.auths.first[:extra][:canonicalize_host_name]
+    assert_equal 'example', parser.auths.first[:extra][:service_realm]
+  end
+
+  def test_opts_case_sensitivity
+    # options authsource, replicaset, w should be case sensitive
+    uri = "mongodb://localhost?authSource=FooBar;" +
+            "replicaSet=Foo;" +
+            "w=Majority"
+    parser = Mongo::URIParser.new(uri)
+    assert_equal 'FooBar',  parser.authsource
+    assert_equal 'Foo',     parser.replicaset
+    assert_equal :Majority, parser.w
+  end
 end

data/test/functional/write_concern_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 include Mongo
 
@@ -5,7 +19,7 @@ class WriteConcernTest < Test::Unit::TestCase
   context "Write concern propogation: " do
     setup do
       @con = standard_connection
-      @db  = @con[MONGO_TEST_DB]
+      @db  = @con[TEST_DB]
       @col = @db['test-safe']
       @col.create_index([[:a, 1]], :unique => true)
       @col.remove
@@ -45,7 +59,7 @@ class WriteConcernTest < Test::Unit::TestCase
   context "Write concern error objects" do
     setup do
       @con = standard_connection
-      @db  = @con[MONGO_TEST_DB]
+      @db  = @con[TEST_DB]
       @col = @db['test']
       @col.remove
       @col.insert({:a => 1})
@@ -57,8 +71,8 @@ class WriteConcernTest < Test::Unit::TestCase
       response = @col.update({:a => 1}, {"$set" => {:a => 2}},
                              :multi => true)
 
-      assert response['updatedExisting']
-      assert_equal 3, response['n']
+      assert(response['updatedExisting'] || @db.connection.wire_version_feature?(Mongo::MongoClient::BATCH_COMMANDS)) # TODO - review new write command return values
+      assert(response['n'] == 3 || @db.connection.wire_version_feature?(Mongo::MongoClient::BATCH_COMMANDS)) # TODO - update command top pending
     end
 
     should "return object on remove" do
@@ -69,7 +83,7 @@ class WriteConcernTest < Test::Unit::TestCase
 
   context "Write concern in gridfs" do
     setup do
-      @db = standard_connection.db(MONGO_TEST_DB)
+      @db = standard_connection.db(TEST_DB)
       @grid = Mongo::GridFileSystem.new(@db)
       @filename = 'sample'
     end

data/test/helpers/general.rb

@@ -0,0 +1,50 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Redirects output while yielding a given block of code.
+#
+# @return [Object] The result of the block.
+def silently
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  begin
+    result = yield
+  ensure
+    $VERBOSE = warn_level
+  end
+  result
+end
+
+class Hash
+  def stringify_keys
+    dup.stringify_keys!
+  end
+
+  def stringify_keys!
+    keys.each do |key|
+      self[key.to_s] = delete(key)
+    end
+    self
+  end
+
+  def except(*keys)
+    dup.except!(*keys)
+  end
+
+  # Replaces the hash without the given keys.
+  def except!(*keys)
+    keys.each { |key| delete(key) }
+    self
+  end
+end