Deprecated User operations

Author: rozza

driver-core/src/main/com/mongodb/operation/CreateUserOperation.java

@@ -46,7 +46,9 @@
  * An operation to create a user.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class CreateUserOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoCredential credential;
     private final boolean readOnly;
@@ -57,9 +59,7 @@ public class CreateUserOperation implements AsyncWriteOperation<Void>, WriteOper
      *
      * @param credential the users credentials.
      * @param readOnly   true if the user is a readOnly user.
-     * @deprecated Prefer {@link #CreateUserOperation(MongoCredential, boolean, WriteConcern)}
      */
-    @Deprecated
     public CreateUserOperation(final MongoCredential credential, final boolean readOnly) {
         this(credential, readOnly, null);
     }
@@ -131,7 +131,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
     }
 
     private BsonDocument getCommand(final ConnectionDescription description) {
-        BsonDocument commandDocument = asCommandDocument(credential, readOnly, "createUser");
+        BsonDocument commandDocument = asCommandDocument(credential, description, readOnly, "createUser");
         appendWriteConcernToCommand(writeConcern, commandDocument, description);
         return commandDocument;
     }

driver-core/src/main/com/mongodb/operation/DropUserOperation.java

@@ -45,7 +45,9 @@
  * An operation to remove a user.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class DropUserOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final String databaseName;
     private final String userName;
@@ -56,9 +58,7 @@ public class DropUserOperation implements AsyncWriteOperation<Void>, WriteOperat
      *
      * @param databaseName the name of the database for the operation.
      * @param userName     the name of the user to be dropped.
