Repository: cloudstack Updated Branches: refs/heads/volume-upload bc997f1ac -> 075c84105
volume upload: fixed issues during request validation adding the encoded metadata to the signature Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b616894c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b616894c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b616894c Branch: refs/heads/volume-upload Commit: b616894c21679865b1438d426d36846f29ad3e89 Parents: bc997f1 Author: Rajani Karuturi <[email protected]> Authored: Wed Feb 4 15:49:53 2015 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Tue Feb 17 11:50:58 2015 +0530 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 6 +++--- server/src/com/cloud/template/TemplateManagerImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b616894c/server/src/com/cloud/storage/VolumeApiServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index a684d71..62f7710 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -332,13 +332,13 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic .getType().toString(), vol.getName(), vol.getFormat().toString(), dataObject.getDataStore().getUri(), dataObject.getDataStore().getRole().toString()); command.setLocalPath(volumeStore.getLocalDownloadPath()); Gson gson = new GsonBuilder().create(); - String jsonPayload = gson.toJson(command); - response.setMetadata(EncryptionUtil.encodeData(jsonPayload, key)); + String metadata = EncryptionUtil.encodeData(gson.toJson(command), key); + response.setMetadata(metadata); /* * signature calculated on the url, expiry, metadata. */ - response.setSignature(EncryptionUtil.generateSignature(jsonPayload + url + expires, key)); + response.setSignature(EncryptionUtil.generateSignature(metadata + url + expires, key)); return response; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b616894c/server/src/com/cloud/template/TemplateManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 7060b09..9747ad0 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -374,13 +374,13 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, * encoded metadata using the post upload config ssh key */ Gson gson = new GsonBuilder().create(); - String jsonPayload = gson.toJson(firstCommand); - response.setMetadata(EncryptionUtil.encodeData(jsonPayload, key)); + String metadata = EncryptionUtil.encodeData(gson.toJson(firstCommand), key); + response.setMetadata(metadata); /* * signature calculated on the url, expiry, metadata. */ - response.setSignature(EncryptionUtil.generateSignature(jsonPayload + url + expires, key)); + response.setSignature(EncryptionUtil.generateSignature(metadata + url + expires, key)); return response; } else {
