You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/05/05 11:34:21 UTC
[incubator-linkis] branch dev-1.1.2 updated (56c5be47c -> 0f5027387)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a change to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from 56c5be47c Flexible custom Flink configuration and resources to Flink Engine (#2074)
new 38da9caa0 Add null judgment to the log
new 1d2e81356 add gateway url to request headers
new e03a1933a Add ec type judgment
new be397a29c add gateway url to request headers
new 0f5027387 Format java code with spotless
The 5 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.
Summary of changes:
.../linkis/cs/client/service/CSTableService.java | 35 +++++++-------
.../cs/client/service/CSVariableService.java | 11 +++--
.../client/service/LinkisJobDataServiceImpl.java | 11 +++--
.../service/impl/ConfigKeyServiceImpl.java | 13 ++++-
.../gateway/config/GatewayConfiguration.scala | 3 ++
.../linkis/gateway/security/SecurityFilter.scala | 18 ++++---
.../SpringCloudGatewayConfiguration.scala | 17 +++++--
.../http/LinkisGatewayHttpHeadersFilter.scala | 56 ++++++++++++++++++++++
8 files changed, 122 insertions(+), 42 deletions(-)
create mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/LinkisGatewayHttpHeadersFilter.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 04/05: add gateway url to request headers
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit be397a29cb4d0b17379e71307f474850999b31be
Author: peacewong <wp...@gmail.com>
AuthorDate: Thu May 5 16:21:07 2022 +0800
add gateway url to request headers
---
.../linkis/gateway/security/SecurityFilter.scala | 18 +++++++--------
.../SpringCloudGatewayConfiguration.scala | 17 ++++++++++----
.../http/LinkisGatewayHttpHeadersFilter.scala} | 27 ++++++++++++++++------
3 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
index d7f932356..f2cc89c58 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
@@ -17,26 +17,25 @@
package org.apache.linkis.gateway.security
-import java.io.File
-import java.text.DateFormat
-import java.util
-import java.util.concurrent.TimeUnit
-import java.util.{Date, Locale}
+import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang.exception.ExceptionUtils
import org.apache.linkis.common.conf.Configuration
import org.apache.linkis.common.exception.LinkisException
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.gateway.config.GatewayConfiguration
import org.apache.linkis.gateway.config.GatewayConfiguration._
-import org.apache.linkis.gateway.http.{GatewayContext, GatewayHttpUtils}
+import org.apache.linkis.gateway.http.GatewayContext
import org.apache.linkis.gateway.security.sso.SSOInterceptor
import org.apache.linkis.gateway.security.token.TokenAuthentication
import org.apache.linkis.server.conf.ServerConfiguration
import org.apache.linkis.server.exception.{LoginExpireException, NonLoginException}
import org.apache.linkis.server.{Message, validateFailed}
-import org.apache.commons.lang.StringUtils
-import org.apache.commons.lang.exception.ExceptionUtils
-import java.util.regex.Pattern
+import java.io.File
+import java.text.DateFormat
+import java.util
+import java.util.concurrent.TimeUnit
+import java.util.{Date, Locale}
object SecurityFilter extends Logging {
@@ -63,7 +62,6 @@ object SecurityFilter extends Logging {
return false
}
}
- GatewayHttpUtils.addGateWayUrlToRequest(gatewayContext)
if (refererValidate) {
//Security certification support, referer limited(安全认证支持，referer限定)
val referer = gatewayContext.getRequest.getHeaders.get("Referer")
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala
index 444cb055b..77f3bffd4 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala
@@ -23,12 +23,13 @@ import org.apache.linkis.common.utils.Logging
import org.apache.linkis.gateway.config.GatewaySpringConfiguration
import org.apache.linkis.gateway.parser.{DefaultGatewayParser, GatewayParser}
import org.apache.linkis.gateway.route.{DefaultGatewayRouter, GatewayRouter}
-import org.apache.linkis.gateway.springcloud.http.GatewayAuthorizationFilter
+import org.apache.linkis.gateway.springcloud.http.{GatewayAuthorizationFilter, LinkisGatewayHttpHeadersFilter}
import org.apache.linkis.gateway.springcloud.websocket.SpringCloudGatewayWebsocketFilter
import org.apache.linkis.rpc.Sender
import org.apache.linkis.server.conf.ServerConfiguration
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.autoconfigure.AutoConfigureAfter
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
import org.springframework.cloud.client
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient
import org.springframework.cloud.gateway.config.{GatewayAutoConfiguration, GatewayProperties}
@@ -82,10 +83,10 @@ class SpringCloudGatewayConfiguration {
}).build()
@Bean
- def createLoadBalancerClient(springClientFactory: SpringClientFactory):RibbonLoadBalancerClient = new RibbonLoadBalancerClient(springClientFactory) {
- override def getServer(serviceId: String): Server = if(isMergeModuleInstance(serviceId)) {
+ def createLoadBalancerClient(springClientFactory: SpringClientFactory): RibbonLoadBalancerClient = new RibbonLoadBalancerClient(springClientFactory) {
+ override def getServer(serviceId: String): Server = if (isMergeModuleInstance(serviceId)) {
val serviceInstance = getServiceInstance(serviceId)
- info("redirect to " + serviceInstance) //TODO test,wait for delete
+ info("redirect to " + serviceInstance)
val lb = this.getLoadBalancer(serviceInstance.getApplicationName)
lb.getAllServers.find(_.getHostPort == serviceInstance.getInstance).get
} else super.getServer(serviceId)
@@ -102,7 +103,7 @@ class SpringCloudGatewayConfiguration {
serverIntrospector
}
- override def choose(serviceId: String, hint:Any): client.ServiceInstance = if(isMergeModuleInstance(serviceId)) {
+ override def choose(serviceId: String, hint: Any): client.ServiceInstance = if (isMergeModuleInstance(serviceId)) {
val serviceInstance = getServiceInstance(serviceId)
info("redirect to " + serviceInstance)
val lb = this.getLoadBalancer(serviceInstance.getApplicationName)
@@ -111,6 +112,12 @@ class SpringCloudGatewayConfiguration {
} else super.choose(serviceId, hint)
}
+ @Bean
+ @ConditionalOnProperty(name = Array("spring.cloud.gateway.url.enabled"), matchIfMissing = true)
+ def linkisGatewayHttpHeadersFilter(): LinkisGatewayHttpHeadersFilter = {
+ new LinkisGatewayHttpHeadersFilter()
+ }
+
}
object SpringCloudGatewayConfiguration extends Logging {
private val MERGE_MODULE_INSTANCE_HEADER = "merge-gw-"
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/http/GatewayHttpUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/LinkisGatewayHttpHeadersFilter.scala
similarity index 60%
rename from linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/http/GatewayHttpUtils.scala
rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/LinkisGatewayHttpHeadersFilter.scala
index 9951ad1da..dfb0e9671 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/http/GatewayHttpUtils.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/LinkisGatewayHttpHeadersFilter.scala
@@ -15,29 +15,42 @@
* limitations under the License.
*/
-package org.apache.linkis.gateway.http
+package org.apache.linkis.gateway.springcloud.http
import org.apache.commons.lang3.StringUtils
import org.apache.linkis.gateway.config.GatewayConfiguration.{THIS_GATEWAY_SCHEMA, THIS_GATEWAY_URL}
import org.apache.linkis.rpc.Sender
+import org.springframework.cloud.gateway.filter.headers.HttpHeadersFilter
+import org.springframework.core.Ordered
+import org.springframework.http.HttpHeaders
+import org.springframework.http.server.reactive.ServerHttpRequest
+import org.springframework.web.server.ServerWebExchange
-
-object GatewayHttpUtils {
+class LinkisGatewayHttpHeadersFilter extends HttpHeadersFilter with Ordered{
private val GATEWAY_URL = "GATEWAY_URL"
- def addGateWayUrlToRequest(gatewayContext: GatewayContext): Unit = {
+ override def filter(input: HttpHeaders, exchange: ServerWebExchange): HttpHeaders = {
+ val request: ServerHttpRequest = exchange.getRequest
+ val updated: HttpHeaders = new HttpHeaders
+ val iterator = input.entrySet().iterator()
+ while (iterator.hasNext) {
+ val next = iterator.next()
+ updated.addAll(next.getKey, next.getValue)
+ }
val gatewWayURL = if (StringUtils.isNotBlank(THIS_GATEWAY_URL.getValue)) {
THIS_GATEWAY_URL.getValue
} else {
val schema = if (StringUtils.isNotBlank(THIS_GATEWAY_SCHEMA.getValue)) {
THIS_GATEWAY_SCHEMA.getValue
} else {
- gatewayContext.getRequest.getURI.getScheme
+ request.getURI.getScheme
}
s"$schema://${Sender.getThisInstance}"
}
- val array = Array(gatewWayURL)
- gatewayContext.getRequest.addHeader(GATEWAY_URL, array)
+ updated.add(GATEWAY_URL, gatewWayURL)
+ updated
}
+
+ override def getOrder: Int = 1
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/05: Add null judgment to the log
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 38da9caa0a4ee340af7d8dd0e7d4312e6d45dda7
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Apr 29 14:31:20 2022 +0800
Add null judgment to the log
---
.../linkis/cs/client/service/CSTableService.java | 35 ++++++++++++----------
.../cs/client/service/CSVariableService.java | 11 +++----
.../client/service/LinkisJobDataServiceImpl.java | 11 +++----
3 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
index 37e33e2ba..2924ac6d3 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
@@ -68,11 +68,12 @@ public class CSTableService implements TableService {
contextID = ((CombinedNodeIDContextID) contextID).getLinkisHaWorkFlowContextID();
}
CSTable csTable = searchService.getContextValue(contextID, contextKey, CSTable.class);
- logger.info(
- "contextID: {} and contextKey: {} succeed to get table tableName {}",
- contextID.getContextId(),
- contextKey.getKey(),
- csTable.getName());
+ if (null != csTable)
+ logger.info(
+ "contextID: {} and contextKey: {} succeed to get table tableName {}",
+ contextID.getContextId(),
+ contextKey.getKey(),
+ csTable.getName());
return csTable;
}
@@ -95,11 +96,12 @@ public class CSTableService implements TableService {
searchService.searchUpstreamContext(
contextID, nodeName, Integer.MAX_VALUE, CSTable.class);
}
- logger.info(
- "contextID: {} and nodeName: {} succeed to get tables size {}",
- contextID.getContextId(),
- nodeName,
- rsList.size());
+ if (null != rsList)
+ logger.info(
+ "contextID: {} and nodeName: {} succeed to get tables size {}",
+ contextID.getContextId(),
+ nodeName,
+ rsList.size());
return rsList;
} catch (ErrorException e) {
logger.error("Deserialize contextID error. contextIDStr : " + contextIDStr);
@@ -123,12 +125,13 @@ public class CSTableService implements TableService {
((CombinedNodeIDContextID) contextID).getLinkisHaWorkFlowContextID();
}
csTable = searchService.searchContext(contextID, keyword, nodeName, CSTable.class);
- logger.info(
- "contextID: {} , nodeName: {}, keyword {} succeed to getUpstreamSuitableTable tableName {}",
- contextID.getContextId(),
- nodeName,
- keyword,
- csTable.getName());
+ if (null != csTable)
+ logger.info(
+ "contextID: {} , nodeName: {}, keyword {} succeed to getUpstreamSuitableTable tableName {}",
+ contextID.getContextId(),
+ nodeName,
+ keyword,
+ csTable.getName());
}
} catch (ErrorException e) {
throw new CSErrorException(
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
index 2c770c8d0..e63a02ac0 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
@@ -61,11 +61,12 @@ public class CSVariableService implements VariableService {
rsList =
searchService.searchUpstreamContext(
contextID, nodeName, Integer.MAX_VALUE, LinkisVariable.class);
- logger.info(
- "contextID: {} and nodeName: {} succeed to getUpstreamVariables size {}",
- contextID.getContextId(),
- nodeName,
- rsList.size());
+ if (null != rsList)
+ logger.info(
+ "contextID: {} and nodeName: {} succeed to getUpstreamVariables size {}",
+ contextID.getContextId(),
+ nodeName,
+ rsList.size());
}
return rsList;
} catch (Throwable e) {
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
index 59be85867..bca226125 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
@@ -67,11 +67,12 @@ public class LinkisJobDataServiceImpl implements LinkisJobDataService {
ContextKey contextKey = SerializeHelper.deserializeContextKey(contextKeyStr);
LinkisJobData jobData =
searchService.getContextValue(contextID, contextKey, LinkisJobData.class);
- logger.info(
- "contextID: {} and contextKeyStr: {} succeed to getLinkisJobData {}",
- contextID.getContextId(),
- contextKeyStr,
- jobData.getJobID());
+ if (null != jobData)
+ logger.info(
+ "contextID: {} and contextKeyStr: {} succeed to getLinkisJobData {}",
+ contextID.getContextId(),
+ contextKeyStr,
+ jobData.getJobID());
return jobData;
} catch (ErrorException e) {
logger.error(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 03/05: Add ec type judgment
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit e03a1933a646e9ff6b350153239112db15c7f00a
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Apr 29 16:44:11 2022 +0800
Add ec type judgment
---
.../configuration/service/impl/ConfigKeyServiceImpl.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
index 8f3314294..08987373d 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
@@ -30,10 +30,12 @@ import org.apache.linkis.configuration.util.LabelParameterParser;
import org.apache.linkis.manager.label.builder.CombinedLabelBuilder;
import org.apache.linkis.manager.label.entity.CombinedLabel;
import org.apache.linkis.manager.label.entity.Label;
+import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
import org.apache.linkis.manager.label.exception.LabelErrorException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.linkis.manager.label.utils.LabelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -69,7 +71,13 @@ public class ConfigKeyServiceImpl implements ConfigKeyService {
throw new ConfigurationException("config key not exists: " + configKeyValue.getKey());
}
ConfigKey configKey = configKeys.get(0);
-
+ EngineTypeLabel engineTypeLabel = LabelUtil.getEngineTypeLabel(labelList);
+ for (ConfigKey key:configKeys) {
+ if (engineTypeLabel.getEngineType().equalsIgnoreCase(key.getEngineType())) {
+ logger.info("config key:{} will be use engineType {}", key.getKey(),key.getEngineType());
+ configKey = key;
+ }
+ }
CombinedLabel combinedLabel = getCombinedLabel(labelList);
ConfigLabel configLabel =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/05: add gateway url to request headers
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 1d2e81356392e899bbbdb175bbde42ed334992f7
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Apr 29 16:12:17 2022 +0800
add gateway url to request headers
---
.../gateway/config/GatewayConfiguration.scala | 3 ++
.../linkis/gateway/http/GatewayHttpUtils.scala | 43 ++++++++++++++++++++++
.../linkis/gateway/security/SecurityFilter.scala | 6 +--
3 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/config/GatewayConfiguration.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/config/GatewayConfiguration.scala
index fecb4f74b..49b082c29 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/config/GatewayConfiguration.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/config/GatewayConfiguration.scala
@@ -75,4 +75,7 @@ object GatewayConfiguration {
// Use regex to match against URLs, if matched, let them pass anyway(even if not currently logged in), Use "()" and "|" to match against multiple URLs
val GATEWAY_NO_AUTH_URL_REGEX = CommonVars("wds.linkis.gateway.no.auth.url.regex", ".*visualis.*share.*")
+
+ val THIS_GATEWAY_URL = CommonVars("wds.linkis.gateway.this.url", "")
+ val THIS_GATEWAY_SCHEMA = CommonVars("wds.linkis.gateway.this.schema", "")
}
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/http/GatewayHttpUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/http/GatewayHttpUtils.scala
new file mode 100644
index 000000000..9951ad1da
--- /dev/null
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/http/GatewayHttpUtils.scala
@@ -0,0 +1,43 @@
+/*
+ * 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.linkis.gateway.http
+
+import org.apache.commons.lang3.StringUtils
+import org.apache.linkis.gateway.config.GatewayConfiguration.{THIS_GATEWAY_SCHEMA, THIS_GATEWAY_URL}
+import org.apache.linkis.rpc.Sender
+
+
+object GatewayHttpUtils {
+
+ private val GATEWAY_URL = "GATEWAY_URL"
+
+ def addGateWayUrlToRequest(gatewayContext: GatewayContext): Unit = {
+ val gatewWayURL = if (StringUtils.isNotBlank(THIS_GATEWAY_URL.getValue)) {
+ THIS_GATEWAY_URL.getValue
+ } else {
+ val schema = if (StringUtils.isNotBlank(THIS_GATEWAY_SCHEMA.getValue)) {
+ THIS_GATEWAY_SCHEMA.getValue
+ } else {
+ gatewayContext.getRequest.getURI.getScheme
+ }
+ s"$schema://${Sender.getThisInstance}"
+ }
+ val array = Array(gatewWayURL)
+ gatewayContext.getRequest.addHeader(GATEWAY_URL, array)
+ }
+}
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
index d1d120a30..d7f932356 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/SecurityFilter.scala
@@ -22,13 +22,12 @@ import java.text.DateFormat
import java.util
import java.util.concurrent.TimeUnit
import java.util.{Date, Locale}
-
import org.apache.linkis.common.conf.Configuration
import org.apache.linkis.common.exception.LinkisException
import org.apache.linkis.common.utils.{Logging, Utils}
import org.apache.linkis.gateway.config.GatewayConfiguration
import org.apache.linkis.gateway.config.GatewayConfiguration._
-import org.apache.linkis.gateway.http.GatewayContext
+import org.apache.linkis.gateway.http.{GatewayContext, GatewayHttpUtils}
import org.apache.linkis.gateway.security.sso.SSOInterceptor
import org.apache.linkis.gateway.security.token.TokenAuthentication
import org.apache.linkis.server.conf.ServerConfiguration
@@ -36,6 +35,7 @@ import org.apache.linkis.server.exception.{LoginExpireException, NonLoginExcepti
import org.apache.linkis.server.{Message, validateFailed}
import org.apache.commons.lang.StringUtils
import org.apache.commons.lang.exception.ExceptionUtils
+
import java.util.regex.Pattern
object SecurityFilter extends Logging {
@@ -63,7 +63,7 @@ object SecurityFilter extends Logging {
return false
}
}
- gatewayContext.getRequest.getURI.getHost
+ GatewayHttpUtils.addGateWayUrlToRequest(gatewayContext)
if (refererValidate) {
//Security certification support, referer limited(安全认证支持，referer限定)
val referer = gatewayContext.getRequest.getHeaders.get("Referer")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 05/05: Format java code with spotless
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 0f5027387ebb0cf08d8143b19d9dc4f61b03b377
Author: peacewong <wp...@gmail.com>
AuthorDate: Thu May 5 16:48:19 2022 +0800
Format java code with spotless
---
.../linkis/configuration/service/impl/ConfigKeyServiceImpl.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
index 08987373d..b0572b32a 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
@@ -32,10 +32,10 @@ import org.apache.linkis.manager.label.entity.CombinedLabel;
import org.apache.linkis.manager.label.entity.Label;
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel;
import org.apache.linkis.manager.label.exception.LabelErrorException;
+import org.apache.linkis.manager.label.utils.LabelUtil;
import org.apache.commons.lang3.StringUtils;
-import org.apache.linkis.manager.label.utils.LabelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -72,9 +72,12 @@ public class ConfigKeyServiceImpl implements ConfigKeyService {
}
ConfigKey configKey = configKeys.get(0);
EngineTypeLabel engineTypeLabel = LabelUtil.getEngineTypeLabel(labelList);
- for (ConfigKey key:configKeys) {
+ for (ConfigKey key : configKeys) {
if (engineTypeLabel.getEngineType().equalsIgnoreCase(key.getEngineType())) {
- logger.info("config key:{} will be use engineType {}", key.getKey(),key.getEngineType());
+ logger.info(
+ "config key:{} will be use engineType {}",
+ key.getKey(),
+ key.getEngineType());
configKey = key;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org