Merge pull request #30 from onelogin/INT-275

Int 275

Author: iguanajazz

README.md

@@ -49,4 +49,9 @@ The following information needs to be available on the account:
 
 `accountSettings.setCertificate`: The x509 certificate fingerprint. This is provided from the identity provider when setting up the relationship, for this version the certificate must be 1024-bit.
 
+The following information needs to be available for the response:
+
+`response.loadXmlFromBase64`: The coded SAML Response on string format
+`response.setDestinationUrl`: The URL of the current host + current view
+
 In OneLogin, for this sample project, you'll want to set the SAML Consumer URL to "http://localhost:8080" and the SAML Audience and SAML Recipient to "http://localhost:8080/consume.jsp"

sample/src/main/webapp/consume.jsp

@@ -25,9 +25,9 @@
   AccountSettings accountSettings = new AccountSettings();
   accountSettings.setCertificate(certificateS);
 
-  Response samlResponse = new Response(accountSettings);
-  samlResponse.loadXmlFromBase64(request.getParameter("SAMLResponse"));
-  samlResponse.setDestinationUrl(request.getRequestURL().toString());
+  Response samlResponse = new Response(accountSettings,
+                                      request.getParameter("SAMLResponse"),
+                                      request.getRequestURL().toString());
 
   if (samlResponse.isValid()) {
 

src/main/java/com/onelogin/AccountSettings.java

@@ -1,7 +1,16 @@
 package com.onelogin;
 
+import java.io.ByteArrayInputStream;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+
+import org.apache.commons.codec.binary.Base64;
+
+
 public class AccountSettings {
 	private String certificate;
+	private Certificate idp_cert;
 	private String idp_sso_target_url;
 
 	public String getCertificate() {
@@ -16,4 +25,34 @@ public String getIdp_sso_target_url() {
 	public void setIdpSsoTargetUrl(String idp_sso_target_url) {
 		this.idp_sso_target_url = idp_sso_target_url;
 	}
+	
+	/**
+	 * Loads certificate from a base64 encoded string
+	 * @param certificate an base64 encoded string.
+	 */
+ 	public void loadCertificate(String certificate) throws CertificateException {
+		CertificateFactory fty = CertificateFactory.getInstance("X.509");
+		ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(certificate.getBytes()));
+		this.idp_cert = fty.generateCertificate(bais);
+	}
+	
+
+	public Certificate getIdpCert() throws CertificateException {
+		if(this.idp_cert == null){
+			loadCertificate(this.certificate);
+		}
+		return this.idp_cert;
+	}
+	
+	/**
+	 * load and get a certificate from a encoded base64 byte array.
+	 * @param certificate an encoded base64 byte array.
+	 * @throws CertificateException In case it can't load the certificate.
+	 */
+	public Certificate getCert(byte[] certificate) throws CertificateException {
+		CertificateFactory fty = CertificateFactory.getInstance("X.509");
+		ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(certificate));
+		idp_cert = fty.generateCertificate(bais);
+		return idp_cert;
+	}
 }