Merge branch 'master' into refresh-deps

Author: pitbulk

core/pom.xml

@@ -61,6 +61,7 @@
 			<groupId>org.apache.santuario</groupId>
 			<artifactId>xmlsec</artifactId>
 			<version>2.2.0</version>
+			<version>2.1.5</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
@@ -117,7 +118,7 @@
 						<configuration>
 							<rules>
 								<evaluateBeanshell>
-									<condition>javax.crypto.Cipher.getMaxAllowedKeyLength("AES") &gt; 128</condition>
+									<condition>javax.crypto.Cipher.getMaxAllowedKeyLength("AES") > 128</condition>
 								</evaluateBeanshell>
 							</rules>
 						</configuration>

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

@@ -224,6 +224,7 @@ private StrSubstitutor generateSubstitutor(Saml2Settings settings) {
 		valueMap.put("issueInstant", issueInstantString);
 		valueMap.put("id", String.valueOf(id));
 		valueMap.put("assertionConsumerServiceURL", String.valueOf(settings.getSpAssertionConsumerServiceUrl()));
+		valueMap.put("protocolBinding", settings.getSpAssertionConsumerServiceBinding());
 		valueMap.put("spEntityid", settings.getSpEntityId());
 
 		String requestedAuthnContextStr = "";
@@ -247,7 +248,7 @@ private StrSubstitutor generateSubstitutor(Saml2Settings settings) {
 	 */
 	private static StringBuilder getAuthnRequestTemplate() {
 		StringBuilder template = new StringBuilder();
-		template.append("<samlp:AuthnRequest xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\" ID=\"${id}\" Version=\"2.0\" IssueInstant=\"${issueInstant}\"${providerStr}${forceAuthnStr}${isPassiveStr}${destinationStr} ProtocolBinding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST\" AssertionConsumerServiceURL=\"${assertionConsumerServiceURL}\">");
+		template.append("<samlp:AuthnRequest xmlns:samlp=\"urn:oasis:names:tc:SAML:2.0:protocol\" xmlns:saml=\"urn:oasis:names:tc:SAML:2.0:assertion\" ID=\"${id}\" Version=\"2.0\" IssueInstant=\"${issueInstant}\"${providerStr}${forceAuthnStr}${isPassiveStr}${destinationStr} ProtocolBinding=\"${protocolBinding}\" AssertionConsumerServiceURL=\"${assertionConsumerServiceURL}\">");
 		template.append("<saml:Issuer>${spEntityid}</saml:Issuer>");
 		template.append("${subjectStr}${nameIDPolicyStr}${requestedAuthnContextStr}</samlp:AuthnRequest>");
 		return template;

samples/java-saml-tookit-jspsample/src/main/webapp/dologout.jsp

@@ -19,7 +19,7 @@
 		}
 		String nameidNameQualifier = null;
 		if (session.getAttribute("nameidNameQualifier") != null) {
-			nameIdFormat = session.getAttribute("nameidNameQualifier").toString();
+			nameidNameQualifier = session.getAttribute("nameidNameQualifier").toString();
 		}
 		String nameidSPNameQualifier = null;
 		if (session.getAttribute("nameidSPNameQualifier") != null) {