This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 8ac22a3ba Add system name verification (#3724)
8ac22a3ba is described below
commit 8ac22a3ba6842f2419122413f6579bd63c0e0198
Author: huangKai-2323 <[email protected]>
AuthorDate: Thu Nov 10 16:32:36 2022 +0800
Add system name verification (#3724)
---
.../query/server/restful/MetadataCoreRestful.java | 18 ++++++++++++++++
.../query/server/restful/MetadataQueryRestful.java | 24 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
index c454918bc..3d111bebe 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
@@ -59,6 +59,9 @@ public class MetadataCoreRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if
(!MetadataUtils.nameRegexPattern.matcher(dataSourceId).matches()) {
return Message.error("'dataSourceId' is invalid[数据源错误]");
}
@@ -88,6 +91,9 @@ public class MetadataCoreRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名称错误]");
}
@@ -128,6 +134,9 @@ public class MetadataCoreRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
@@ -178,6 +187,9 @@ public class MetadataCoreRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
@@ -226,6 +238,9 @@ public class MetadataCoreRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
@@ -278,6 +293,9 @@ public class MetadataCoreRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
diff --git
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
index 0699bf346..1789e054d 100644
---
a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
+++
b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
@@ -63,6 +63,12 @@ public class MetadataQueryRestful {
if (StringUtils.isBlank(system)){
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
+ if
(!MetadataUtils.nameRegexPattern.matcher(dataSourceName).matches()) {
+ return Message.error("'dataSourceId' is invalid[数据源错误]");
+ }
Map<String, String> queryParams =
request.getParameterMap().entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey,
entry -> StringUtils.join(entry.getValue(), ",")));
@@ -94,6 +100,9 @@ public class MetadataQueryRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if
(!MetadataUtils.nameRegexPattern.matcher(dataSourceName).matches()) {
return Message.error("'dataSourceId' is invalid[数据源错误]");
}
@@ -128,6 +137,9 @@ public class MetadataQueryRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if
(!MetadataUtils.nameRegexPattern.matcher(dataSourceName).matches()) {
return Message.error("'dataSourceId' is invalid[数据源错误]");
}
@@ -173,6 +185,9 @@ public class MetadataQueryRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
@@ -226,6 +241,9 @@ public class MetadataQueryRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
@@ -280,6 +298,9 @@ public class MetadataQueryRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
@@ -337,6 +358,9 @@ public class MetadataQueryRestful {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+ if (!MetadataUtils.nameRegexPattern.matcher(system).matches()) {
+ return Message.error("'system' is invalid[系统名错误]");
+ }
if (!MetadataUtils.nameRegexPattern.matcher(database).matches()) {
return Message.error("'database' is invalid[数据库名错误]");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
