diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java index 56621721..a5dda181 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/authn/support/basic/BasicEntryPoint.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; import org.maxkey.authn.LoginCredential; import org.maxkey.authn.provider.AbstractAuthenticationProvider; import org.maxkey.constants.ConstsLoginType; -import org.maxkey.util.AuthorizationHeaderCredential; +import org.maxkey.util.AuthorizationHeader; import org.maxkey.util.AuthorizationHeaderUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,7 +96,7 @@ public class BasicEntryPoint implements AsyncHandlerInterceptor { return false; } - AuthorizationHeaderCredential headerCredential = null; + AuthorizationHeader headerCredential = null; if(AuthorizationHeaderUtils.isBasic(basicCredential)){ headerCredential=AuthorizationHeaderUtils.resolve(basicCredential); diff --git a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderCredential.java b/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeader.java similarity index 92% rename from maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderCredential.java rename to maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeader.java index a60b8e4d..951b85a4 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderCredential.java +++ b/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeader.java @@ -16,7 +16,7 @@ package org.maxkey.util; -public class AuthorizationHeaderCredential { +public class AuthorizationHeader { public static class Credential { @@ -30,13 +30,13 @@ public class AuthorizationHeaderCredential { String credential; String authorization; - public AuthorizationHeaderCredential(String bearer) { + public AuthorizationHeader(String bearer) { super(); this.credential = bearer; this.credentialType = Credential.BEARER; } - public AuthorizationHeaderCredential(String username, String credential) { + public AuthorizationHeader(String username, String credential) { super(); this.username = username; this.credential = credential; diff --git a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderUtils.java b/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderUtils.java index a2510a87..bc51d765 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderUtils.java +++ b/maxkey-common/src/main/java/org/maxkey/util/AuthorizationHeaderUtils.java @@ -39,25 +39,25 @@ public class AuthorizationHeaderUtils { public static String createBasic(String username, String password) { String authUserPass = username + ":" + password; String encodedAuthUserPass = Base64Utils.encode(authUserPass); - return AuthorizationHeaderCredential.Credential.BASIC + encodedAuthUserPass; + return AuthorizationHeader.Credential.BASIC + encodedAuthUserPass; } public static String createBearer(String bearer) { - return AuthorizationHeaderCredential.Credential.BEARER + bearer; + return AuthorizationHeader.Credential.BEARER + bearer; } - public static AuthorizationHeaderCredential resolve(HttpServletRequest request) { + public static AuthorizationHeader resolve(HttpServletRequest request) { String authorization = resolveBearer(request); return resolve(authorization); } - public static AuthorizationHeaderCredential resolve(String authorization) { + public static AuthorizationHeader resolve(String authorization) { if (StringUtils.isNotBlank(authorization) && isBasic(authorization)) { String decodeUserPass = Base64Utils.decode(authorization.split(" ")[1]); String []userPass =decodeUserPass.split(":"); - return new AuthorizationHeaderCredential(userPass[0],userPass[1]); + return new AuthorizationHeader(userPass[0],userPass[1]); } else { - return new AuthorizationHeaderCredential(resolveBearer(authorization)); + return new AuthorizationHeader(resolveBearer(authorization)); } } @@ -72,7 +72,7 @@ public class AuthorizationHeaderUtils { } public static boolean isBasic(String basic) { - if (basic.startsWith(AuthorizationHeaderCredential.Credential.BASIC)) { + if (basic.startsWith(AuthorizationHeader.Credential.BASIC)) { return true; } else { return false; @@ -88,7 +88,7 @@ public class AuthorizationHeaderUtils { } static boolean isBearer(String bearer) { - if (bearer.toLowerCase().startsWith(AuthorizationHeaderCredential.Credential.BEARER.toLowerCase())) { + if (bearer.toLowerCase().startsWith(AuthorizationHeader.Credential.BEARER.toLowerCase())) { return true; } else { return false; diff --git a/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java b/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java index d668ea1c..c34c0a0f 100644 --- a/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java +++ b/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java @@ -18,7 +18,7 @@ package org.maxkey.rest; import org.junit.Test; -import org.maxkey.util.AuthorizationHeaderCredential; +import org.maxkey.util.AuthorizationHeader; import org.maxkey.util.AuthorizationHeaderUtils; public class AuthorizationHeaderTest { @@ -32,7 +32,7 @@ public class AuthorizationHeaderTest { String ahc_basic ="Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=="; System.out.println(AuthorizationHeaderUtils.resolve(ahc_basic)); - AuthorizationHeaderCredential ahc =new AuthorizationHeaderCredential("Aladdin"); + AuthorizationHeader ahc =new AuthorizationHeader("Aladdin"); System.out.println(ahc.transform()); System.out.println(AuthorizationHeaderUtils.resolve(ahc.transform())); diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java index f9f687be..15dcfe24 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java @@ -27,7 +27,7 @@ import org.maxkey.authz.oauth2.common.exceptions.OAuth2Exception; import org.maxkey.authz.oauth2.provider.ClientDetailsService; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.util.AuthorizationHeaderCredential; +import org.maxkey.util.AuthorizationHeader; import org.maxkey.util.JsonUtils; import org.maxkey.util.RequestTokenUtils; import org.maxkey.web.HttpResponseAdapter; @@ -91,7 +91,7 @@ public class IntrospectEndpoint { httpResponseAdapter.write(response,JsonUtils.gsonToString(introspection),"json"); } - public boolean clientAuthenticate(AuthorizationHeaderCredential headerCredential) { + public boolean clientAuthenticate(AuthorizationHeader headerCredential) { if(headerCredential != null){ UsernamePasswordAuthenticationToken authenticationToken = null; if(headerCredential.isBasic()) { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java index 4b83814b..39d1aacc 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java @@ -39,7 +39,7 @@ import org.maxkey.authz.oauth2.provider.AuthorizationRequest; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.OAuth2Request; import org.maxkey.authz.oauth2.provider.OAuth2RequestFactory; -import org.maxkey.util.AuthorizationHeaderCredential; +import org.maxkey.util.AuthorizationHeader; import org.maxkey.util.AuthorizationHeaderUtils; import org.maxkey.web.WebContext; import org.slf4j.Logger; @@ -238,7 +238,7 @@ public class TokenEndpointAuthenticationFilter implements Filter { if(clientId == null) { //for header authorization basic String authorization_bearer =request.getHeader("authorization"); - AuthorizationHeaderCredential ahc=AuthorizationHeaderUtils.resolve(authorization_bearer); + AuthorizationHeader ahc=AuthorizationHeaderUtils.resolve(authorization_bearer); clientId =ahc.getUsername(); clientSecret=ahc.getCredential(); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java index 6114eb70..68a52c89 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/interceptor/RestApiPermissionAdapter.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; import org.maxkey.authn.web.AuthorizationUtils; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.token.DefaultTokenServices; -import org.maxkey.util.AuthorizationHeaderCredential; +import org.maxkey.util.AuthorizationHeader; import org.maxkey.util.AuthorizationHeaderUtils; import org.maxkey.util.StringUtils; import org.slf4j.Logger; @@ -62,7 +62,7 @@ public class RestApiPermissionAdapter implements AsyncHandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request,HttpServletResponse response, Object handler) throws Exception { _logger.trace("Rest API Permission Adapter pre handle"); - AuthorizationHeaderCredential headerCredential = AuthorizationHeaderUtils.resolve(request); + AuthorizationHeader headerCredential = AuthorizationHeaderUtils.resolve(request); //判断应用的AppId和Secret if(headerCredential != null){