RUBY-657 support URI encoded usernames and passwords

Author: TylerBrock

lib/mongo/util/uri_parser.rb

@@ -13,11 +13,12 @@
 # limitations under the License.
 
 require 'cgi'
+require 'uri'
 
 module Mongo
   class URIParser
 
-    USER_REGEX = /([-.\w:]+)/
+    USER_REGEX = /(.+)/
     PASS_REGEX = /([^@,]+)/
     AUTH_REGEX = /(#{USER_REGEX}:#{PASS_REGEX}@)?/
 
@@ -296,6 +297,9 @@ def parse_hosts(uri_without_proto)
       end
 
       if uname && pwd && db
+        uname = URI.unescape(uname)
+        pwd = URI.unescape(pwd)
+
         auths << {:db_name => db, :username => uname, :password => pwd}
       elsif uname || pwd
         raise MongoArgumentError, "MongoDB URI must include username, password, "

test/functional/uri_test.rb

@@ -53,6 +53,18 @@ def test_complex_usernames
     assert_equal "b:ob", parser.auths[0][:username]
   end
 
+  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
+  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
+  end
+
   def test_passwords_contain_no_commas
     assert_raise MongoArgumentError do
       Mongo::URIParser.new('mongodb://bob:a,b@a.example.com:27018/test')