admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update TokenEndpointAuthenticationFilter.java

Browse Source
This commit is contained in:
MaxKey 2021-03-31 21:58:30 +08:00
parent ab2bab7451
commit 642c02ad62
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java
View File

@ -133,13 +133,37 @@ public class TokenEndpointAuthenticationFilter implements Filter {
final HttpServletRequest request = (HttpServletRequest) req; final HttpServletRequest request = (HttpServletRequest) req;
final HttpServletResponse response = (HttpServletResponse) res; final HttpServletResponse response = (HttpServletResponse) res;
if(logger.isTraceEnabled()) {
logger.trace("getRequestURL : "+request.getRequestURL());
logger.trace("getMethod : "+request.getMethod());
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement();
String value = request.getHeader(key);
logger.trace("Header key "+key +" , value " + value);
}
Enumeration<String> parameterNames = request.getParameterNames();
while (parameterNames.hasMoreElements()) {
String key = (String) parameterNames.nextElement();
String value = request.getParameter(key);
logger.trace("Parameter "+key +" , value " + value);
}
}
try { try {
String grantType = request.getParameter("grant_type"); String grantType = request.getParameter("grant_type");
if (grantType != null && grantType.equals("password")) { if (grantType != null && grantType.equals("password")) {
usernamepassword(request,response); usernamepassword(request,response);
}else { }else {
Authentication authentication=ClientCredentials(request,response); Authentication authentication=ClientCredentials(request,response);
SigninPrincipal auth =new SigninPrincipal((User)authentication.getPrincipal()); logger.trace("getPrincipal " + authentication.getPrincipal().getClass());
SigninPrincipal auth = null;
if(authentication.getPrincipal() instanceof SigninPrincipal) {
auth = (SigninPrincipal)authentication.getPrincipal();
}else {
auth =new SigninPrincipal((User)authentication.getPrincipal());
}
auth.setAuthenticated(true); auth.setAuthenticated(true);
UsernamePasswordAuthenticationToken simpleUserAuthentication = new UsernamePasswordAuthenticationToken(auth, authentication.getCredentials(), authentication.getAuthorities()); UsernamePasswordAuthenticationToken simpleUserAuthentication = new UsernamePasswordAuthenticationToken(auth, authentication.getCredentials(), authentication.getAuthorities());
WebContext.setAuthentication(simpleUserAuthentication); WebContext.setAuthentication(simpleUserAuthentication);
@ -223,15 +247,6 @@ public class TokenEndpointAuthenticationFilter implements Filter {
String clientId = request.getParameter("client_id"); String clientId = request.getParameter("client_id");
String clientSecret = request.getParameter("client_secret"); String clientSecret = request.getParameter("client_secret");
if(clientId == null) { if(clientId == null) {
if(logger.isTraceEnabled()) {
logger.trace("getRequestURL : "+request.getRequestURL());
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
String key = (String) headerNames.nextElement();
String value = request.getHeader(key);
logger.trace("Header key "+key +" , value " + value);
}
}
//for header authorization basic //for header authorization basic
String authorization_bearer =request.getHeader("authorization"); String authorization_bearer =request.getHeader("authorization");
AuthorizationHeaderCredential ahc=AuthorizationHeaderUtils.resolve(authorization_bearer); AuthorizationHeaderCredential ahc=AuthorizationHeaderUtils.resolve(authorization_bearer);