You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/02/05 12:21:52 UTC

svn commit: r1657536 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java

Author: kwall
Date: Thu Feb  5 11:21:52 2015
New Revision: 1657536

URL: http://svn.apache.org/r1657536
Log:
QPID-6362: [Java Broker] Correctly generate management mode one-time-password (OTP) if none is specified by the user.

Modified:
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1657536&r1=1657535&r2=1657536&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Thu Feb  5 11:21:52 2015
@@ -42,6 +42,7 @@ import org.apache.qpid.common.QpidProper
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.util.StringUtil;
 import org.apache.qpid.util.FileUtils;
 
 /**
@@ -50,6 +51,8 @@ import org.apache.qpid.util.FileUtils;
  */
 public class Main
 {
+    private static final int MANAGEMENT_MODE_PASSWORD_LENGTH = 10;
+
     private static final Option OPTION_HELP = new Option("h", "help", false, "print this message");
 
     private static final Option OPTION_VERSION = new Option("v", "version", false, "print the version information and exit");
@@ -305,10 +308,11 @@ public class Main
                 options.setManagementModeQuiesceVirtualHosts(quiesceVhosts);
 
                 String password = _commandLine.getOptionValue(OPTION_MM_PASSWORD.getOpt());
-                if (password != null)
+                if (password == null)
                 {
-                    options.setManagementModePassword(password);
+                    password = new StringUtil().randomAlphaNumericString(MANAGEMENT_MODE_PASSWORD_LENGTH);
                 }
+                options.setManagementModePassword(password);
             }
             setExceptionHandler();
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org