Porting the fix for OPENDJ-1294 to dj3-dev branch. Add code to read passwor...

Ludovic Poitou

28.40.2014 6f2d3248ee1f778e4b66dbfa621ec1c9123b8401

Porting the fix for OPENDJ-1294 to dj3-dev branch. Add code to read password from stdin when detecting option '-w -'

 opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java

@@ -48,6 +48,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.PasswordReader;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
import org.opends.server.util.args.BooleanArgument;
@@ -151,7 +152,7 @@
    BooleanArgument   useSSL;
    BooleanArgument   useStartTLS;
    FileBasedArgument bindPWFile;
    StringArgument    certNickname           = null;
    StringArgument    certNickname;
    FileBasedArgument currentPWFile;
    FileBasedArgument newPWFile;
    FileBasedArgument sslKeyStorePINFile;
@@ -644,6 +645,30 @@
    {
      dn = bindDN.getValue();
      pw = bindPW.getValue();
      if(pw != null && pw.equals("-"))
      {
        // read the password from the stdin.
        try
        {
          out.print(INFO_LDAPAUTH_PASSWORD_PROMPT.get(dn));
          char[] pwChars = PasswordReader.readPassword();
          //As per rfc 4513(section-5.1.2) a client should avoid sending
          //an empty password to the server.
          while(pwChars.length==0)
          {
            err.println(wrapText(
                INFO_LDAPAUTH_NON_EMPTY_PASSWORD.get(),
                MAX_LINE_WIDTH));
            out.print(INFO_LDAPAUTH_PASSWORD_PROMPT.get(dn));
            pwChars = PasswordReader.readPassword();
          }
          pw = new String(pwChars);
        } catch(Exception ex)
        {
          err.println(wrapText(ex.getMessage(), MAX_LINE_WIDTH));
          return CLIENT_SIDE_PARAM_ERROR;
        }
      }
    }
    else if (bindPWFile.isPresent())
    {