From a64c6cca562ba57cf0e45004961f19c525ef93e7 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Thu, 5 Feb 2015 11:21:52 +0000 Subject: QPID-6362: [Java Broker] Correctly generate management mode one-time-password (OTP) if none is specified by the user. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657536 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java index 5f32dd3352..85fe7af0fb 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java @@ -42,6 +42,7 @@ import org.apache.qpid.common.QpidProperties; 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(); -- cgit v1.2.1