-     * @deprecated Prefer {@link #DropUserOperation(String, String, WriteConcern)}
      */
-    @Deprecated
     public DropUserOperation(final String databaseName, final String userName) {
         this(databaseName, userName, null);
     }

driver-core/src/main/com/mongodb/operation/UpdateUserOperation.java

@@ -46,7 +46,9 @@
  * An operation that updates a user.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class UpdateUserOperation implements AsyncWriteOperation<Void>, WriteOperation<Void> {
     private final MongoCredential credential;
     private final boolean readOnly;
@@ -57,9 +59,7 @@ public class UpdateUserOperation implements AsyncWriteOperation<Void>, WriteOper
      *
      * @param credential the users credentials.
      * @param readOnly   true if the user is a readOnly user.
-     * @deprecated Prefer {@link #UpdateUserOperation(MongoCredential, boolean, WriteConcern)}
      */
-    @Deprecated
     public UpdateUserOperation(final MongoCredential credential, final boolean readOnly) {
         this(credential, readOnly, null);
     }
@@ -131,7 +131,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
     }
 
     private BsonDocument getCommand(final ConnectionDescription description) {
-        BsonDocument commandDocument = asCommandDocument(credential, readOnly, "updateUser");
+        BsonDocument commandDocument = asCommandDocument(credential, description, readOnly, "updateUser");
         appendWriteConcernToCommand(writeConcern, commandDocument, description);
         return commandDocument;
     }

driver-core/src/main/com/mongodb/operation/UserExistsOperation.java

@@ -41,7 +41,9 @@
  * An operation that determines if a user exists.
  *
  * @since 3.0
+ * @deprecated use {@link CommandWriteOperation} directly or the mongod shell helpers.
  */
+@Deprecated
 public class UserExistsOperation implements AsyncReadOperation<Boolean>, ReadOperation<Boolean> {
     private final String databaseName;
     private final String userName;

driver-core/src/main/com/mongodb/operation/UserOperationHelper.java

@@ -21,26 +21,35 @@
 import com.mongodb.MongoInternalException;
 import com.mongodb.async.SingleResultCallback;
 import com.mongodb.lang.NonNull;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerVersion;
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.BsonValue;
 
-import java.util.Arrays;
+import java.util.Collections;
 
 import static com.mongodb.internal.authentication.NativeAuthenticationHelper.createAuthenticationHash;
 import static com.mongodb.operation.WriteConcernHelper.createWriteConcernError;
 import static com.mongodb.operation.WriteConcernHelper.hasWriteConcernError;
 
 final class UserOperationHelper {
+    private static final ServerVersion FOUR_ZERO = new ServerVersion(3, 7);
 
-    static BsonDocument asCommandDocument(final MongoCredential credential, final boolean readOnly, final String commandName) {
+    static BsonDocument asCommandDocument(final MongoCredential credential, final ConnectionDescription connectionDescription,
+                                          final boolean readOnly, final String commandName) {
+        boolean serverDigestPassword = connectionDescription.getServerVersion().compareTo(FOUR_ZERO) >= 0;
         BsonDocument document = new BsonDocument();
-        document.put(commandName, new BsonString(credential.getUserName()));
-        document.put("pwd", new BsonString(createAuthenticationHash(getUserNameNonNull(credential), getPasswordNonNull(credential))));
-        document.put("digestPassword", BsonBoolean.FALSE);
-        document.put("roles", new BsonArray(Arrays.<BsonValue>asList(new BsonString(getRoleName(credential, readOnly)))));
+        document.put(commandName, new BsonString(getUserNameNonNull(credential)));
+        if (serverDigestPassword) {
+            document.put("pwd", new BsonString(new String(getPasswordNonNull(credential))));
+        } else {
+            document.put("pwd", new BsonString(createAuthenticationHash(getUserNameNonNull(credential), getPasswordNonNull(credential))));
+        }
+        document.put("digestPassword", BsonBoolean.valueOf(serverDigestPassword));
+        document.put("roles", new BsonArray(Collections.<BsonValue>singletonList(new BsonString(getRoleName(credential, readOnly)))));
         return document;
     }
 

driver-core/src/test/functional/com/mongodb/operation/DropUserOperationSpecification.groovy

@@ -22,26 +22,48 @@ import com.mongodb.OperationFunctionalSpecification
 import com.mongodb.WriteConcern
 import spock.lang.IgnoreIf
 
-import static com.mongodb.ClusterFixture.executeAsync
 import static com.mongodb.ClusterFixture.getBinding
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
 import static com.mongodb.ClusterFixture.serverVersionAtLeast
 import static com.mongodb.MongoCredential.createMongoCRCredential
+import static com.mongodb.MongoCredential.createScramSha1Credential
+import static com.mongodb.MongoCredential.createScramSha256Credential
+
 
-@IgnoreIf({ serverVersionAtLeast(3, 7) })
 class DropUserOperationSpecification extends OperationFunctionalSpecification {
 
+    @IgnoreIf({ !serverVersionAtLeast(3, 0) })
     def 'should delete user without error'() {
         given:
-        def credential = createMongoCRCredential('userToDrop', databaseName, '123'.toCharArray())
+        def credential = createScramSha1Credential('userToDrop', databaseName, '123'.toCharArray())
         new CreateUserOperation(credential, true).execute(getBinding())
+        DropUserOperation operation = new DropUserOperation(databaseName, credential.userName)
 
         when:
+        execute(operation, async)
+
+        then:
+        notThrown(MongoException)
+
+        where:
+        async << [true, false]
+    }
+
+    @IgnoreIf({ !serverVersionAtLeast(3, 7) })
+    def 'should delete user without error SHA_256'() {
+        given:
+        def credential = createScramSha256Credential('userToDrop', databaseName, '123'.toCharArray())
+        new CreateUserOperation(credential, true).execute(getBinding())
         DropUserOperation operation = new DropUserOperation(databaseName, credential.userName)
-        operation.execute(getBinding())
+
+        when:
+        execute(operation, async)
 
         then:
         notThrown(MongoException)
+
+        where:
+        async << [true, false]
     }
 
     @IgnoreIf({ !serverVersionAtLeast(3, 4) || !isDiscoverableReplicaSet() })
@@ -52,7 +74,7 @@ class DropUserOperationSpecification extends OperationFunctionalSpecification {
         def operation = new DropUserOperation(databaseName, credential.userName, new WriteConcern(5))
 
         when:
-        async ? executeAsync(operation) : operation.execute(getBinding())
+        execute(operation, async)
 
         then:
         def ex = thrown(MongoWriteConcernException)