From 88c6072b4dd4d4bdea196e915a8c7b2bb27feba0 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 16 Sep 2014 17:10:11 +0200 Subject: [PATCH] CID-1237196: Fix potential NPE in SAMLUtils Signed-off-by: Rohit Yadav --- utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java index b08fa24b073..36c4d0f90c4 100644 --- a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java +++ b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java @@ -225,7 +225,11 @@ public class SAMLUtils { Signature signature = Signature.getInstance("SHA1withRSA"); signature.initSign(signingKey); signature.update(url.getBytes()); - return url + "&Signature=" + URLEncoder.encode(Base64.encodeBytes(signature.sign(), Base64.DONT_BREAK_LINES), HttpUtils.UTF_8); + String signatureString = Base64.encodeBytes(signature.sign(), Base64.DONT_BREAK_LINES); + if (signatureString != null) { + return url + "&Signature=" + URLEncoder.encode(signatureString, HttpUtils.UTF_8); + } + return url; } public static KeyFactory getKeyFactory() {