This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2a14060 fix jdbc connect parameters can not input '@' and '.'
character (#8293)
2a14060 is described below
commit 2a1406073a73b349f63396567919f81a802785d8
Author: zhuxt2015 <[email protected]>
AuthorDate: Fri Feb 18 21:58:43 2022 +0800
fix jdbc connect parameters can not input '@' and '.' character (#8293)
* fix jdbc connect parameters can not input '@' and '.' character
This closes #8135
* add AbstractDataSourceProcessor class unit test
* add license header
* remove class comment
* optimize unit tests
* modify the variable name
Co-authored-by: 朱学通 <[email protected]>
---
.../datasource/AbstractDataSourceProcessor.java | 2 +-
.../AbstractDataSourceProcessorTest.java | 44 ++++++++++++++++++++++
2 files changed, 45 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 707fd67..d517edf 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
@@ -35,7 +35,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\\-\\_\\/\\@\\.]+$");
@Override
public void checkDatasourceParam(BaseDataSourceParamDTO
baseDataSourceParamDTO) {
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
new file mode 100644
index 0000000..fc4f675
--- /dev/null
+++
b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/AbstractDataSourceProcessorTest.java
@@ -0,0 +1,44 @@
+/*
+ * 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.dolphinscheduler.plugin.datasource.api.datasource;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.Mockito.*;
+
+public class AbstractDataSourceProcessorTest {
+
+ @Test
+ public void checkOtherTest() {
+ AbstractDataSourceProcessor mockDataSourceProcessor =
mock(AbstractDataSourceProcessor.class);
+ Map<String, String> other = new HashMap<>();
+ other.put("principal", "hadoop/[email protected]");
+ doNothing().when(mockDataSourceProcessor).checkOther(other);
+ }
+
+ @Test
+ public void checkOtherExceptionTest() {
+ AbstractDataSourceProcessor mockDataSourceProcessor =
mock(AbstractDataSourceProcessor.class);
+ Map<String, String> other = new HashMap<>();
+ other.put("arg0", "%");
+ doThrow(new
IllegalArgumentException()).when(mockDataSourceProcessor).checkOther(other);
+ }
+}
\ No newline at end of file
