This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 552672e Add local API authorization (#2975)
552672e is described below
commit 552672efc284301c52d7003ef30e07a89a2b37c2
Author: Zhang Yonglun <[email protected]>
AuthorDate: Sat Mar 5 10:22:36 2022 +0800
Add local API authorization (#2975)
* add local api authorization
* add local api authorization
* add local api authorization
* add local api authorization
* recover ShenyuConfig
* fix integrated test
* for comments
---
.../admin/controller/DashboardUserController.java | 2 +-
.../service/impl/DashboardUserServiceImpl.java | 2 +-
.../admin/mapper/DashboardUserMapperTest.java | 2 +-
.../admin/service/DashboardUserServiceTest.java | 2 +-
.../src/main/resources/application.yml | 3 +
.../apache/shenyu/common/config/ShenyuConfig.java | 75 +++++++++++++++++++++-
.../apache/shenyu/common/constant/Constants.java | 5 ++
.../org/apache/shenyu/common}/utils/ShaUtils.java | 2 +-
.../apache/shenyu/common}/utils/ShaUtilsTest.java | 4 +-
.../src/main/resources/application-local.yml | 3 +
.../src/main/resources/application-local.yml | 4 ++
.../src/main/resources/application-local.yml | 3 +
.../integratedtest/common/helper/HttpHelper.java | 11 ++--
.../src/main/resources/application-local.yml | 3 +
.../src/main/resources/application.yml | 3 +
.../src/main/resources/application.yml | 3 +
.../src/main/resources/application-local.yml | 3 +
.../src/main/resources/application-local.yml | 3 +
.../src/main/resources/application-local.yml | 3 +
.../src/main/resources/application-local.yml | 3 +
.../starter/gateway/ShenyuConfiguration.java | 8 ++-
.../shenyu/web/filter/LocalDispatcherFilter.java | 14 +++-
22 files changed, 145 insertions(+), 16 deletions(-)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
index 324da4b..a733c62 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/DashboardUserController.java
@@ -28,7 +28,7 @@ import org.apache.shenyu.admin.model.result.ShenyuAdminResult;
import org.apache.shenyu.admin.model.vo.DashboardUserEditVO;
import org.apache.shenyu.admin.model.vo.DashboardUserVO;
import org.apache.shenyu.admin.service.DashboardUserService;
-import org.apache.shenyu.admin.utils.ShaUtils;
+import org.apache.shenyu.common.utils.ShaUtils;
import org.apache.shenyu.admin.utils.ShenyuResultMessage;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java
index 88c78a8..518bd4f 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DashboardUserServiceImpl.java
@@ -42,7 +42,7 @@ import org.apache.shenyu.admin.model.vo.RoleVO;
import org.apache.shenyu.admin.service.DashboardUserService;
import org.apache.shenyu.admin.transfer.DashboardUserTransfer;
import org.apache.shenyu.admin.utils.JwtUtils;
-import org.apache.shenyu.admin.utils.ShaUtils;
+import org.apache.shenyu.common.utils.ShaUtils;
import org.apache.shenyu.common.constant.AdminConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
index ed2f6fc..f8492fc 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DashboardUserMapperTest.java
@@ -21,7 +21,7 @@ import org.apache.shenyu.admin.AbstractSpringIntegrationTest;
import org.apache.shenyu.admin.model.entity.DashboardUserDO;
import org.apache.shenyu.admin.model.page.PageParameter;
import org.apache.shenyu.admin.model.query.DashboardUserQuery;
-import org.apache.shenyu.admin.utils.ShaUtils;
+import org.apache.shenyu.common.utils.ShaUtils;
import org.apache.shenyu.common.utils.UUIDUtils;
import org.junit.jupiter.api.Test;
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java
index a11da37..573c467 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DashboardUserServiceTest.java
@@ -34,7 +34,7 @@ import org.apache.shenyu.admin.model.query.DashboardUserQuery;
import org.apache.shenyu.admin.model.vo.DashboardUserVO;
import org.apache.shenyu.admin.model.vo.LoginDashboardUserVO;
import org.apache.shenyu.admin.service.impl.DashboardUserServiceImpl;
-import org.apache.shenyu.admin.utils.ShaUtils;
+import org.apache.shenyu.common.utils.ShaUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
diff --git a/shenyu-bootstrap/src/main/resources/application.yml
b/shenyu-bootstrap/src/main/resources/application.yml
index 6a57d95..8f11ddd 100644
--- a/shenyu-bootstrap/src/main/resources/application.yml
+++ b/shenyu-bootstrap/src/main/resources/application.yml
@@ -191,6 +191,9 @@ shenyu:
printInterval: 60000
ribbon:
serverListRefreshInterval: 10000
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
eureka:
client:
diff --git
a/shenyu-common/src/main/java/org/apache/shenyu/common/config/ShenyuConfig.java
b/shenyu-common/src/main/java/org/apache/shenyu/common/config/ShenyuConfig.java
index 41ba24e..6f9cf13 100644
---
a/shenyu-common/src/main/java/org/apache/shenyu/common/config/ShenyuConfig.java
+++
b/shenyu-common/src/main/java/org/apache/shenyu/common/config/ShenyuConfig.java
@@ -51,7 +51,27 @@ public class ShenyuConfig {
private InstanceConfig instance = new InstanceConfig();
private RibbonConfig ribbon = new RibbonConfig();
-
+
+ private Local local = new Local();
+
+ /**
+ * Gets the local config.
+ *
+ * @return the local config
+ */
+ public Local getLocal() {
+ return local;
+ }
+
+ /**
+ * Sets the local config.
+ *
+ * @param local the local config
+ */
+ public void setLocal(final Local local) {
+ this.local = local;
+ }
+
/**
* Gets ribbon.
*
@@ -1050,4 +1070,57 @@ public class ShenyuConfig {
this.serverListRefreshInterval = serverListRefreshInterval;
}
}
+
+ /**
+ * The local config.
+ */
+ public static class Local {
+
+ private Boolean enabled = true;
+
+ private String sha512Key;
+
+ public Local() {
+ }
+
+ public Local(final String sha512Key) {
+ this.sha512Key = sha512Key;
+ }
+
+ /**
+ * Gets enabled.
+ *
+ * @return the enabled
+ */
+ public Boolean getEnabled() {
+ return enabled;
+ }
+
+ /**
+ * Sets enabled.
+ *
+ * @param enabled the enabled
+ */
+ public void setEnabled(final Boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ /**
+ * Get Sha512Key.
+ *
+ * @return the key
+ */
+ public String getSha512Key() {
+ return sha512Key;
+ }
+
+ /**
+ * Set Sha512Key.
+ *
+ * @param sha512Key sha512Key
+ */
+ public void setSha512Key(final String sha512Key) {
+ this.sha512Key = sha512Key;
+ }
+ }
}
diff --git
a/shenyu-common/src/main/java/org/apache/shenyu/common/constant/Constants.java
b/shenyu-common/src/main/java/org/apache/shenyu/common/constant/Constants.java
index 74a1c0d..a560d9e 100644
---
a/shenyu-common/src/main/java/org/apache/shenyu/common/constant/Constants.java
+++
b/shenyu-common/src/main/java/org/apache/shenyu/common/constant/Constants.java
@@ -331,6 +331,11 @@ public interface Constants {
* jwt handle key for secretKey.
*/
String SECRET_KEY = "secretKey";
+
+ /**
+ * local key.
+ */
+ String LOCAL_KEY = "localKey";
/**
* jwt handle key for filterPath.
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java
b/shenyu-common/src/main/java/org/apache/shenyu/common/utils/ShaUtils.java
similarity index 98%
rename from
shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java
rename to
shenyu-common/src/main/java/org/apache/shenyu/common/utils/ShaUtils.java
index a10eacf..4105f76 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/utils/ShaUtils.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/utils/ShaUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.admin.utils;
+package org.apache.shenyu.common.utils;
import java.security.MessageDigest;
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/ShaUtilsTest.java
similarity index 97%
rename from
shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java
rename to
shenyu-common/src/test/java/org/apache/shenyu/common/utils/ShaUtilsTest.java
index 11f3826..d70fc82 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ShaUtilsTest.java
+++
b/shenyu-common/src/test/java/org/apache/shenyu/common/utils/ShaUtilsTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shenyu.admin.utils;
+package org.apache.shenyu.common.utils;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test cases for ShaUtils.
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/src/main/resources/application-local.yml
index 140a79d..8666f83 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-alibaba-dubbo/src/main/resources/application-local.yml
@@ -45,6 +45,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/src/main/resources/application-local.yml
index 3c3e104..218e1d4 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-apache-dubbo/src/main/resources/application-local.yml
@@ -41,6 +41,10 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
+
logging:
level:
root: info
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-combination/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-combination/src/main/resources/application-local.yml
index ebc493a..218e1d4 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-combination/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-combination/src/main/resources/application-local.yml
@@ -41,6 +41,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-common/src/main/java/org/apache/shenyu/integratedtest/common/helper/HttpHelper.java
b/shenyu-integrated-test/shenyu-integrated-test-common/src/main/java/org/apache/shenyu/integratedtest/common/helper/HttpHelper.java
index 9f9203f..48b4eac 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-common/src/main/java/org/apache/shenyu/integratedtest/common/helper/HttpHelper.java
+++
b/shenyu-integrated-test/shenyu-integrated-test-common/src/main/java/org/apache/shenyu/integratedtest/common/helper/HttpHelper.java
@@ -23,6 +23,7 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
+import org.apache.shenyu.common.constant.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
@@ -57,6 +58,8 @@ public class HttpHelper {
private static final Gson GSON = new Gson();
private final OkHttpClient client = new OkHttpClient.Builder().build();
+
+ private final String localKey = "123456";
/**
* Send a post http request to shenyu gateway.
@@ -157,7 +160,7 @@ public class HttpHelper {
* @throws IOException IO exception
*/
public <S> S postGateway(final String path, final RequestBody requestBody,
final Class<S> respType) throws IOException {
- Request.Builder requestBuilder = new
Request.Builder().post(requestBody).url(GATEWAY_END_POINT + path);
+ Request.Builder requestBuilder = new
Request.Builder().post(requestBody).url(GATEWAY_END_POINT +
path).addHeader(Constants.LOCAL_KEY, localKey);
Response response = client.newCall(requestBuilder.build()).execute();
String respBody = Objects.requireNonNull(response.body()).string();
try {
@@ -168,7 +171,7 @@ public class HttpHelper {
}
private <Q> String post(final String path, final Map<String, Object>
headers, final Q req) throws IOException {
- Request.Builder requestBuilder = new
Request.Builder().post(RequestBody.create(GSON.toJson(req),
JSON)).url(GATEWAY_END_POINT + path);
+ Request.Builder requestBuilder = new
Request.Builder().post(RequestBody.create(GSON.toJson(req),
JSON)).url(GATEWAY_END_POINT + path).addHeader(Constants.LOCAL_KEY, localKey);
if (!CollectionUtils.isEmpty(headers)) {
headers.forEach((key, value) -> requestBuilder.addHeader(key,
String.valueOf(value)));
}
@@ -188,7 +191,7 @@ public class HttpHelper {
* @throws IOException IO exception
*/
public <S, Q> S putGateway(final String path, final Q req, final Class<S>
respType) throws IOException {
- Request request = new
Request.Builder().put(RequestBody.create(GSON.toJson(req),
JSON)).url(GATEWAY_END_POINT + path).build();
+ Request request = new
Request.Builder().put(RequestBody.create(GSON.toJson(req),
JSON)).url(GATEWAY_END_POINT + path).addHeader(Constants.LOCAL_KEY,
localKey).build();
Response response = client.newCall(request).execute();
String respBody = Objects.requireNonNull(response.body()).string();
LOG.info("postGateway({}) resp({})", path, respBody);
@@ -254,7 +257,7 @@ public class HttpHelper {
* @throws IOException IO exception
*/
public Response getHttpService(final String url, final Map<String, Object>
headers) throws IOException {
- Request.Builder requestBuilder = new Request.Builder().url(url);
+ Request.Builder requestBuilder = new
Request.Builder().url(url).addHeader(Constants.LOCAL_KEY, localKey);
if (!CollectionUtils.isEmpty(headers)) {
headers.forEach((key, value) -> requestBuilder.addHeader(key,
String.valueOf(value)));
}
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-grpc/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-grpc/src/main/resources/application-local.yml
index a628cc6..c016339 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-grpc/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-grpc/src/main/resources/application-local.yml
@@ -55,6 +55,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-http/src/main/resources/application.yml
b/shenyu-integrated-test/shenyu-integrated-test-http/src/main/resources/application.yml
index acc3dd9..7f6fae9 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-http/src/main/resources/application.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-http/src/main/resources/application.yml
@@ -62,6 +62,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
#eureka:
# client:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-https/src/main/resources/application.yml
b/shenyu-integrated-test/shenyu-integrated-test-https/src/main/resources/application.yml
index 46207d2..563372e 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-https/src/main/resources/application.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-https/src/main/resources/application.yml
@@ -49,6 +49,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/application-local.yml
index ebc493a..218e1d4 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-motan/src/main/resources/application-local.yml
@@ -41,6 +41,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/resources/application-local.yml
index c35f578..3ad9801 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-sofa/src/main/resources/application-local.yml
@@ -41,6 +41,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/src/main/resources/application-local.yml
index 140a79d..8666f83 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/src/main/resources/application-local.yml
@@ -45,6 +45,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-websocket/src/main/resources/application-local.yml
b/shenyu-integrated-test/shenyu-integrated-test-websocket/src/main/resources/application-local.yml
index c35f578..3ad9801 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-websocket/src/main/resources/application-local.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-websocket/src/main/resources/application-local.yml
@@ -41,6 +41,9 @@ shenyu:
paths:
- /favicon.ico
- /actuator/health
+ local:
+ enabled: true
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
logging:
level:
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfiguration.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfiguration.java
index ac92b16..7c1fd1c 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfiguration.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/gateway/ShenyuConfiguration.java
@@ -152,13 +152,15 @@ public class ShenyuConfiguration {
* Local dispatcher filter web filter.
*
* @param dispatcherHandler the dispatcher handler
+ * @param shenyuConfig the shenyuConfig
+ *
* @return the web filter
*/
@Bean
@Order(-200)
- @ConditionalOnProperty(name = "shenyu.switchConfig.local", havingValue =
"true", matchIfMissing = true)
- public WebFilter localDispatcherFilter(final DispatcherHandler
dispatcherHandler) {
- return new LocalDispatcherFilter(dispatcherHandler);
+ @ConditionalOnProperty(name = "shenyu.local.enable", havingValue =
"false", matchIfMissing = true)
+ public WebFilter localDispatcherFilter(final DispatcherHandler
dispatcherHandler, final ShenyuConfig shenyuConfig) {
+ return new LocalDispatcherFilter(dispatcherHandler,
shenyuConfig.getLocal().getSha512Key());
}
/**
diff --git
a/shenyu-web/src/main/java/org/apache/shenyu/web/filter/LocalDispatcherFilter.java
b/shenyu-web/src/main/java/org/apache/shenyu/web/filter/LocalDispatcherFilter.java
index 5162e24..ca1c0bb 100644
---
a/shenyu-web/src/main/java/org/apache/shenyu/web/filter/LocalDispatcherFilter.java
+++
b/shenyu-web/src/main/java/org/apache/shenyu/web/filter/LocalDispatcherFilter.java
@@ -17,14 +17,19 @@
package org.apache.shenyu.web.filter;
+import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.utils.PathMatchUtils;
+import org.apache.shenyu.common.utils.ShaUtils;
+import org.springframework.http.HttpStatus;
import org.springframework.web.reactive.DispatcherHandler;
+import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebFilterChain;
import reactor.core.publisher.Mono;
import javax.annotation.Nonnull;
+import java.util.Objects;
/**
* The type Local dispatcher filter.
@@ -35,13 +40,16 @@ public class LocalDispatcherFilter implements WebFilter {
private final DispatcherHandler dispatcherHandler;
+ private String sha512Key;
+
/**
* Instantiates a new Local dispatcher filter.
*
* @param dispatcherHandler the dispatcher handler
*/
- public LocalDispatcherFilter(final DispatcherHandler dispatcherHandler) {
+ public LocalDispatcherFilter(final DispatcherHandler dispatcherHandler,
final String sha512Key) {
this.dispatcherHandler = dispatcherHandler;
+ this.sha512Key = sha512Key;
}
/**
@@ -57,6 +65,10 @@ public class LocalDispatcherFilter implements WebFilter {
public Mono<Void> filter(@Nonnull final ServerWebExchange exchange,
@Nonnull final WebFilterChain chain) {
String path = exchange.getRequest().getURI().getPath();
if (PathMatchUtils.match(DISPATCHER_PATH, path)) {
+ String localKey =
exchange.getRequest().getHeaders().getFirst(Constants.LOCAL_KEY);
+ if (Objects.isNull(sha512Key) ||
!sha512Key.equalsIgnoreCase(ShaUtils.shaEncryption(localKey)) ||
Objects.isNull(localKey)) {
+ return Mono.error(new
ResponseStatusException(HttpStatus.FORBIDDEN, "The key is not correct."));
+ }
return dispatcherHandler.handle(exchange);
}
return chain.filter(exchange);
