LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jdk 17

Browse Source
This commit is contained in:
MaxKey
2023-08-15 11:58:38 +08:00
parent 7ebf4a57f3
commit d2500690e2
255 changed files with 1092 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java
View File

@@ -20,8 +20,6 @@
*/
package org.dromara.maxkey.authz.cas.endpoint;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.authz.cas.endpoint.response.Service10ResponseBuilder;
@@ -36,6 +34,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* @author Crystal.Sea

5
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java
View File

@@ -22,9 +22,6 @@ package org.dromara.maxkey.authz.cas.endpoint;
import java.lang.reflect.InvocationTargetException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.BeanUtils;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder;
@@ -48,6 +45,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* @author Crystal.Sea

5
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java
View File

@@ -22,9 +22,6 @@ package org.dromara.maxkey.authz.cas.endpoint;
import java.lang.reflect.InvocationTargetException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.BeanUtils;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder;
@@ -46,6 +43,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* @author Crystal.Sea

5
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java
View File

@@ -23,9 +23,6 @@ package org.dromara.maxkey.authz.cas.endpoint;
import java.security.Principal;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.session.Session;
import org.dromara.maxkey.authn.web.AuthorizationUtils;
@@ -46,6 +43,8 @@ import org.springframework.web.servlet.ModelAndView;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* @author Crystal.Sea

4
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java
View File

@@ -20,8 +20,6 @@
*/
package org.dromara.maxkey.authz.cas.endpoint;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants;
@@ -35,6 +33,8 @@ import org.springframework.web.servlet.ModelAndView;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* @author Crystal.Sea

4
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java
View File

@@ -20,8 +20,6 @@
*/
package org.dromara.maxkey.authz.cas.endpoint;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.authn.LoginCredential;
import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider;
@@ -53,6 +51,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* @author Crystal.Sea

5
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java
View File

@@ -22,8 +22,9 @@ import org.dromara.maxkey.entity.apps.AppsCasDetails;
import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
import javax.persistence.Column;
import javax.persistence.Id;
import jakarta.persistence.Column;
import jakarta.persistence.Id;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;

3
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java
View File

@@ -22,7 +22,8 @@ import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket;
import org.dromara.maxkey.entity.apps.AppsCasDetails;
import org.springframework.security.core.Authentication;
import javax.persistence.Column;
import jakarta.persistence.Column;
/**
* Domain object representing a Service Ticket. A service ticket grants specific

15
maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java
View File

@@ -22,17 +22,18 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorColumn;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
import jakarta.persistence.Lob;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import org.dromara.maxkey.entity.apps.AppsCasDetails;
import org.springframework.lang.NonNull;
import org.springframework.security.core.Authentication;
import javax.persistence.Column;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;

2
maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java
View File

@@ -46,7 +46,7 @@ public class RestTestClient {
final MockHttpServletRequest request = new MockHttpServletRequest();
final MockHttpServletResponse response = new MockHttpServletResponse();
final WebContext webContext = new J2EContext(request, response);
final WebContext webContext = null;//new J2EContext(request, response);
casConfiguration.init();
UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(username,password);
CasRestAuthenticator restAuthenticator = new CasRestAuthenticator(casConfiguration);