JAVA-436: If a database is not specified in the URI but credentials are, authenticate to the admin database

Author: jyemin

src/main/com/mongodb/Mongo.java

@@ -90,6 +90,9 @@ public class Mongo {
     private static final String FULL_VERSION = "2.10.0-SNAPSHOT";
 
     static int cleanerIntervalMS;
+
+    private static final String ADMIN_DATABASE_NAME = "admin";
+
     static {
         cleanerIntervalMS = Integer.parseInt(System.getProperty("com.mongodb.cleanerIntervalMS", "1000"));
     }
@@ -328,8 +331,15 @@ public Mongo( MongoURI uri )
             _connector = new DBTCPConnector( this , replicaSetSeeds );
         }
 
-        if (uri.getDatabase() != null && uri.getUsername() != null) {
-            DB db = new DBApiLayer(this, uri.getDatabase() , _connector, uri.getUsername(), uri.getPassword());
+        if (uri.getUsername() != null) {
+            String databaseName;
+            if (uri.getDatabase() != null) {
+                databaseName = uri.getDatabase();
+            } else {
+                databaseName = ADMIN_DATABASE_NAME;
+            }
+
+            DB db = new DBApiLayer(this, databaseName, _connector, uri.getUsername(), uri.getPassword());
             _dbs.put(db.getName(), db);
         }
 
@@ -380,7 +390,7 @@ public List<String> getDatabaseNames(){
         cmd.put("listDatabases", 1);
 
 
-        CommandResult res = getDB( "admin" ).command(cmd, getOptions());
+        CommandResult res = getDB(ADMIN_DATABASE_NAME).command(cmd, getOptions());
         res.throwOnError();
 
         List l = (List)res.get("databases");
@@ -648,7 +658,7 @@ public CommandResult fsync(boolean async) {
         if (async) {
             cmd.put("async", 1);
         }
-        return getDB("admin").command(cmd);
+        return getDB(ADMIN_DATABASE_NAME).command(cmd);
     }
 
     /**
@@ -660,7 +670,7 @@ public CommandResult fsync(boolean async) {
     public CommandResult fsyncAndLock() {
         DBObject cmd = new BasicDBObject("fsync", 1);
         cmd.put("lock", 1);
-        return getDB("admin").command(cmd);
+        return getDB(ADMIN_DATABASE_NAME).command(cmd);
     }
 
     /**
@@ -670,7 +680,7 @@ public CommandResult fsyncAndLock() {
      * @throws MongoException
      */
     public DBObject unlock() {
-        DB db = getDB("admin");
+        DB db = getDB(ADMIN_DATABASE_NAME);
         DBCollection col = db.getCollection("$cmd.sys.unlock");
         return col.findOne();
     }
@@ -681,7 +691,7 @@ public DBObject unlock() {
      * @throws MongoException
      */
     public boolean isLocked() {
-        DB db = getDB("admin");
+        DB db = getDB(ADMIN_DATABASE_NAME);
         DBCollection col = db.getCollection("$cmd.sys.inprog");
         BasicDBObject res = (BasicDBObject) col.findOne();
         if (res.containsField("fsyncLock")) {

src/test/com/mongodb/JavaClientTest.java

@@ -705,6 +705,35 @@ public void testAuthenticateCommand() throws UnknownHostException {
         }
     }
 
+    @Test
+    public void testAuthenticateWithCredentialsInURIAndNoDatabase() throws UnknownHostException {
+        // First add the user
+        Mongo m = new Mongo(new MongoURI("mongodb://localhost"));
+        DB db = m.getDB("admin");
+        DBCollection u = db.getCollection( "system.users" );
+        try {
+            assertEquals( 0 , u.find().count() );
+
+            db.addUser( "xx" , "e".toCharArray() );
+            assertEquals( 1 , u.find().count() );
+        }
+        finally {
+            m.close();
+        }
+
+        m = new Mongo(new MongoURI("mongodb://xx:e@localhost"));
+        db = m.getDB("admin");
+
+        try {
+            assertNotNull(db.getAuthenticationCredentials());
+            assertEquals(true, db.authenticate("xx", "e".toCharArray()) );
+        }
+        finally {
+            db.getCollection( "system.users" ).remove(new BasicDBObject());
+            m.close();
+        }
+    }
+
     @Test
     public void testAuthenticateWithCredentialsInURI() throws UnknownHostException {
         // First add the user
@@ -725,6 +754,7 @@ public void testAuthenticateWithCredentialsInURI() throws UnknownHostException {
         db = m.getDB(cleanupDB);
 
         try {
+            assertNotNull(db.getAuthenticationCredentials());
             assertEquals(true, db.authenticate("xx", "e".toCharArray()) );
         }
         finally {
@@ -753,6 +783,7 @@ public void testAuthenticateCommandWithCredentialsInURI() throws UnknownHostExce
         db = m.getDB(cleanupDB);
 
         try {
+            assertNotNull(db.getAuthenticationCredentials());
             assertTrue(db.authenticateCommand("xx", "e".toCharArray()).ok());
         }
         finally {