etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

volume upload: fixed issues during request validation 

adding the encoded metadata to the signature
This commit is contained in:
Rajani Karuturi 2015-02-04 15:49:53 +05:30
parent bc997f1acb
commit b616894c21
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -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;
}

6
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -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 {