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

m-11/6

Browse Source
This commit is contained in:
shimingxy
2019-11-06 23:28:59 +08:00
parent 623d6551c8
commit 3ce501aa86
167 changed files with 2293 additions and 1946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/org/

1
maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/com/

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

@@ -15,7 +15,7 @@ import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.maxkey.config.ApplicationConfig;
import org.maxkey.constants.BOOLEAN;
import org.maxkey.dao.service.CasDetailsService;
import org.maxkey.dao.service.AppsCasDetailsService;
import org.maxkey.dao.service.UserInfoService;
import org.maxkey.domain.UserInfo;
import org.maxkey.util.Instance;
@@ -37,7 +37,7 @@ public class Cas20AuthorizeEndpoint extends AuthorizeBaseEndpoint{
final static Logger _logger = LoggerFactory.getLogger(Cas20AuthorizeEndpoint.class);
@Autowired
CasDetailsService casDetailsService;
AppsCasDetailsService casDetailsService;
@Autowired
ApplicationConfig applicationConfig;

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

@@ -14,7 +14,7 @@ import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint;
import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
import org.maxkey.config.ApplicationConfig;
import org.maxkey.constants.BOOLEAN;
import org.maxkey.dao.service.CasDetailsService;
import org.maxkey.dao.service.AppsCasDetailsService;
import org.maxkey.dao.service.UserInfoService;
import org.maxkey.domain.UserInfo;
import org.maxkey.util.Instance;
@@ -36,7 +36,7 @@ public class Cas30AuthorizeEndpoint extends AuthorizeBaseEndpoint{
final static Logger _logger = LoggerFactory.getLogger(Cas30AuthorizeEndpoint.class);
@Autowired
CasDetailsService casDetailsService;
AppsCasDetailsService casDetailsService;
@Autowired
ApplicationConfig applicationConfig;

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

@@ -13,8 +13,8 @@ import org.maxkey.authz.cas.endpoint.ticket.ServiceTicketImpl;
import org.maxkey.authz.cas.endpoint.ticket.service.TicketServices;
import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint;
import org.maxkey.config.ApplicationConfig;
import org.maxkey.dao.service.CasDetailsService;
import org.maxkey.domain.apps.CasDetails;
import org.maxkey.dao.service.AppsCasDetailsService;
import org.maxkey.domain.apps.AppsCasDetails;
import org.maxkey.web.WebConstants;
import org.maxkey.web.WebContext;
import org.slf4j.Logger;
@@ -37,7 +37,7 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{
final static Logger _logger = LoggerFactory.getLogger(CasAuthorizeEndpoint.class);
@Autowired
CasDetailsService casDetailsService;
AppsCasDetailsService casDetailsService;
@Autowired
ApplicationConfig applicationConfig;
@@ -52,10 +52,10 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{
HttpServletResponse response,
@RequestParam(value=CasConstants.PARAMETER.SERVICE,required=false) String casService){
CasDetails casDetails=new CasDetails();
AppsCasDetails casDetails=new AppsCasDetails();
casDetails.setService(casService);
List<CasDetails> casDetailsList=casDetailsService.query(casDetails);
List<AppsCasDetails> casDetailsList=casDetailsService.query(casDetails);
casDetails=(casDetailsList!=null && casDetailsList.size()==1)?casDetailsList.get(0):null;
@@ -69,12 +69,12 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{
HttpServletResponse response,
@PathVariable("id") String id){
CasDetails casDetails=casDetailsService.get(id);
AppsCasDetails casDetails=casDetailsService.get(id);
return buildCasModelAndView(casDetails);
}
private ModelAndView buildCasModelAndView(CasDetails casDetails){
private ModelAndView buildCasModelAndView(AppsCasDetails casDetails){
_logger.debug(""+casDetails);
@@ -88,7 +88,7 @@ public class CasAuthorizeEndpoint extends AuthorizeBaseEndpoint{
HttpServletRequest request,
HttpServletResponse response){
CasDetails casDetails=(CasDetails)WebContext.getAttribute(CasConstants.PARAMETER.ENDPOINT_CAS_DETAILS);
AppsCasDetails casDetails=(AppsCasDetails)WebContext.getAttribute(CasConstants.PARAMETER.ENDPOINT_CAS_DETAILS);
ServiceTicketImpl serviceTicket=new ServiceTicketImpl(WebContext.getAuthentication(),casDetails);
String ticket=ticketServices.createTicket(serviceTicket);

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

@@ -1,7 +1,7 @@
package org.maxkey.authz.cas.endpoint.ticket;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.maxkey.domain.apps.CasDetails;
import org.maxkey.domain.apps.AppsCasDetails;
import org.springframework.security.core.Authentication;
import org.springframework.util.Assert;
@@ -55,7 +55,7 @@ public abstract class AbstractTicket implements Ticket {
protected Authentication authentication;
protected CasDetails casDetails;
protected AppsCasDetails casDetails;
/**
* Instantiates a new abstract ticket.
*/
@@ -131,7 +131,7 @@ public abstract class AbstractTicket implements Ticket {
}
@Override
public CasDetails getCasDetails() {
public AppsCasDetails getCasDetails() {
// TODO Auto-generated method stub
return this.casDetails;
}

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

@@ -1,7 +1,7 @@
package org.maxkey.authz.cas.endpoint.ticket;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.maxkey.domain.apps.CasDetails;
import org.maxkey.domain.apps.AppsCasDetails;
import org.springframework.security.core.Authentication;
import javax.persistence.Column;
@@ -55,7 +55,7 @@ public class ServiceTicketImpl extends AbstractTicket {
/**
* Instantiates a new service ticket impl.
*/
public ServiceTicketImpl(Authentication authentication,CasDetails casDetails) {
public ServiceTicketImpl(Authentication authentication,AppsCasDetails casDetails) {
// exists for JPA purposes
this.authentication=authentication;
this.casDetails=casDetails;

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

@@ -3,7 +3,7 @@ package org.maxkey.authz.cas.endpoint.ticket;
import java.io.Serializable;
import java.time.ZonedDateTime;
import org.maxkey.domain.apps.CasDetails;
import org.maxkey.domain.apps.AppsCasDetails;
import org.springframework.security.core.Authentication;
/**
@@ -78,7 +78,7 @@ public interface Ticket extends Serializable, Comparable<Ticket> {
ZonedDateTime getPreviousTimeUsed();
CasDetails getCasDetails();
AppsCasDetails getCasDetails();
}