utils: fix SAMLUtils's authnrequest maker Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71be0bdd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71be0bdd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71be0bdd Branch: refs/heads/saml2 Commit: 71be0bdd8c32b4beeda1272d6397be8886d4f851 Parents: 8d97f1e Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Mon Aug 25 00:15:41 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Mon Aug 25 00:15:41 2014 +0200 ---------------------------------------------------------------------- .../src/org/apache/cloudstack/utils/auth/SAMLUtils.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71be0bdd/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java index fc0ca09..8a2f93b 100644 --- a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java +++ b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java @@ -64,7 +64,9 @@ import java.util.zip.DeflaterOutputStream; public class SAMLUtils { public static final Logger s_logger = Logger.getLogger(SAMLUtils.class); - public static final String SAML_NS = "saml-"; + public static final String SAML_NS = "saml://"; + + public static final String CERTIFICATE_NAME = "SAMLSP_CERTIFICATE"; public static String createSAMLId(String uid) { return SAML_NS + uid; @@ -108,15 +110,15 @@ public class SAMLUtils { authnRequest.setID(authnId); authnRequest.setDestination(idpUrl); authnRequest.setVersion(SAMLVersion.VERSION_20); - authnRequest.setForceAuthn(true); + authnRequest.setForceAuthn(false); authnRequest.setIsPassive(false); authnRequest.setIssuer(issuer); authnRequest.setIssueInstant(new DateTime()); - authnRequest.setProviderName(spId); authnRequest.setProtocolBinding(SAMLConstants.SAML2_REDIRECT_BINDING_URI); authnRequest.setAssertionConsumerServiceURL(consumerUrl); - authnRequest.setNameIDPolicy(nameIdPolicy); - authnRequest.setRequestedAuthnContext(requestedAuthnContext); + //authnRequest.setProviderName(spId); + //authnRequest.setNameIDPolicy(nameIdPolicy); + //authnRequest.setRequestedAuthnContext(requestedAuthnContext); return authnRequest; }
