You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by we...@apache.org on 2024/05/31 10:06:58 UTC
(dolphinscheduler) branch revert-15824-dev created (now 857a8a667f)
This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a change to branch revert-15824-dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
at 857a8a667f Revert "[Improvement] Abnormal characters check (#15824)"
This branch includes the following new commits:
new 857a8a667f Revert "[Improvement] Abnormal characters check (#15824)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(dolphinscheduler) 01/01: Revert "[Improvement] Abnormal characters check (#15824)"
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch revert-15824-dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 857a8a667f4f0b14c71b7af4c83cd0ea60423e61
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Fri May 31 18:06:53 2024 +0800
Revert "[Improvement] Abnormal characters check (#15824)"
This reverts commit e5e77492518a198877171801c1cf484b86f852e3.
---
.../api/service/impl/ResourcesServiceImpl.java | 5 -----
.../dolphinscheduler/api/utils/CheckUtils.java | 10 ----------
.../dolphinscheduler/api/utils/CheckUtilsTest.java | 20 --------------------
.../dolphinscheduler/common/constants/Constants.java | 5 -----
4 files changed, 40 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
index 1c039cdfbd..6a15da17a8 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
@@ -17,7 +17,6 @@
package org.apache.dolphinscheduler.api.service.impl;
-import static org.apache.dolphinscheduler.api.utils.CheckUtils.checkFilePath;
import static org.apache.dolphinscheduler.common.constants.Constants.ALIAS;
import static org.apache.dolphinscheduler.common.constants.Constants.CONTENT;
import static org.apache.dolphinscheduler.common.constants.Constants.EMPTY_STRING;
@@ -1291,10 +1290,6 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
if (FOLDER_SEPARATOR.equalsIgnoreCase(fullName)) {
return;
}
- // abnormal characters check
- if (!checkFilePath(fullName)) {
- throw new ServiceException(Status.ILLEGAL_RESOURCE_PATH);
- }
// Avoid returning to the parent directory
if (fullName.contains("../")) {
throw new ServiceException(Status.ILLEGAL_RESOURCE_PATH, fullName);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
index b394d4956c..8b166a16dd 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
@@ -158,14 +158,4 @@ public class CheckUtils {
return pattern.matcher(str).matches();
}
-
- /**
- * regex FilePath check,only use a to z, A to Z, 0 to 9, and _./-
- *
- * @param str input string
- * @return true if regex pattern is right, otherwise return false
- */
- public static boolean checkFilePath(String str) {
- return regexChecks(str, Constants.REGEX_FILE_PATH);
- }
}
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java
index da5ea88c83..bca8a69a16 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/CheckUtilsTest.java
@@ -92,24 +92,4 @@ public class CheckUtilsTest {
Assertions.assertTrue(CheckUtils.checkPhone("17362537263"));
}
- /**
- * check file path
- */
- @Test
- public void testCheckFilePath() {
- // true
- Assertions.assertTrue(CheckUtils.checkFilePath("/"));
- Assertions.assertTrue(CheckUtils.checkFilePath("xx/"));
- Assertions.assertTrue(CheckUtils.checkFilePath("/xx"));
- Assertions.assertTrue(CheckUtils.checkFilePath("14567134578654"));
- Assertions.assertTrue(CheckUtils.checkFilePath("/admin/root/"));
- Assertions.assertTrue(CheckUtils.checkFilePath("/admin/root/1531531..13513/153135.."));
- // false
- Assertions.assertFalse(CheckUtils.checkFilePath(null));
- Assertions.assertFalse(CheckUtils.checkFilePath("file://xxx/ss"));
- Assertions.assertFalse(CheckUtils.checkFilePath("/xxx/ss;/dasd/123"));
- Assertions.assertFalse(CheckUtils.checkFilePath("/xxx/ss && /dasd/123"));
- Assertions.assertFalse(CheckUtils.checkFilePath("/xxx/ss || /dasd/123"));
- }
-
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/Constants.java
index 0f12f11d00..5ec2a2b181 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/Constants.java
@@ -249,11 +249,6 @@ public final class Constants {
*/
public static final Pattern REGEX_USER_NAME = Pattern.compile("^[a-zA-Z0-9._-]{3,39}$");
- /**
- * file path regex
- */
- public static final Pattern REGEX_FILE_PATH = Pattern.compile("^[a-zA-Z0-9_./-]+$");
-
/**
* read permission
*/