gCubeSystem
/
ws-thredds
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebased

This commit is contained in:
Fabio Sinibaldi 2021-05-06 12:41:14 +02:00
parent 24278442e3 9222f500b2
commit c36bcda5d2
18 changed files with 210 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.settings/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/org.eclipse.jdt.core.prefs

5
CHANGELOG.md
View File

@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.spatial.data.ws-thredds
## [v1.0.0-SNAPSHOT]
Integration with new IAM
Security Fixes
## [v0.2.5]
Fixes #21265

19
pom.xml
View File

@ -8,7 +8,7 @@
</parent>
<groupId>org.gcube.spatial.data</groupId>
<artifactId>ws-thredds</artifactId>
<version>0.2.5</version>
<version>1.0.0-SNAPSHOT</version>
<name>ws-thredds</name>
<description>prototype of WS integration with data-transfer for Thredds pubblication</description>
@ -42,12 +42,6 @@
<groupId>org.gcube.spatial.data</groupId>
<artifactId>sdi-library</artifactId>
<version>[1.0.0-SNAPSHOT,1.3.0-SNAPSHOT)</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -63,17 +57,6 @@
<version>[1.2.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-core</artifactId> -->
<!-- <version>[2.8.1,2.8.11]</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-databind</artifactId> -->
<!-- <version>[2.8.1,2.8.11]</version> -->
<!-- </dependency> -->
<!-- JSON paths -->
<dependency>

7
src/main/java/org/gcube/usecases/ws/thredds/TokenSetter.java
View File

@ -21,7 +21,6 @@ public class TokenSetter {
public static synchronized void set(String scope){
try{
if(props==null) {
props=new Properties();
try {
@ -30,12 +29,8 @@ public class TokenSetter {
throw new RuntimeException("YOU NEED TO SET TOKEN FILE IN CONFIGURATION");
}
}
if(!props.containsKey(scope)) throw new Exception("No token found for scope : "+scope);
if(!props.containsKey(scope)) throw new RuntimeException("No token found for scope : "+scope);
SecurityTokenProvider.instance.set(props.getProperty(scope));
}catch(Throwable e){
log.trace("Unable to set token for scope "+scope,e);
}
ScopeProvider.instance.set(scope);
}

11
src/main/java/org/gcube/usecases/ws/thredds/engine/impl/Process.java
View File

@ -59,14 +59,15 @@ public class Process {
private CompletionCallback callback=null;
public Process(String folderId,CompletionCallback callback) throws WorkspaceInteractionException, InternalException {
log.debug("Created Process with id {} ",processId);
String operator=Security.getToken();
log.debug("Created Process with id {}, operator {} ",processId,operator);
// this.folderId=folderId;
manager=new WorkspaceFolderManager(folderId);
manager.lock(processId);
SynchFolderConfiguration folderConfig=manager.getSynchConfiguration();
try {
descriptor=new ProcessDescriptor(folderId, manager.getTheFolder().get().getPath(),System.currentTimeMillis(),processId,folderConfig);
try {
descriptor=new ProcessDescriptor(folderId, manager.getTheFolder().get().getPath(),System.currentTimeMillis(),processId,operator,folderConfig);
}catch(Exception e) {
throw new WorkspaceInteractionException("Unable to read path from folder "+folderId,e);
}
@ -225,7 +226,7 @@ public class Process {
}
String relativePath=toScanFolder.get().getMetadata().getMap().get(Constants.WorkspaceProperties.REMOTE_PATH)+"";
ThreddsController folderController=new ThreddsController(relativePath,config.getTargetToken());
ThreddsController folderController=new ThreddsController(relativePath,ownerProcess.getDescriptor().getOperator());
RemoteFileDescriptor folderDesc=null;
try{
@ -305,7 +306,7 @@ public class Process {
}catch(ItemNotFoundException e) {
log.info("Creating folder {} under {} ",item,folderPath);
folder=toScanFolder.newFolder(item, "Imported from thredds");
WorkspaceUtils.initProperties(folder,relativePath+"/"+item , config.getFilter(), config.getTargetToken(),config.getToCreateCatalogName(),config.getValidateMetadata(),config.getRootFolderId());
WorkspaceUtils.initProperties(folder,relativePath+"/"+item , config.getFilter(), ownerProcess.getDescriptor().getOperator(),config.getToCreateCatalogName(),config.getValidateMetadata(),config.getRootFolderId());
generateRequests(ownerProcess, service, folder);
}

2
src/main/java/org/gcube/usecases/ws/thredds/engine/impl/ProcessDescriptor.java
View File

@ -14,6 +14,8 @@ public class ProcessDescriptor implements Cloneable{
private long launchTime;
private String processId;
private String operator;
private SynchFolderConfiguration synchConfiguration;
@Override

57
src/main/java/org/gcube/usecases/ws/thredds/engine/impl/Security.java Normal file
View File

@ -0,0 +1,57 @@
package org.gcube.usecases.ws.thredds.engine.impl;
import static org.gcube.common.authorization.client.Constants.authorizationService;
import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
import org.gcube.common.authorization.library.AuthorizationEntry;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class Security {
public static String getCurrentScope(){
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.getContext();
}catch(Exception e ){
log.debug("Unable to resolve token, checking scope provider..",e);
return ScopeProvider.instance.get();
}
}
public static String getContext(String token) {
try{
log.debug("Resolving token {} ",token);
AuthorizationEntry entry = authorizationService().get(token);
return entry.getContext();
}catch(Exception e) {
log.warn("Unable to resolve "+token,e);
return null;
}
}
public static String getToken() {
return SecurityTokenProvider.instance.get();
}
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";
}
}
}

11
src/main/java/org/gcube/usecases/ws/thredds/engine/impl/SynchEngineImpl.java
View File

@ -11,6 +11,7 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.data.transfer.model.plugins.thredds.DataSetScan;
import org.gcube.data.transfer.model.plugins.thredds.ThreddsCatalog;
import org.gcube.data.transfer.model.plugins.thredds.ThreddsInfo;
@ -138,6 +139,16 @@ public class SynchEngineImpl implements SyncEngine{
if (!manager.isSynched()) throw new WorkspaceNotSynchedException("Folder "+folderId+" is not configured for synchronization.");
if(manager.isLocked()) throw new WorkspaceLockedException("Folder "+folderId+"is locked by an external process.");
if(!manager.isRoot()) throw new WorkspaceFolderNotRootException("Unable to launch synch operation. Folder "+folderId+" is not root configuration");
String callerContext=Security.getCurrentScope();
log.debug("Checking context. Caller is {} ",callerContext);
String configurationContext=Security.getContext(manager.getSynchConfiguration().getTargetToken());
if(!callerContext.equals(configurationContext))
throw new WorkspaceInteractionException("Cannot sync folder from context "+callerContext+". Expected context is "+configurationContext);
Process toLaunch=new Process(folderId,completionCallback);
localProcesses.put(folderId, toLaunch);
initializationExecutor.submit(new ProcessInitializationThread(toLaunch,synchronizationExecutor));

32
src/main/java/org/gcube/usecases/ws/thredds/engine/impl/WorkspaceFolderManager.java
View File

@ -51,9 +51,27 @@ public class WorkspaceFolderManager {
private StorageHubClient sc;
private String operator=null;
private String getToken() {
if(operator==null) {
log.warn("******************Using config operator**********");
return config.getTargetToken();
}
else return operator;
}
public WorkspaceFolderManager(String folderId) throws WorkspaceInteractionException {
try{
// ws = HomeLibrary.getHomeManagerFactory().getHomeManager().getHome().getWorkspace();
String operator=Security.getToken();
log.debug("Setting operator "+operator);
this.operator=operator;
sc=WorkspaceUtils.getClient();
theFolder=sc.open(folderId).asFolder();
this.folderId=folderId;
@ -70,7 +88,7 @@ public class WorkspaceFolderManager {
public ThreddsController getThreddsController() throws WorkspaceNotSynchedException, WorkspaceInteractionException, InternalException {
if(threddsController==null) {
SynchFolderConfiguration config=getSynchConfiguration();
threddsController=new ThreddsController(config.getRemotePath(),config.getTargetToken());
threddsController=new ThreddsController(config.getRemotePath(),getToken());
}
return threddsController;
}
@ -79,7 +97,7 @@ public class WorkspaceFolderManager {
try {
FolderContainer root=sc.open(getSynchConfiguration().getRootFolderId()).asFolder();
SynchFolderConfiguration rootConfig=WorkspaceUtils.loadConfiguration(root);
return new ThreddsController(rootConfig.getRemotePath(),rootConfig.getTargetToken());
return new ThreddsController(rootConfig.getRemotePath(),getToken());
}catch(StorageHubException e) {
throw new WorkspaceInteractionException(e);
}
@ -116,7 +134,7 @@ public class WorkspaceFolderManager {
SynchFolderConfiguration config=getSynchConfiguration();
try{
checkFolder(theFolder,recursively,config,null,theFolder.getId(),WorkspaceUtils.safelyGetLastUpdate(theFolder.get()));
checkFolder(theFolder,recursively,config,null,theFolder.getId(),WorkspaceUtils.safelyGetLastUpdate(theFolder.get()),getToken());
return new SyncFolderDescriptor(this.folderId,this.theFolder.get().getPath(),config);
}catch(StorageHubException e) {
throw new WorkspaceInteractionException(e);
@ -151,7 +169,7 @@ public class WorkspaceFolderManager {
try {
String catalogName=toSet.getToCreateCatalogName();
ThreddsController controller= new ThreddsController(toSet.getRemotePath(),toSet.getTargetToken());
ThreddsController controller= new ThreddsController(toSet.getRemotePath(),getToken());
if(!controller.existsThreddsFile(null)) {
log.info("Folder not found, creating it..");
controller.createEmptyFolder(null);
@ -241,7 +259,7 @@ public class WorkspaceFolderManager {
private static void checkFolder(FolderContainer folder,boolean recursive, SynchFolderConfiguration rootConfig, String relativePathFromRootFolder, String rootFolderId,Date lastUpdatedRoutine) throws StorageHubException, InternalException {
private static void checkFolder(FolderContainer folder,boolean recursive, SynchFolderConfiguration rootConfig, String relativePathFromRootFolder, String rootFolderId,Date lastUpdatedRoutine, String toUseToken) throws StorageHubException, InternalException {
// Check folder configuration
log.trace("Checking folder {} ",folder.get().getPath());
log.debug("Configuration is {}, relativePath is {} ",rootConfig,relativePathFromRootFolder);
@ -252,7 +270,7 @@ public class WorkspaceFolderManager {
ThreddsController controller=new ThreddsController(currentRemotePath, rootConfig.getTargetToken());
ThreddsController controller=new ThreddsController(currentRemotePath, toUseToken);
HashSet<String> currentFolderExistingItem=new HashSet<String>();
@ -269,7 +287,7 @@ public class WorkspaceFolderManager {
String itemRemotePath=currentRemotePath+"/"+itemName;
if(item.getType().equals(ContainerType.FOLDER)) {
if(recursive)
checkFolder((FolderContainer) item,recursive,rootConfig,itemRelativePath,rootFolderId,lastUpdatedRoutine);
checkFolder((FolderContainer) item,recursive,rootConfig,itemRelativePath,rootFolderId,lastUpdatedRoutine,toUseToken);
else WorkspaceUtils.initProperties(item, itemRemotePath, rootConfig.getFilter(), rootConfig.getTargetToken(),rootConfig.getToCreateCatalogName(),rootConfig.getValidateMetadata(),rootFolderId);
}else if(rootConfig.matchesFilter(itemName)) {
if(!WorkspaceUtils.isConfigured(item.get()))

2
src/main/java/org/gcube/usecases/ws/thredds/engine/impl/threads/SynchronizationThread.java
View File

@ -73,7 +73,7 @@ public class SynchronizationThread implements Runnable {
FolderContainer parentFolder=client.open(parentFolderItem.getId()).asFolder();
checkCancelledProcess();
SynchFolderConfiguration synchConfig=WorkspaceUtils.loadConfiguration(parentFolder);
ThreddsController controller=new ThreddsController(synchConfig.getRemotePath(), synchConfig.getTargetToken());
ThreddsController controller=new ThreddsController(synchConfig.getRemotePath(), theRequest.getProcess().getDescriptor().getOperator());
if(theRequest instanceof TransferToThreddsRequest) {
TransferToThreddsRequest request=(TransferToThreddsRequest) theRequest;

49
src/main/java/org/gcube/usecases/ws/thredds/faults/GenericWebException.java Normal file
View File

@ -0,0 +1,49 @@
package org.gcube.usecases.ws.thredds.faults;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString(callSuper = true)
public class GenericWebException extends Exception{
/**
*
*/
private static final long serialVersionUID = 5200927893712698886L;
private String remoteMessage=null;
private Integer responseHTTPCode=0;
public GenericWebException() {
super();
// TODO Auto-generated constructor stub
}
public GenericWebException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
// TODO Auto-generated constructor stub
}
public GenericWebException(String message, Throwable cause) {
super(message, cause);
// TODO Auto-generated constructor stub
}
public GenericWebException(String message) {
super(message);
// TODO Auto-generated constructor stub
}
public GenericWebException(Throwable cause) {
super(cause);
// TODO Auto-generated constructor stub
}
}

0
src/main/resources/logback.xml
View File

7
src/test/java/org/gcube/usecases/ws/thredds/DTSynchUseCase.java
View File

@ -14,10 +14,13 @@ import org.gcube.usecases.ws.thredds.model.SynchFolderConfiguration;
public class DTSynchUseCase {
public static void main(String[] args) throws WorkspaceInteractionException, InternalException, ProcessNotFoundException {
TokenSetter.set("/d4science.research-infrastructures.eu");
// TokenSetter.set("/d4science.research-infrastructures.eu");
// String folderId="a8cd78d3-69e8-4d02-ac90-681b2d16d84d";
TokenSetter.set("/gcube/devsec/devVRE");
String folderId="8ebe9ffb-e2cf-4b3e-ab91-cc6933d86625";
SyncEngine engine=SyncEngine.get();
String folderId="a8cd78d3-69e8-4d02-ac90-681b2d16d84d";
// String folderId="8a6f9749-68d7-4a9a-a475-bd645050c3fd"; // sub folder for faster tests

17
src/test/java/org/gcube/usecases/ws/thredds/GetTrhreddsInfoTest.java Normal file
View File

@ -0,0 +1,17 @@
package org.gcube.usecases.ws.thredds;
import org.gcube.data.transfer.library.utils.ScopeUtils;
import org.gcube.usecases.ws.thredds.faults.InternalException;
public class GetTrhreddsInfoTest {
public static void main(String[] args) throws InternalException {
SyncEngine engine=SyncEngine.get();
// ROOT
System.out.println(engine.getAvailableCatalogsByToken("***REMOVED***"));
// MEI
System.out.println(engine.getAvailableCatalogsByToken("54f577de-d259-407e-b30d-29bf9e7c0dee-843339462"));
}
}

4
src/test/java/org/gcube/usecases/ws/thredds/TestCommons.java
View File

@ -37,7 +37,7 @@ public class TestCommons {
private static Map<String,TestSet> configs=new HashMap<>();
private static String toUseConfig="default";
private static String toUseConfig="simple";
static {
@ -46,7 +46,7 @@ public class TestCommons {
// folderName="WS-Tests";
configs.put("simple", new TestSet("Simple label ","/gcube", "Test1","public/netcdf/simpleFolder","***REMOVED***","simple"));
configs.put("simple", new TestSet("Simple label ","/gcube/devsec/devVRE", "Test1","public/netcdf/simpleFolder","***REMOVED***","simple"));
configs.put("cmems", new TestSet("CMEMS","/gcube", "CMEMS","public/netcdf/CMEMS","***REMOVED***","cmems"));
configs.put("default", new TestSet("Default Tests","/gcube","Thredds Catalog","public/netcdf","***REMOVED***","main"));

11
src/test/java/org/gcube/usecases/ws/thredds/TokenCheck.java Normal file
View File

@ -0,0 +1,11 @@
package org.gcube.usecases.ws.thredds;
public class TokenCheck {
//
// public static void main (String[] args) {
// System.out.println(Security.getContext("8e74a17c-92f1-405a-b591-3a6090066248-98187548"));
// System.out.println(Security.getContext("0e2c7963-8d3e-4ea6-a56d-ffda530dd0fa-98187548"));
// }
//
}

4
src/main/resources/log4j.properties → src/test/resources/log4j.properties
View File

@ -1,6 +1,6 @@
# Root logger option
#log4j.rootLogger=INFO, SM
log4j.logger.org.gcube.usecases.ws=DEBUG,SM
log4j.rootLogger=DEBUG, SM
#log4j.logger.org.gcube.usecases.ws=DEBUG,SM

14
src/test/resources/logback.xml Normal file
View File

@ -0,0 +1,14 @@
<configuration debug="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="debug">
<appender-ref ref="STDOUT" />
</root>
</configuration>