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/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new b5bc26d21 refactor admin : use BearerToken replace StatelessToken for
#4496 (#4516)
b5bc26d21 is described below
commit b5bc26d219a9f4d1353b6e0a9e40acfcbbec5af5
Author: kaitoShy <[email protected]>
AuthorDate: Thu Mar 30 11:10:04 2023 +0800
refactor admin : use BearerToken replace StatelessToken for #4496 (#4516)
* use BearerToken instead StatelessToken
* for code rules
---
.../admin/shiro/bean/StatelessAuthFilter.java | 3 +-
.../shenyu/admin/shiro/bean/StatelessToken.java | 44 --------------------
.../shenyu/admin/shiro/config/ShiroRealm.java | 4 +-
.../admin/shiro/bean/StatelessTokenTest.java | 48 ----------------------
.../shenyu/admin/shiro/config/ShiroRealmTest.java | 4 +-
5 files changed, 6 insertions(+), 97 deletions(-)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/bean/StatelessAuthFilter.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/bean/StatelessAuthFilter.java
index ed49fe63e..69ce4d1ba 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/bean/StatelessAuthFilter.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/bean/StatelessAuthFilter.java
@@ -23,6 +23,7 @@ import org.apache.shenyu.admin.utils.ShenyuResultMessage;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.exception.CommonErrorCode;
import org.apache.shenyu.common.utils.GsonUtils;
+import org.apache.shiro.authc.BearerToken;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.web.filter.AccessControlFilter;
import org.slf4j.Logger;
@@ -64,7 +65,7 @@ public class StatelessAuthFilter extends AccessControlFilter {
return false;
}
- StatelessToken token = new StatelessToken(tokenValue);
+ BearerToken token = new BearerToken(tokenValue);
Subject subject = getSubject(servletRequest, servletResponse);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/bean/StatelessToken.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/bean/StatelessToken.java
deleted file mode 100644
index d86a55425..000000000
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/bean/StatelessToken.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.shenyu.admin.shiro.bean;
-
-import org.apache.shiro.authc.AuthenticationToken;
-
-/**
- * custom Stateless AuthenticationToken.
- */
-public class StatelessToken implements AuthenticationToken {
-
- private static final long serialVersionUID = -482325250555312708L;
-
- private final String token;
-
- public StatelessToken(final String token) {
- this.token = token;
- }
-
- @Override
- public Object getPrincipal() {
- return token;
- }
-
- @Override
- public Object getCredentials() {
- return token;
- }
-}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/config/ShiroRealm.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/config/ShiroRealm.java
index 9ce74ff74..d83f03aa7 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/config/ShiroRealm.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/shiro/config/ShiroRealm.java
@@ -23,13 +23,13 @@ import org.apache.shenyu.admin.model.custom.UserInfo;
import org.apache.shenyu.admin.model.vo.DashboardUserVO;
import org.apache.shenyu.admin.service.DashboardUserService;
import org.apache.shenyu.admin.service.PermissionService;
-import org.apache.shenyu.admin.shiro.bean.StatelessToken;
import org.apache.shenyu.admin.utils.JwtUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.BearerToken;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.SimpleAuthorizationInfo;
@@ -59,7 +59,7 @@ public class ShiroRealm extends AuthorizingRealm {
@Override
public boolean supports(final AuthenticationToken token) {
- return token instanceof StatelessToken;
+ return token instanceof BearerToken;
}
@Override
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/shiro/bean/StatelessTokenTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/shiro/bean/StatelessTokenTest.java
deleted file mode 100644
index d17215029..000000000
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/shiro/bean/StatelessTokenTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.shenyu.admin.shiro.bean;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * Test cases for {@link StatelessToken}.
- */
-@ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
-public final class StatelessTokenTest {
-
- private static final String TOKEN = "token";
-
- private final StatelessToken statelessToken = new StatelessToken(TOKEN);
-
- @Test
- public void testGetPrincipal() {
- assertEquals(TOKEN, statelessToken.getPrincipal());
- }
-
- @Test
- public void testGetCredentials() {
- assertEquals(TOKEN, statelessToken.getCredentials());
- }
-}
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/shiro/config/ShiroRealmTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/shiro/config/ShiroRealmTest.java
index 697d7e606..355733ab2 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/shiro/config/ShiroRealmTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/shiro/config/ShiroRealmTest.java
@@ -21,10 +21,10 @@ import org.apache.shenyu.admin.model.custom.UserInfo;
import org.apache.shenyu.admin.model.vo.DashboardUserVO;
import org.apache.shenyu.admin.service.DashboardUserService;
import org.apache.shenyu.admin.service.PermissionService;
-import org.apache.shenyu.admin.shiro.bean.StatelessToken;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.BearerToken;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.subject.PrincipalCollection;
import org.junit.jupiter.api.Test;
@@ -66,7 +66,7 @@ public final class ShiroRealmTest {
@Test
public void testSupports() {
- StatelessToken token = mock(StatelessToken.class);
+ BearerToken token = mock(BearerToken.class);
assertEquals(true, shiroRealm.supports(token));
}
