From 5a0ed8764be12cbf028f829d2db1d1af01a8a283 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Fri, 12 Sep 2014 15:46:44 +0200
Subject: [PATCH] SAMLUtils: Fix NPE incase signature is generated with a null
 privateKey

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
index 82e840a5598..b085e49f4ea 100644
--- a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
@@ -218,6 +218,9 @@ public class SAMLUtils {
 
     public static String generateSAMLRequestSignature(String urlEncodedString, PrivateKey signingKey)
             throws NoSuchAlgorithmException, SignatureException, InvalidKeyException, UnsupportedEncodingException {
+        if (signingKey == null || urlEncodedString == null) {
+            return null;
+        }
         String url = urlEncodedString + "&SigAlg=" + URLEncoder.encode(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1, HttpUtils.UTF_8);
         Signature signature = Signature.getInstance("SHA1withRSA");
         signature.initSign(signingKey);