utils: add missing string to the url in generate saml signature method Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/84b0e9e9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84b0e9e9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84b0e9e9 Branch: refs/heads/master Commit: 84b0e9e96fb7e47fd5df55e54440b49de3befbf3 Parents: 5a0ed87 Author: Rohit Yadav <[email protected]> Authored: Fri Sep 12 16:26:13 2014 +0200 Committer: Rohit Yadav <[email protected]> Committed: Fri Sep 12 16:26:13 2014 +0200 ---------------------------------------------------------------------- utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84b0e9e9/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java ---------------------------------------------------------------------- diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java index b085e49..e2c77b9 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() {
