This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.5-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.5-prepare by this push:
new 3eeff662bc Fix Bug [Athena Datasource] datasource other params illegal
(#13032)
3eeff662bc is described below
commit 3eeff662bccd6fd8efcefe27b39a70aaba2f861d
Author: Jrebel-i <[email protected]>
AuthorDate: Thu Mar 30 16:15:29 2023 +0800
Fix Bug [Athena Datasource] datasource other params illegal (#13032)
---
.../plugin/datasource/api/datasource/AbstractDataSourceProcessor.java | 2 +-
.../datasource/api/datasource/AbstractDataSourceProcessorTest.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
index fa42dafa85..4e1c26691a 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessor.java
@@ -39,7 +39,7 @@ public abstract class AbstractDataSourceProcessor implements
DataSourceProcessor
private static final Pattern DATABASE_PATTER =
Pattern.compile("^[a-zA-Z0-9\\_\\-\\.]+$");
- private static final Pattern PARAMS_PATTER =
Pattern.compile("^[a-zA-Z0-9\\-\\_\\/\\@\\.]+$");
+ private static final Pattern PARAMS_PATTER =
Pattern.compile("^[a-zA-Z0-9\\-\\_\\/\\@\\.\\:]+$");
private static final Set<String> POSSIBLE_MALICIOUS_KEYS =
Sets.newHashSet("allowLoadLocalInfile");
diff --git
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessorTest.java
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessorTest.java
index ad144cdf08..5eba42b451 100644
---
a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessorTest.java
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessorTest.java
@@ -49,6 +49,7 @@ public class AbstractDataSourceProcessorTest {
AbstractDataSourceProcessor mockDataSourceProcessor =
mock(AbstractDataSourceProcessor.class);
Map<String, String> other = new HashMap<>();
other.put("allowLoadLocalInfile", "whatever");
+ other.put("OutputLocation", "s3://test-data-xini/athena-query");
doThrow(new
IllegalArgumentException()).when(mockDataSourceProcessor).checkOther(other);
}
}