bug #22814

- pom modified for release

CHANGELOG.md

@@ -2,15 +2,28 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for org.gcube.data-access.sh-fuse-integration
 
+## [v2.0.1] 2021-02-09
+
+### Fix
+	
+-  all logs set to WARN [#22814]
+
+## [v2.0.0] 2021-05-19
+
+### Feature
+	
+-  porting to uma token [#21441]
+
+
 ## [v1.1.1] 2021-01-15
 
 ### Fixes
 	
 - issue on right displayed 
-- https://support.d4science.org/issues/20417 
+- [#20417] 
 
 ## [v1.1.0] 2020-09-07
 
 ### Fixes
 
-- Solved issue on data download (https://support.d4science.org/issues/19651)
+- Solved issue on data download [#19651]

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.data-access</groupId>
 	<artifactId>sh-fuse-integration</artifactId>
-	<version>1.1.1</version>
+	<version>2.0.1</version>
 	<name>SHFuseIntegration</name>
 
 	<parent>
@@ -33,7 +33,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>1.5.0</version>
+				<version>2.0.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -51,6 +51,11 @@
 			<artifactId>gxJRS</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>common-authorization</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>storagehub-client-library</artifactId>
@@ -61,6 +66,10 @@
 			<artifactId>storagehub-model</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-gcube-calls</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.cache2k</groupId>
 			<artifactId>cache2k-jcache</artifactId>

src/main/java/org/gcube/data/access/storagehub/fs/StorageHubFS.java

@@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit;
 import org.cache2k.Cache;
 import org.cache2k.Cache2kBuilder;
 import org.gcube.common.authorization.library.AuthorizedTasks;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.storagehub.client.dsl.ContainerType;
 import org.gcube.common.storagehub.client.dsl.FileContainer;
@@ -63,8 +63,11 @@ public class StorageHubFS extends FuseStubFS {
 		super();
 		this.token = token;
 		this.scope = scope;
+		
+		logger.debug("using token {} in scope {}", token , scope);
+		
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 		client = new StorageHubClient();
 		rootDirectory = client.getWSRoot();
 		cache = new Cache2kBuilder<String, ItemContainer<Item>>() {}
@@ -81,7 +84,7 @@ public class StorageHubFS extends FuseStubFS {
 	@Override
 	public synchronized int write(String path, Pointer buf, long size, long offset, FuseFileInfo fi) {
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		logger.trace("{}) calling write {} - {} ",Thread.currentThread().getName(), size , offset);
 		SHFile file = tempFiles.get(path);
@@ -110,7 +113,7 @@ public class StorageHubFS extends FuseStubFS {
 	@Override
 	public synchronized int create(final String path, @mode_t long mode, FuseFileInfo fi) {
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		logger.trace(Thread.currentThread().getName()+" ) calling create "+path);
 		if (pathUtils.getPath(path) != null) {
@@ -163,7 +166,7 @@ public class StorageHubFS extends FuseStubFS {
 	public int getattr(String path, FileStat stat) {
 		
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		logger.trace(Thread.currentThread().getName()+" ) calling getattr "+path);
 		if (Objects.equals(path, "/") || path.contains("Trash") || path.equals("/"+VREFOLDERS_NAME)) {
@@ -226,7 +229,7 @@ public class StorageHubFS extends FuseStubFS {
 	@Override
 	public int mkdir(String path, @mode_t long mode) {
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		logger.trace(Thread.currentThread().getName()+" ) calling mkdir");
 
@@ -256,7 +259,7 @@ public class StorageHubFS extends FuseStubFS {
 	@Override
 	public int read(String path, Pointer buf, @size_t long size, @off_t long offset, FuseFileInfo fi) {
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		logger.trace("!!! read called in path {} with size {} and offset {} and pointer address {}",path, size, offset, buf.address());
 
@@ -324,7 +327,7 @@ public class StorageHubFS extends FuseStubFS {
 	public int readdir(String path, Pointer buf, FuseFillDir filter, @off_t long offset, FuseFileInfo fi) {
 		logger.trace("readdir called");
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		logger.trace(Thread.currentThread().getName()+" ) calling readdir "+path);
 		if (path.contains(".Trash")) return 0;
@@ -417,7 +420,7 @@ public class StorageHubFS extends FuseStubFS {
 	@Override
 	public int rename(String path, String newName) {
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		ItemContainer<? extends Item> folder = pathUtils.getPath(path);
 		if (folder == null) {
@@ -455,7 +458,7 @@ public class StorageHubFS extends FuseStubFS {
 			return -ErrorCodes.EACCES(); 
 
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		ItemContainer<? extends Item> folder = pathUtils.getPath(path);
 		if (folder == null) {
@@ -465,7 +468,7 @@ public class StorageHubFS extends FuseStubFS {
 			return -ErrorCodes.ENOTDIR();
 		}
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 		try {
 			checkSpecialFolderRemove(path);
 
@@ -494,7 +497,7 @@ public class StorageHubFS extends FuseStubFS {
 	@Override
 	public int unlink(String path) {
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 
 		ItemContainer<? extends Item> file = pathUtils.getPath(path);
 		if (file == null) {
@@ -504,7 +507,7 @@ public class StorageHubFS extends FuseStubFS {
 			return -ErrorCodes.EISDIR();
 		}
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 		try {
 			file.delete();
 			cache.remove(path);
@@ -540,7 +543,7 @@ public class StorageHubFS extends FuseStubFS {
 		logger.info("truncate called {} ",path);
 
 		ScopeProvider.instance.set(scope);
-		SecurityTokenProvider.instance.set(token);
+		AccessTokenProvider.instance.set(token);
 		cache.remove(path);
 		uploadFile(path);
 		return 0;

src/test/java/org/gcube/data/access/storagehub/fuse/FuseTest.java

@@ -11,7 +11,7 @@ public class FuseTest {
 
 	@Test
 	public void mount() {
-		StorageHubFS memfs = new StorageHubFS("b7c80297-e4ed-42ab-ab42-fdc0b8b0eabf-98187548","/gcube");
+		StorageHubFS memfs = new StorageHubFS("AccessToken","/gcube");
 		try {
 			String path;
 			switch (Platform.getNativePlatform().getOS()) {

src/test/resources/logback.xml

@@ -7,7 +7,7 @@
   </appender>
   
   
-  <logger name="org.gcube.data.access.storagehub.fs" level="TRACE" />
+  <logger name="org.gcube.data.access.storagehub.fs" level="WARN" />
   <logger name="org.gcube" level="WARN" />
 
   <root level="WARN">