opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-08-28 20:09:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ISSUE #9439] Add escape for win in the method returning broker configuration (#9440)

Browse Source
This commit is contained in:
Crazylychee
2025-06-05 17:09:13 +08:00
committed by GitHub
parent 9d9431dc1c
commit 4f9d292ee5
6 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java
+1
View File
@@ -1065,6 +1065,7 @@ public class AdminBrokerProcessor implements NettyRequestProcessor {
String content = this.brokerController.getConfiguration().getAllConfigsFormatString();
if (content != null && content.length() > 0) {
try {
content = MixAll.adjustConfigForPlatform(content);
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
LOGGER.error("AdminBrokerProcessor#getBrokerConfig: unexpected error, caller={}",
common/src/main/java/org/apache/rocketmq/common/MixAll.java
+9
View File
@@ -557,4 +557,13 @@ public class MixAll {
&& !topic.startsWith(TopicValidator.SYSTEM_TOPIC_PREFIX)
&& !topic.equals(TopicValidator.RMQ_SYS_SCHEDULE_TOPIC);
}
public static String adjustConfigForPlatform(String config) {
if (StringUtils.isNotBlank(config)) {
if (isWindows()) {
config = StringUtils.replace(config, "\\", "\\\\");
}
}
return config;
}
}
common/src/test/java/org/apache/rocketmq/common/MixAllTest.java
+39
View File
@@ -85,4 +85,43 @@ public class MixAllTest {
testLmq = "%LMQ%GID_TEST";
assertThat(MixAll.isLmq(testLmq)).isTrue();
}
@Test
public void testAdjustConfigForPlatform_OnWindows() {
if (MixAll.isWindows()) {
String configWithSingleBackslash = "data\\path\\config\\file.properties";
String adjusted = MixAll.adjustConfigForPlatform(configWithSingleBackslash);
assertThat(adjusted).isEqualTo("data\\\\path\\\\config\\\\file.properties");
String configWithMultipleBackslashes = "C:\\\\RocketMQ\\\\logs\\\\broker.log";
adjusted = MixAll.adjustConfigForPlatform(configWithMultipleBackslashes);
assertThat(adjusted).isEqualTo("C:\\\\\\\\RocketMQ\\\\\\\\logs\\\\\\\\broker.log");
String configWithoutBackslash = "listenPort=10911";
adjusted = MixAll.adjustConfigForPlatform(configWithoutBackslash);
assertThat(adjusted).isEqualTo("listenPort=10911");
String emptyConfig = "";
adjusted = MixAll.adjustConfigForPlatform(emptyConfig);
assertThat(adjusted).isEqualTo("");
adjusted = MixAll.adjustConfigForPlatform(null);
assertThat(adjusted).isNull();
} else {
String configWithSingleBackslash = "/home/rocketmq/conf/broker.conf";
String adjusted = MixAll.adjustConfigForPlatform(configWithSingleBackslash);
assertThat(adjusted).isEqualTo("/home/rocketmq/conf/broker.conf");
String linuxPathWithBackslash = "some\\directory\\file.txt";
adjusted = MixAll.adjustConfigForPlatform(linuxPathWithBackslash);
assertThat(adjusted).isEqualTo("some\\directory\\file.txt");
String emptyConfig = "";
adjusted = MixAll.adjustConfigForPlatform(emptyConfig);
assertThat(adjusted).isEqualTo("");
adjusted = MixAll.adjustConfigForPlatform(null);
assertThat(adjusted).isNull();
}
}
}
container/src/main/java/org/apache/rocketmq/container/BrokerContainerProcessor.java
+1
View File
@@ -291,6 +291,7 @@ public class BrokerContainerProcessor implements NettyRequestProcessor {
String content = this.brokerContainer.getConfiguration().getAllConfigsFormatString();
if (content != null && content.length() > 0) {
try {
content = MixAll.adjustConfigForPlatform(content);
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
LOGGER.error("", e);
controller/src/main/java/org/apache/rocketmq/controller/processor/ControllerRequestProcessor.java
+1
View File
@@ -311,6 +311,7 @@ public class ControllerRequestProcessor implements NettyRequestProcessor {
String content = this.controllerManager.getConfiguration().getAllConfigsFormatString();
if (content != null && content.length() > 0) {
try {
content = MixAll.adjustConfigForPlatform(content);
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
log.error("getConfig error, ", e);
namesrv/src/main/java/org/apache/rocketmq/namesrv/processor/DefaultRequestProcessor.java
+1
View File
@@ -658,6 +658,7 @@ public class DefaultRequestProcessor implements NettyRequestProcessor {
String content = this.namesrvController.getConfiguration().getAllConfigsFormatString();
if (StringUtils.isNotBlank(content)) {
try {
content = MixAll.adjustConfigForPlatform(content);
response.setBody(content.getBytes(MixAll.DEFAULT_CHARSET));
} catch (UnsupportedEncodingException e) {
log.error("getConfig error, ", e);