gCubeSystem
/
uri-resolver
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1298: Workspace: Update public link generation 

Task-Url: https://support.d4science.org/issues/1298

Updated as following:

In case of error on decrypt or get input stream a 404 error is sent
In case of error on get Metadata (from storage), file is download with default value for name and mime type


git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@122326 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2016-01-19 17:43:06 +00:00
parent 9e2f1f0798
commit ef4bc1948c
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/org/gcube/datatransfer/resolver/http/StorageIDResolver.java
View File

@ -20,11 +20,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* The Class StorageIDResolver. * The Class StorageIDResolver.
* *
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
* Sep 21, 2015 * Jan 19, 2016
*/ */
public class StorageIDResolver extends HttpServlet { public class StorageIDResolver extends HttpServlet {
@ -90,17 +91,38 @@ public class StorageIDResolver extends HttpServlet {
logger.info(SMP_ID+" = "+ smpID); logger.info(SMP_ID+" = "+ smpID);
InputStream in = null; InputStream in = null;
try { String toSEID = null;
try {
OutputStream out = response.getOutputStream(); OutputStream out = response.getOutputStream();
StorageClient client = new StorageClient(StorageIDResolver.class.getName(), StorageIDResolver.class.getSimpleName(), StorageIDResolver.class.getName(), AccessType.PUBLIC);
try{ try{
StorageClient client = new StorageClient(StorageIDResolver.class.getName(), StorageIDResolver.class.getSimpleName(), StorageIDResolver.class.getName(), AccessType.PUBLIC);
IClient icClient = client.getClient(); IClient icClient = client.getClient();
String toSEID = icClient.getId(smpID); //to Storage Encrypted ID toSEID = icClient.getId(smpID); //to Storage Encrypted ID
logger.debug("Decoded ID"+" = "+ toSEID); logger.debug("Decoded ID"+" = "+ toSEID);
if(toSEID==null){
String error = "Decrypted id is null, thrown exception!";
throw new Exception(error);
}
in=icClient.get().RFileAsInputStream(toSEID); //input stream in=icClient.get().RFileAsInputStream(toSEID); //input stream
}catch (Exception e) {
response.sendError(404);
logger.error("Storage Client Exception when getting file from storage: ", e);
return;
}
//CASE InputStream NULL
if(in==null){
logger.error("Input stream returned from storage is null, sending status error 404");
sendErrorQuietly(response, 404);
return;
}
try{
MyFile file = client.getClient().getMetaFile().RFile(toSEID); MyFile file = client.getClient().getMetaFile().RFile(toSEID);
logger.debug("MetaFile retrieved from storage? "+ (file!=null)); logger.debug("MetaFile retrieved from storage? "+ (file!=null));
@ -115,16 +137,7 @@ public class StorageIDResolver extends HttpServlet {
} }
}catch (Exception e) { }catch (Exception e) {
response.sendError(404); logger.warn("Error when getting file metadata from storage, printing this warning and trying to continue..", e);
logger.error("Storage Client Exception:", e);
return;
}
//CASE InputStream NULL
if(in==null){
logger.warn("Input stream is null, sending status error 404");
sendErrorQuietly(response, 404);
return;
} }
//VALIDATING PARAMETERS: FILENAME AND CONTENT TYPE //VALIDATING PARAMETERS: FILENAME AND CONTENT TYPE