spiritxishi commented on code in PR #12155:
URL: https://github.com/apache/inlong/pull/12155#discussion_r3550000258
##########
inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/module/ModuleServiceImpl.java:
##########
@@ -82,6 +101,30 @@ public Boolean update(ModuleRequest request, String
operator) {
throw new BusinessException(ErrorCodeEnum.MODULE_NOT_FOUND,
String.format("Module does not exist with id=%s",
request.getId()));
}
+
+ // Incremental whitelist validation (mode-aware): only check command
fields
+ // that actually changed compared to the stored extParams.
+ ModuleCommandValidator.WhitelistMode mode = commandValidator.getMode();
+ if (mode != ModuleCommandValidator.WhitelistMode.OFF) {
+ ModuleDTO oldDto = null;
+ if (moduleConfigEntity.getExtParams() != null) {
+ oldDto =
ModuleDTO.getFromJson(moduleConfigEntity.getExtParams());
+ }
+ String violation = commandValidator.validateChanged(oldDto,
request);
+ if (violation != null) {
+ if (mode == ModuleCommandValidator.WhitelistMode.STRICT) {
+ throw new
BusinessException(ErrorCodeEnum.MODULE_COMMAND_NOT_IN_WHITELIST,
+ String.format(
+
ErrorCodeEnum.MODULE_COMMAND_NOT_IN_WHITELIST.getMessage(),
+ violation));
+ } else {
+ // WARN mode: log only, do not block the update
+ LOGGER.warn("ModuleCommandValidator: non-whitelisted
command in update "
+ + "(mode=WARN, not blocking): moduleId={}, {}",
request.getId(),
+ violation);
+ }
Review Comment:
done
##########
inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/module/ModuleCommandValidator.java:
##########
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.manager.service.module;
+
+import org.apache.inlong.manager.pojo.module.ModuleDTO;
+import org.apache.inlong.manager.pojo.module.ModuleRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Manager-side command whitelist validator. Validates that command names
(argv[0]) in module
+ * commands (start/stop/check/install/uninstall) are in the allowed whitelist.
This catches
+ * misconfiguration at save time rather than waiting until the agent tries to
execute.
+ *
+ * <p>Unlike the agent-side validator, this class does <b>not</b> perform
path-under-root
+ * checks, which are filesystem-dependent and only meaningful at the agent
runtime.
+ *
+ * <p>Whitelist baseline:
+ * <pre>{@code
+ * cd, sh, bash, ps, grep, awk, kill, rm, mkdir, cp, mv, ln,
+ * tar, unzip, chmod, chown, echo, cat, test, [, true, false, java
+ * }</pre>
+ *
+ * <p>Extend via {@code module.command.extraWhitelist} (comma-separated) in
application
+ * properties, e.g.: {@code module.command.extraWhitelist=python3,nohup,curl}
+ */
+@Component
+public class ModuleCommandValidator {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ModuleCommandValidator.class);
+
+ /** Baseline argv[0] whitelist — kept in sync with agent-side
ModuleCommandValidator. */
+ private static final Set<String> BASELINE_WHITELIST = buildImmutableSet(
+ "cd", "sh", "bash", "ps", "grep", "awk", "kill", "rm", "mkdir",
"cp", "mv", "ln",
+ "tar", "unzip", "chmod", "chown", "echo", "cat", "test", "[",
"true", "false", "java");
+
+ /**
+ * Metacharacter substring blacklist — kept in sync with agent-side
+ * {@code ModuleCommandValidator.META_CHAR_BLACKLIST}. These characters
indicate shell
+ * injection attempts (command substitution, chaining, redirection,
escaping). Unlike
+ * path-under-root checks, metacharacter validation is
filesystem-independent and
+ * belongs on both the Manager and Agent side.
+ */
+ private static final String[] META_CHAR_BLACKLIST = new String[]{
+ "`", "$(", "${", "&&", "||", ">>", ">", "<", "\\", "\u0000",
+ /*
+ * glob wildcards — Agent uses ProcessBuilder without shell, so
'*' and '?' are NOT expanded. Passing e.g.
+ * 'rm *.log' as argv[1] would delete a literal file named "*.log"
(or silently no-op), which is far more
+ * dangerous than an explicit error. Reject them here with a clear
hint.
+ */
+ "*", "?"
+ };
+
+ /** Extra whitelist entries from Spring config, comma-separated. */
+ @Value("${module.command.extraWhitelist:}")
+ private String extraWhitelist;
+
+ /** Whitelist enforcement mode: STRICT (block), WARN (log only), OFF
(skip). */
+ @Value("${module.command.whitelistMode:WARN}")
+ private String whitelistModeConfig;
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
