JAVA-691: Always acquire write privileges for now.

Author: jyemin

src/main/com/mongodb/DBPort.java

@@ -304,7 +304,7 @@ protected void close(){
         _socket = null;
     }
 
-    void checkAuth(DB db, final boolean writePrivilegesRequired) throws IOException {
+    void checkAuth(DB db) throws IOException {
         // TODO: add support for retry when credentials ticket times out
         if (db.getMongo().getCredentials() != null) {
             if (!globallyAuthed) {
@@ -314,14 +314,14 @@ void checkAuth(DB db, final boolean writePrivilegesRequired) throws IOException
                 new GSSAPIAuthenticator(this, db.getMongo()).authenticate();
                 globallyAuthed = true;
             }
-            saslAquireDatabasePrivileges(db, writePrivilegesRequired);
+            saslAcquirePrivilegeForDatabase(db);
         }
         else {
             DB.AuthenticationCredentials credentials = db.getAuthenticationCredentials();
             if (credentials == null) {
                 if (db._name.equals("admin"))
                     return;
-                checkAuth(db._mongo.getDB("admin"), writePrivilegesRequired);
+                checkAuth(db._mongo.getDB("admin"));
                 return;
             }
             if (_authed.containsKey(db))
@@ -337,24 +337,15 @@ void checkAuth(DB db, final boolean writePrivilegesRequired) throws IOException
         }
     }
 
-    private void saslAquireDatabasePrivileges(final DB db, final boolean writePrivilegesRequired) throws IOException {
+    private void saslAcquirePrivilegeForDatabase(final DB db) throws IOException {
         BasicDBObject acquirePrivilegeCmd = new BasicDBObject("acquirePrivilege", 1).
-                append("principal", db.getMongo().getCredentials().getUserName()).append("resource", db.getName());
-        if (writePrivilegesRequired) {
-            if (_saslWriteAuthed.get(db) == null) {
-                acquirePrivilegeCmd.append("actions", Arrays.asList("oldWrite"));
-                CommandResult res = runCommand(db.getSisterDB("admin"), acquirePrivilegeCmd);
-                res.throwOnError();
-                _saslWriteAuthed.put(db, true);
-                _saslReadAuthed.put(db, true);
-            }
-        } else {
-            if (_saslReadAuthed.get(db) == null) {
-                acquirePrivilegeCmd.append("actions", Arrays.asList("oldRead"));
-                CommandResult res = runCommand(db.getSisterDB("admin"), acquirePrivilegeCmd);
-                res.throwOnError();
-                _saslReadAuthed.put(db, true);
-            }
+                append("principal", db.getMongo().getCredentials().getUserName()).
+                append("resource", db.getName());
+        if (_saslAuthed.get(db) == null) {
+            acquirePrivilegeCmd.append("actions", Arrays.asList("oldWrite"));
+            CommandResult res = runCommand(db.getSisterDB("admin"), acquirePrivilegeCmd);
+            res.throwOnError();
+            _saslAuthed.put(db, true);
         }
     }
 
@@ -381,8 +372,7 @@ public DBPortPool getPool() {
     private boolean _processingResponse;
 
     private Map<DB,Boolean> _authed = new ConcurrentHashMap<DB, Boolean>( );
-    private Map<DB,Boolean> _saslReadAuthed = new ConcurrentHashMap<DB, Boolean>( );
-    private Map<DB,Boolean> _saslWriteAuthed = new ConcurrentHashMap<DB, Boolean>( );
+    private Map<DB,Boolean> _saslAuthed = new ConcurrentHashMap<DB, Boolean>( );
     int _lastThread;
     long _calls = 0;
     private volatile ActiveState _activeState;

src/main/com/mongodb/DBTCPConnector.java

@@ -177,7 +177,7 @@ public WriteResult say( DB db , OutMessage m , WriteConcern concern , ServerAddr
         DBPort port = mp.get( true , ReadPreference.primary(), hostNeeded );
 
         try {
-            port.checkAuth( db, true);
+            port.checkAuth( db );
             port.say( m );
             if ( concern.callGetLastError() ){
                 return _checkWriteError( db , port , concern );
@@ -282,7 +282,7 @@ private Response innerCall(final DB db, final DBCollection coll, final OutMessag
         Response res = null;
         boolean retry = false;
         try {
-            port.checkAuth( db, false);
+            port.checkAuth( db );
             res = port.call( m , coll, decoder );
             if ( res._responseTo != m.getId() )
                 throw new MongoException( "ids don't match" );