Merge pull request #43 from collectivehealth/Chen-Han/patch-1

Error Message Change + getAttribute() change

Author: pitbulk

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

@@ -31,12 +31,19 @@ public void setIdpSsoTargetUrl(String idp_sso_target_url) {
 	 * @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);
+		loadCertificate(certificate, true);
 	}
 
-
+	public void loadCertificate(String certificate, boolean isBase64) throws CertificateException {
+        CertificateFactory fty = CertificateFactory.getInstance("X.509");
+        byte[] cert = certificate.getBytes();
+        if (isBase64) {
+            cert = Base64.decodeBase64(cert);
+        }
+        ByteArrayInputStream bais = new ByteArrayInputStream(cert);
+        this.idp_cert = fty.generateCertificate(bais);
+    }
+    
 	public Certificate getIdpCert() throws CertificateException {
 		if(this.idp_cert == null){
 			loadCertificate(this.certificate);

src/main/java/com/onelogin/saml/Response.java

@@ -76,7 +76,7 @@ public void loadXmlFromBase64(String responseStr) throws Exception {
 		this.response = new String(decodedB);
 		this.document = Utils.loadXML(this.response);
 		if(this.document == null){
-			throw new Exception("SAML Response could not be processed");
+			throw new Exception("SAML Response could not be processed, invalid or empty SAML");
 		}
 	}
 
@@ -138,7 +138,7 @@ public boolean isValid(String... requestId){
 
 			// Validate Assertion timestamps
 			if (!this.validateTimestamps()) {
-				throw new Exception("Timing issues (please check your clock settings)");
+				throw new Exception("Timing issues. Possible reasons include: SAML expired, service's clock setting is not UTC.");
 			}
 
 			// EncryptedAttributes are not supported
@@ -253,8 +253,10 @@ public String getNameId() throws Exception {
 
 	public String getAttribute(String name) {
 		HashMap<String, ArrayList<String>> attributes = getAttributes();
+
 		if (!attributes.isEmpty()) {
-			return attributes.get(name).toString();
+			ArrayList<String> attrVal = attributes.get(name);
+            return attrVal == null || attrVal.size() == 0 ? null : attrVal.get(0).toString();
 		}
 		return null;
 	}