src/java.management/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java

*** 1,7 ****
  /*
!  * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 32,43 ****
  import java.security.PrivilegedActionException;
  import java.security.PrivilegedExceptionAction;
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.Map;
- import java.util.Properties;
- import javax.management.remote.JMXPrincipal;
  import javax.management.remote.JMXAuthenticator;
  import javax.security.auth.AuthPermission;
  import javax.security.auth.Subject;
  import javax.security.auth.callback.*;
  import javax.security.auth.login.AppConfigurationEntry;
--- 32,41 ----
*** 89,102 ****
--- 87,102 ----
       */
      public JMXPluggableAuthenticator(Map<?, ?> env) {
  
          String loginConfigName = null;
          String passwordFile = null;
+         String hashPasswords = null;
  
          if (env != null) {
              loginConfigName = (String) env.get(LOGIN_CONFIG_PROP);
              passwordFile = (String) env.get(PASSWORD_FILE_PROP);
+             hashPasswords = (String) env.get(HASH_PASSWORDS);
          }
  
          try {
  
              if (loginConfigName != null) {
*** 112,130 ****
                              new AuthPermission("createLoginContext." +
                                                 LOGIN_CONFIG_NAME));
                  }
  
                  final String pf = passwordFile;
                  try {
                      loginContext = AccessController.doPrivileged(
                          new PrivilegedExceptionAction<LoginContext>() {
                              public LoginContext run() throws LoginException {
                                  return new LoginContext(
                                                  LOGIN_CONFIG_NAME,
                                                  null,
                                                  new JMXCallbackHandler(),
!                                                 new FileLoginConfig(pf));
                              }
                          });
                  } catch (PrivilegedActionException pae) {
                      throw (LoginException) pae.getException();
                  }
--- 112,131 ----
                              new AuthPermission("createLoginContext." +
                                                 LOGIN_CONFIG_NAME));
                  }
  
                  final String pf = passwordFile;
+                 final String hashPass = hashPasswords;
                  try {
                      loginContext = AccessController.doPrivileged(
                          new PrivilegedExceptionAction<LoginContext>() {
                              public LoginContext run() throws LoginException {
                                  return new LoginContext(
                                                  LOGIN_CONFIG_NAME,
                                                  null,
                                                  new JMXCallbackHandler(),
!                                                 new FileLoginConfig(pf, hashPass));
                              }
                          });
                  } catch (PrivilegedActionException pae) {
                      throw (LoginException) pae.getException();
                  }
*** 248,257 ****
--- 249,260 ----
      private static final String LOGIN_CONFIG_PROP =
          "jmx.remote.x.login.config";
      private static final String LOGIN_CONFIG_NAME = "JMXPluggableAuthenticator";
      private static final String PASSWORD_FILE_PROP =
          "jmx.remote.x.password.file";
+     private static final String HASH_PASSWORDS =
+         "jmx.remote.x.password.hashpasswords";
      private static final ClassLogger logger =
          new ClassLogger("javax.management.remote.misc", LOGIN_CONFIG_NAME);
  
  /**
   * This callback handler supplies the username and password (which was
*** 301,323 ****
      private static final String FILE_LOGIN_MODULE =
          FileLoginModule.class.getName();
  
      // The option that identifies the password file to use
      private static final String PASSWORD_FILE_OPTION = "passwordFile";
  
      /**
       * Creates an instance of <code>FileLoginConfig</code>
       *
       * @param passwordFile A filepath that identifies the password file to use.
       *                     If null then the default password file is used.
       */
!     public FileLoginConfig(String passwordFile) {
  
          Map<String, String> options;
          if (passwordFile != null) {
              options = new HashMap<String, String>(1);
              options.put(PASSWORD_FILE_OPTION, passwordFile);
          } else {
              options = Collections.emptyMap();
          }
  
          entries = new AppConfigurationEntry[] {
--- 304,329 ----
      private static final String FILE_LOGIN_MODULE =
          FileLoginModule.class.getName();
  
      // The option that identifies the password file to use
      private static final String PASSWORD_FILE_OPTION = "passwordFile";
+     private static final String HASH_PASSWORDS = "hashPasswords";
  
      /**
       * Creates an instance of <code>FileLoginConfig</code>
       *
       * @param passwordFile A filepath that identifies the password file to use.
       *                     If null then the default password file is used.
+      * @param hashPasswords Flag to indicate if password file needs to be hashed
       */
!     public FileLoginConfig(String passwordFile, String hashPasswords) {
  
          Map<String, String> options;
          if (passwordFile != null) {
              options = new HashMap<String, String>(1);
              options.put(PASSWORD_FILE_OPTION, passwordFile);
+             options.put(HASH_PASSWORDS, hashPasswords);
          } else {
              options = Collections.emptyMap();
          }
  
          entries = new AppConfigurationEntry[] {