From d46e1129297af75346f607c435d811de9cbfa500 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 8 Sep 2016 15:14:08 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/data-transfer-library@131237 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../data/transfer/library/utils/ScopeUtils.java | 13 +++++++++++++ .../data/transfer/library/utils/StorageUtils.java | 8 +++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/data/transfer/library/utils/ScopeUtils.java b/src/main/java/org/gcube/data/transfer/library/utils/ScopeUtils.java index 149d0d7..ffad458 100644 --- a/src/main/java/org/gcube/data/transfer/library/utils/ScopeUtils.java +++ b/src/main/java/org/gcube/data/transfer/library/utils/ScopeUtils.java @@ -24,4 +24,17 @@ public class ScopeUtils { } } + + public static String getCurrentCaller(){ + try{ + String token=SecurityTokenProvider.instance.get(); + log.debug("Token is : "+token); + if(token==null) throw new Exception("Security Token is null"); + AuthorizationEntry entry = authorizationService().get(token); + return entry.getClientInfo().getId(); + }catch(Exception e ){ + log.debug("Unable to resolve token, checking scope provider..",e); + return "Unidentified data-transfer user"; + } + } } diff --git a/src/main/java/org/gcube/data/transfer/library/utils/StorageUtils.java b/src/main/java/org/gcube/data/transfer/library/utils/StorageUtils.java index 5c8ad4e..e391bf3 100644 --- a/src/main/java/org/gcube/data/transfer/library/utils/StorageUtils.java +++ b/src/main/java/org/gcube/data/transfer/library/utils/StorageUtils.java @@ -4,21 +4,19 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import lombok.extern.slf4j.Slf4j; - -import org.bson.types.ObjectId; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanagement.blobstorage.service.IClient; import org.gcube.contentmanagement.blobstorage.transport.backend.RemoteBackendException; import org.gcube.contentmanager.storageclient.wrapper.AccessType; import org.gcube.contentmanager.storageclient.wrapper.MemoryType; import org.gcube.contentmanager.storageclient.wrapper.StorageClient; +import lombok.extern.slf4j.Slf4j; + @Slf4j public class StorageUtils { public static final IClient getClient(){ - return new StorageClient("data-transfer", "data-transfer", "own", AccessType.SHARED, MemoryType.VOLATILE).getClient(); + return new StorageClient("data-transfer", "data-transfer-library", ScopeUtils.getCurrentCaller(), AccessType.SHARED, MemoryType.VOLATILE).getClient(); }