From 84b0e9e96fb7e47fd5df55e54440b49de3befbf3 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 12 Sep 2014 16:26:13 +0200 Subject: [PATCH] utils: add missing string to the url in generate saml signature method Signed-off-by: Rohit Yadav --- utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java index b085e49f4ea..e2c77b90786 100644 --- a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java +++ b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java @@ -218,14 +218,14 @@ public class SAMLUtils { public static String generateSAMLRequestSignature(String urlEncodedString, PrivateKey signingKey) throws NoSuchAlgorithmException, SignatureException, InvalidKeyException, UnsupportedEncodingException { - if (signingKey == null || urlEncodedString == null) { - return null; + if (signingKey == null) { + return urlEncodedString; } String url = urlEncodedString + "&SigAlg=" + URLEncoder.encode(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1, HttpUtils.UTF_8); Signature signature = Signature.getInstance("SHA1withRSA"); signature.initSign(signingKey); signature.update(url.getBytes()); - return URLEncoder.encode(Base64.encodeBytes(signature.sign(), Base64.DONT_BREAK_LINES), HttpUtils.UTF_8); + return url + "&Signature=" + URLEncoder.encode(Base64.encodeBytes(signature.sign(), Base64.DONT_BREAK_LINES), HttpUtils.UTF_8); } public static KeyFactory getKeyFactory() {