[java-idp-testbed] branch master updated: OSJ-280 - Remove generics from Message/Profile APIs
Scott Cantor
cantor.2 at osu.edu
Wed Jul 31 12:45:56 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-idp-testbed.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=c68f7d3b63eb0c5a2964e5423cda7114961e22b2
The following commit(s) were added to refs/heads/master by this push:
new c68f7d3 OSJ-280 - Remove generics from Message/Profile APIs
c68f7d3 is described below
commit c68f7d3b63eb0c5a2964e5423cda7114961e22b2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 31 12:45:53 2019 -0400
OSJ-280 - Remove generics from Message/Profile APIs
https://issues.shibboleth.net/jira/browse/OSJ-280
---
src/main/java/sp/BaseSAMLController.java | 7 ++---
src/main/java/sp/SAML1Controller.java | 3 +-
src/main/java/sp/SAML2Controller.java | 51 ++++++++++++++++----------------
3 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/src/main/java/sp/BaseSAMLController.java b/src/main/java/sp/BaseSAMLController.java
index 12816f2..6c3bc54 100644
--- a/src/main/java/sp/BaseSAMLController.java
+++ b/src/main/java/sp/BaseSAMLController.java
@@ -29,7 +29,6 @@ import org.opensaml.core.xml.XMLObjectBuilderFactory;
import org.opensaml.core.xml.io.MarshallerFactory;
import org.opensaml.messaging.context.MessageContext;
import org.opensaml.messaging.decoder.MessageDecodingException;
-import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.binding.artifact.SAMLArtifactMap;
import org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostDecoder;
import org.opensaml.saml.saml2.binding.decoding.impl.HTTPRedirectDeflateDecoder;
@@ -61,7 +60,7 @@ public abstract class BaseSAMLController {
@Autowired protected ApplicationContext applicationContext;
- protected MessageContext<SAMLObject> decodeInboundMessageContextPost(HttpServletRequest servletRequest)
+ protected MessageContext decodeInboundMessageContextPost(HttpServletRequest servletRequest)
throws Exception {
HTTPPostDecoder decoder = new HTTPPostDecoder();
try {
@@ -80,7 +79,7 @@ public abstract class BaseSAMLController {
}
}
- protected MessageContext<SAMLObject> decodeInboundMessageContextSOAP(HttpServletRequest servletRequest)
+ protected MessageContext decodeInboundMessageContextSOAP(HttpServletRequest servletRequest)
throws Exception {
HTTPSOAP11Decoder decoder = new HTTPSOAP11Decoder();
try {
@@ -99,7 +98,7 @@ public abstract class BaseSAMLController {
}
}
- protected MessageContext<SAMLObject> decodeInboundMessageContextRedirect(HttpServletRequest servletRequest)
+ protected MessageContext decodeInboundMessageContextRedirect(HttpServletRequest servletRequest)
throws Exception {
HTTPRedirectDeflateDecoder decoder = new HTTPRedirectDeflateDecoder();
try {
diff --git a/src/main/java/sp/SAML1Controller.java b/src/main/java/sp/SAML1Controller.java
index cde0c24..95e6484 100644
--- a/src/main/java/sp/SAML1Controller.java
+++ b/src/main/java/sp/SAML1Controller.java
@@ -48,7 +48,6 @@ import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.messaging.context.InOutOperationContext;
import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.saml.common.SAMLObject;
import org.opensaml.saml.common.SAMLObjectBuilder;
import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml1.core.AttributeQuery;
@@ -90,7 +89,7 @@ public class SAML1Controller extends BaseSAMLController {
handleSSOResponsePOST(HttpServletRequest servletRequest, HttpServletResponse servletResponse)
throws Exception {
- MessageContext<SAMLObject> messageContext = decodeInboundMessageContextPost(servletRequest);
+ MessageContext messageContext = decodeInboundMessageContextPost(servletRequest);
if (!(messageContext.getMessage() instanceof Response)) {
log.error("Inbound message was not a SAML 1 Response");
diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index a49dd0e..0a114cf 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -60,7 +60,6 @@ import org.opensaml.saml.saml2.core.LogoutRequest;
import org.opensaml.saml.saml2.core.LogoutResponse;
import org.opensaml.saml.saml2.core.NameID;
import org.opensaml.saml.saml2.core.NameIDPolicy;
-import org.opensaml.saml.saml2.core.RequestAbstractType;
import org.opensaml.saml.saml2.core.RequestedAuthnContext;
import org.opensaml.saml.saml2.core.RequesterID;
import org.opensaml.saml.saml2.core.Response;
@@ -110,7 +109,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_REDIRECT_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextRedirect(messageContext, servletResponse);
}
@@ -121,7 +120,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_POST_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
SAMLMessageSecuritySupport.signMessage(messageContext);
encodeOutboundMessageContextPost(messageContext, servletResponse);
}
@@ -133,7 +132,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_ARTIFACT_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextArtifact(messageContext, servletResponse);
}
@@ -145,7 +144,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_REDIRECT_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextRedirect(messageContext, servletResponse);
}
@@ -157,7 +156,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_REDIRECT_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextRedirect(messageContext, servletResponse);
}
@@ -169,7 +168,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_REDIRECT_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextRedirect(messageContext, servletResponse);
}
@@ -181,7 +180,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_POST_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
SAMLMessageSecuritySupport.signMessage(messageContext);
encodeOutboundMessageContextPost(messageContext, servletResponse);
}
@@ -195,7 +194,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_POST_BINDING_URI, authnRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(authnRequest, endpoint, spEntityID, idpEntityID);
SAMLMessageSecuritySupport.signMessage(messageContext);
encodeOutboundMessageContextPost(messageContext, servletResponse);
@@ -208,7 +207,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSsoEndpoint(SAMLConstants.SAML2_REDIRECT_BINDING_URI, logoutRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(logoutRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(logoutRequest, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextRedirect(messageContext, servletResponse);
}
@@ -226,7 +225,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSloEndpoint(SAMLConstants.SAML2_REDIRECT_BINDING_URI, logoutRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(logoutRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(logoutRequest, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextRedirect(messageContext, servletResponse);
}
@@ -237,7 +236,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSloEndpoint(SAMLConstants.SAML2_POST_BINDING_URI, logoutRequest.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(logoutRequest, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(logoutRequest, endpoint, spEntityID, idpEntityID);
SAMLMessageSecuritySupport.signMessage(messageContext);
encodeOutboundMessageContextPost(messageContext, servletResponse);
}
@@ -249,7 +248,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSloEndpoint(SAMLConstants.SAML2_REDIRECT_BINDING_URI, logoutResponse.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(logoutResponse, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(logoutResponse, endpoint, spEntityID, idpEntityID);
encodeOutboundMessageContextRedirect(messageContext, servletResponse);
}
@@ -260,7 +259,7 @@ public class SAML2Controller extends BaseSAMLController {
final Endpoint endpoint = buildIdpSloEndpoint(SAMLConstants.SAML2_POST_BINDING_URI, logoutResponse.getDestination());
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(logoutResponse, endpoint, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(logoutResponse, endpoint, spEntityID, idpEntityID);
SAMLMessageSecuritySupport.signMessage(messageContext);
encodeOutboundMessageContextPost(messageContext, servletResponse);
}
@@ -271,14 +270,14 @@ public class SAML2Controller extends BaseSAMLController {
logoutResponse.setInResponseTo(id);
final String spEntityID = getSpEntityId(servletRequest);
final String idpEntityID = getIdpEntityId(servletRequest);
- final MessageContext<SAMLObject> messageContext = buildOutboundMessageContext(logoutResponse, null, spEntityID, idpEntityID);
+ final MessageContext messageContext = buildOutboundMessageContext(logoutResponse, null, spEntityID, idpEntityID);
SAMLMessageSecuritySupport.signMessage(messageContext);
encodeOutboundMessageContextSOAP(messageContext, servletResponse);
}
@RequestMapping(value="/POST/ACS", method=RequestMethod.POST)
public ResponseEntity<String> handleSSOResponsePOST(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception {
- final MessageContext<SAMLObject> messageContext = decodeInboundMessageContextPost(servletRequest);
+ final MessageContext messageContext = decodeInboundMessageContextPost(servletRequest);
if (!(messageContext.getMessage() instanceof Response)) {
log.error("Inbound message was not a SAML 2 Response");
@@ -300,7 +299,7 @@ public class SAML2Controller extends BaseSAMLController {
@RequestMapping(value="/Redirect/SLO", method=RequestMethod.GET)
public ResponseEntity<String> handleSLOResponseRedirect(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception {
- final MessageContext<SAMLObject> messageContext = decodeInboundMessageContextRedirect(servletRequest);
+ final MessageContext messageContext = decodeInboundMessageContextRedirect(servletRequest);
if (messageContext.getMessage() instanceof LogoutRequest) {
servletRequest.setAttribute("success", "1");
@@ -322,7 +321,7 @@ public class SAML2Controller extends BaseSAMLController {
@RequestMapping(value="/POST/SLO", method=RequestMethod.POST)
public ResponseEntity<String> handleSLOResponsePOST(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception {
- final MessageContext<SAMLObject> messageContext = decodeInboundMessageContextPost(servletRequest);
+ final MessageContext messageContext = decodeInboundMessageContextPost(servletRequest);
if (messageContext.getMessage() instanceof LogoutRequest) {
servletRequest.setAttribute("success", "1");
@@ -344,7 +343,7 @@ public class SAML2Controller extends BaseSAMLController {
@RequestMapping(value="/SOAP/SLO", method=RequestMethod.POST)
public ResponseEntity<String> handleSLOResponseSOAP(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception {
- final MessageContext<SAMLObject> messageContext = decodeInboundMessageContextSOAP(servletRequest);
+ final MessageContext messageContext = decodeInboundMessageContextSOAP(servletRequest);
if (messageContext.getMessage() instanceof LogoutRequest) {
servletRequest.setAttribute("success", "1");
@@ -352,7 +351,7 @@ public class SAML2Controller extends BaseSAMLController {
return null;
}
- final XMLObject msg = messageContext.getMessage();
+ final XMLObject msg = (XMLObject) messageContext.getMessage();
final Element responseElement = msg.getDOM();
final String formattedMessage = SerializeSupport.prettyPrintXML(responseElement);
@@ -364,8 +363,8 @@ public class SAML2Controller extends BaseSAMLController {
return new ResponseEntity<>(formattedMessage, headers, HttpStatus.OK);
}
- private MessageContext<SAMLObject> buildOutboundMessageContext(SAMLObject message, Endpoint endpoint, String spEntityId, String idpEntityId) {
- MessageContext<SAMLObject> messageContext = new MessageContext<>();
+ private MessageContext buildOutboundMessageContext(SAMLObject message, Endpoint endpoint, String spEntityId, String idpEntityId) {
+ final MessageContext messageContext = new MessageContext();
messageContext.setMessage(message);
SAMLSelfEntityContext selfContext = messageContext.getSubcontext(SAMLSelfEntityContext.class, true);
@@ -393,7 +392,7 @@ public class SAML2Controller extends BaseSAMLController {
return messageContext;
}
- private void encodeOutboundMessageContextRedirect(MessageContext<SAMLObject> messageContext, HttpServletResponse servletResponse) throws Exception {
+ private void encodeOutboundMessageContextRedirect(MessageContext messageContext, HttpServletResponse servletResponse) throws Exception {
HTTPRedirectDeflateEncoder encoder = new HTTPRedirectDeflateEncoder();
try {
encoder.setHttpServletResponse(servletResponse);
@@ -410,7 +409,7 @@ public class SAML2Controller extends BaseSAMLController {
}
}
- private void encodeOutboundMessageContextPost(MessageContext<SAMLObject> messageContext, HttpServletResponse servletResponse) throws Exception {
+ private void encodeOutboundMessageContextPost(MessageContext messageContext, HttpServletResponse servletResponse) throws Exception {
HTTPPostEncoder encoder = new HTTPPostEncoder();
try {
encoder.setHttpServletResponse(servletResponse);
@@ -428,7 +427,7 @@ public class SAML2Controller extends BaseSAMLController {
}
}
- private void encodeOutboundMessageContextArtifact(MessageContext<SAMLObject> messageContext, HttpServletResponse servletResponse) throws Exception {
+ private void encodeOutboundMessageContextArtifact(MessageContext messageContext, HttpServletResponse servletResponse) throws Exception {
HTTPArtifactEncoder encoder = new HTTPArtifactEncoder();
try {
encoder.setHttpServletResponse(servletResponse);
@@ -447,7 +446,7 @@ public class SAML2Controller extends BaseSAMLController {
}
}
- private void encodeOutboundMessageContextSOAP(MessageContext<SAMLObject> messageContext, HttpServletResponse servletResponse) throws Exception {
+ private void encodeOutboundMessageContextSOAP(MessageContext messageContext, HttpServletResponse servletResponse) throws Exception {
HTTPSOAP11Encoder encoder = new HTTPSOAP11Encoder();
try {
encoder.setHttpServletResponse(servletResponse);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list