Skip to content

Commit ab2bda2

Browse files
author
Luis Miranda
committed
port SamlResponse over to our own HttpRequest
1 parent ceb5ac8 commit ab2bda2

6 files changed

Lines changed: 252 additions & 206 deletions

File tree

core/src/main/java/com/onelogin/saml2/authn/SamlResponse.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import javax.xml.xpath.XPathExpressionException;
1111

12-
import com.onelogin.saml2.model.SubjectConfirmationIssue;
1312
import org.apache.commons.lang3.ObjectUtils;
1413
import org.joda.time.DateTime;
1514
import org.slf4j.Logger;
@@ -20,8 +19,10 @@
2019
import org.w3c.dom.Node;
2120
import org.w3c.dom.NodeList;
2221

23-
import com.onelogin.saml2.settings.Saml2Settings;
22+
import com.onelogin.saml2.http.HttpRequest;
2423
import com.onelogin.saml2.model.SamlResponseStatus;
24+
import com.onelogin.saml2.model.SubjectConfirmationIssue;
25+
import com.onelogin.saml2.settings.Saml2Settings;
2526
import com.onelogin.saml2.util.Constants;
2627
import com.onelogin.saml2.util.SchemaFactory;
2728
import com.onelogin.saml2.util.Util;
@@ -79,19 +80,17 @@ public class SamlResponse {
7980
*
8081
* @param settings
8182
* Saml2Settings object. Setting data
82-
* @param requestURL
83-
* the URL where the response was POST'ed (not including query parameters)
84-
* @param samlResponseParameter
85-
* the contents of the {@code SAMLResponse} query parameter
83+
* @param request
84+
* the HttpRequest object to be processed (Contains GET and POST parameters, request URL, ...).
8685
*
87-
* @throws Exception
86+
* @throws Exception
8887
*/
89-
public SamlResponse(Saml2Settings settings, String requestURL, String samlResponseParameter) throws Exception {
88+
public SamlResponse(Saml2Settings settings, HttpRequest request) throws Exception {
9089
this.settings = settings;
9190

92-
if (requestURL != null && samlResponseParameter != null) {
93-
currentUrl = requestURL;
94-
loadXmlFromBase64(samlResponseParameter);
91+
if (request != null) {
92+
currentUrl = request.getRequestURL();
93+
loadXmlFromBase64(request.getParameter("SAMLResponse"));
9594
}
9695
}
9796

0 commit comments

Comments
 (0)