[JAVA-269]: NullPointerException when authentication used with replica sets not logged correctly

Author: agirbal

src/main/com/mongodb/DB.java

@@ -485,14 +485,34 @@ private boolean _doauth( String username , byte[] hash ){
      * @param passwd
      */
     public void addUser( String username , char[] passwd ){
+        addUser(username, passwd, false);
+    }
+
+    /**
+     * Adds a new user for this db
+     * @param username
+     * @param passwd
+     * @param readOnly if true, user will only be able to read
+     */
+    public void addUser( String username , char[] passwd, boolean readOnly ){
         DBCollection c = getCollection( "system.users" );
         DBObject o = c.findOne( new BasicDBObject( "user" , username ) );
         if ( o == null )
             o = new BasicDBObject( "user" , username );
         o.put( "pwd" , _hash( username , passwd ) );
+        o.put( "readOnly" , readOnly );
         c.save( o );
     }
 
+    /**
+     * Removes a user for this db
+     * @param username
+     */
+    public void removeUser( String username ){
+        DBCollection c = getCollection( "system.users" );
+        c.remove(new BasicDBObject( "user" , username ));
+    }
+
     String _hash( String username , char[] passwd ){
         ByteArrayOutputStream bout = new ByteArrayOutputStream( username.length() + 20 + passwd.length );
         try {

src/main/com/mongodb/DBTCPConnector.java

@@ -32,14 +32,15 @@ class DBTCPConnector implements DBConnector {
 
     public DBTCPConnector( Mongo m , ServerAddress addr )
         throws MongoException {
+        _mongo = m;
         _portHolder = new DBPortPool.Holder( m._options );
         _checkAddress( addr );
 
         _createLogger.info( addr.toString() );
 
         if ( addr.isPaired() ){
             _allHosts = new ArrayList<ServerAddress>( addr.explode() );
-            _rsStatus = new ReplicaSetStatus( _allHosts );
+            _rsStatus = new ReplicaSetStatus( m, _allHosts );
             _createLogger.info( "switching to replica set mode : " + _allHosts + " -> " + _curMaster  );
         }
         else {
@@ -61,7 +62,7 @@ public DBTCPConnector( Mongo m , List<ServerAddress> all )
         _checkAddress( all );
 
         _allHosts = new ArrayList<ServerAddress>( all ); // make a copy so it can't be modified
-        _rsStatus = new ReplicaSetStatus( _allHosts );
+        _rsStatus = new ReplicaSetStatus( m, _allHosts );
 
         _createLogger.info( all  + " -> " + _curMaster );
     }
@@ -396,7 +397,7 @@ void testMaster()
         DBPort p = null;
         try {
             p = _masterPortPool.get();
-            p.runCommand( "admin" , new BasicDBObject( "nonce" , 1 ) );
+            p.runCommand( _mongo.getDB("admin") , new BasicDBObject( "nonce" , 1 ) );
         }
         finally {
             _masterPortPool.done( p );
@@ -434,6 +435,7 @@ public boolean isOpen(){
         return ! _closed;
     }
 
+    private Mongo _mongo;
     private ServerAddress _curMaster;
     private DBPortPool _masterPortPool;
     private DBPortPool.Holder _portHolder;

src/main/com/mongodb/ReplicaSetStatus.java

@@ -20,9 +20,10 @@
 class ReplicaSetStatus {
 
     static final Logger _rootLogger = Logger.getLogger( "com.mongodb.ReplicaSetStatus" );
-    
-    ReplicaSetStatus( List<ServerAddress> initial ){
-        
+    static final int UNAUTHENTICATED_ERROR_CODE = 10057;
+
+    ReplicaSetStatus( Mongo mongo, List<ServerAddress> initial ){
+        _mongo = mongo;
         _all = Collections.synchronizedList( new ArrayList<Node>() );
         for ( ServerAddress addr : initial ){
             _all.add( new Node( addr ) );
@@ -120,7 +121,7 @@ synchronized void update(){
         synchronized void update(Set<Node> seenNodes){
             try {
                 long start = System.currentTimeMillis();
-                CommandResult res = _port.runCommand( "admin" , _isMasterCmd );
+                CommandResult res = _port.runCommand( _mongo.getDB("admin") , _isMasterCmd );
                 _lastCheck = System.currentTimeMillis();
                 _pingTime = _lastCheck - start;
 
@@ -168,13 +169,16 @@ synchronized void update(Set<Node> seenNodes){
                 return;
 
             try {
-                DBObject config = _port.findOne( "local.system.replset" , new BasicDBObject() );
+                DB db = _mongo.getDB("local");
+                _port.checkAuth(db);
+                DBObject config = _port.findOne( db, "system.replset" , new BasicDBObject() );
                 if ( config == null ){
-                    // probbaly a replica pair
+                    // probably a replica pair
                     // TODO: add this in when pairs are really gone
                     //_logger.log( Level.SEVERE , "no replset config!" );
-                }
-                else {
+                } else if (config.get("$err") != null && UNAUTHENTICATED_ERROR_CODE == (Integer)config.get("code")) {
+                    _logger.log( Level.WARNING , "Replica Set updater cannot get results, call authenticate on 'local' or 'admin' db");
+                } else {
 
                     String setName = config.get( "_id" ).toString();
                     if ( _setName == null ){
@@ -361,6 +365,7 @@ void close(){
 
     final List<Node> _all;
     Updater _updater;
+    Mongo _mongo;
     String _setName = null; // null until init
     Logger _logger = _rootLogger; // will get changed to use set name once its found
 
@@ -385,7 +390,7 @@ public static void main( String args[] )
 
         Mongo m = new Mongo( addrs );
 
-        ReplicaSetStatus status = new ReplicaSetStatus( addrs );
+        ReplicaSetStatus status = new ReplicaSetStatus( m, addrs );
         System.out.println( status.ensureMaster()._addr );
 
         while ( true ){