gCubeSystem
/
smart-executor-client
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ported tests to new authorization-utils

This commit is contained in:
Luca Frosini 2022-03-08 11:30:37 +01:00
parent 47c4fca044
commit bf23ef86dd
3 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for Smart Executor Client # Changelog for Smart Executor Client
## [v3.0.1-SNAPSHOT]
- Ported service to authorization-utils [#22871]
## [v3.0.0] ## [v3.0.0]

9
pom.xml
View File

@ -10,7 +10,7 @@
<groupId>org.gcube.vremanagement</groupId> <groupId>org.gcube.vremanagement</groupId>
<artifactId>smart-executor-client</artifactId> <artifactId>smart-executor-client</artifactId>
<version>3.0.0</version> <version>3.0.1-SNAPSHOT</version>
<name>Smart Executor Client</name> <name>Smart Executor Client</name>
<description>Smart Executor Client is a library designed to interact with Smart Executor exposed REST API</description> <description>Smart Executor Client is a library designed to interact with Smart Executor exposed REST API</description>
@ -30,7 +30,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>2.0.1</version> <version>2.1.0-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -83,6 +83,11 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>authorization-utils</artifactId>
<scope>test</scope>
</dependency>
<!-- <dependency> --> <!-- <dependency> -->
<!-- <groupId>org.gcube.vremanagement</groupId> --> <!-- <groupId>org.gcube.vremanagement</groupId> -->
<!-- <artifactId>hello-world-se-plugin</artifactId> --> <!-- <artifactId>hello-world-se-plugin</artifactId> -->

75
src/test/java/org/gcube/vremanagement/executor/client/ContextTest.java
View File

@ -7,31 +7,24 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
import org.gcube.common.authorization.client.Constants; import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.utils.secret.Secret;
import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.utils.secret.SecretUtility;
import org.gcube.common.authorization.library.provider.ClientInfo;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.authorization.library.utils.Caller;
import org.gcube.common.scope.api.ScopeProvider;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* @author Luca Frosini (ISTI - CNR) * @author Luca Frosini (ISTI - CNR)
*
*/ */
public class ContextTest { public class ContextTest {
private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
protected static Properties properties; protected static Properties properties;
protected static final String PROPERTIES_FILENAME = "token.properties"; protected static final String PROPERTIES_FILENAME = "token.properties";
public static final String DEFAULT_TEST_SCOPE_NAME; public static final String ROOT;
public static final String VO;
public static final String VRE;
static { static {
properties = new Properties(); properties = new Properties();
@ -44,42 +37,50 @@ public class ContextTest {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
//DEFAULT_TEST_SCOPE_NAME = "/pred4s/preprod/preVRE"; ROOT = "/gcube";
DEFAULT_TEST_SCOPE_NAME = "/gcube/devNext/NextNext"; // VO = ROOT + "/devsec";
// VRE = VO + "/devVRE";
VO = ROOT + "/devNext";
VRE = VO + "/NextNext";
} }
public static String getCurrentScope(String token) throws ObjectNotFound, Exception { public static void set(Secret secret) throws Exception {
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); SecretManagerProvider.instance.reset();
String context = authorizationEntry.getContext(); SecretManager secretManager = new SecretManager();
logger.info("Context of token {} is {}", token, context); SecretManagerProvider.instance.set(secretManager);
return context; secretManager.addSecret(secret);
secretManager.set();
} }
public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception { public static void setContext(String token) throws Exception {
Secret secret = getSecret(token);
set(secret);
}
public static void setContextByName(String fullContextName) throws Exception {
Secret secret = getSecretByContextName(fullContextName);
set(secret);
}
private static Secret getSecret(String token) throws Exception {
Secret secret = SecretUtility.getSecretByTokenString(token);
return secret;
}
private static Secret getSecretByContextName(String fullContextName) throws Exception {
String token = ContextTest.properties.getProperty(fullContextName); String token = ContextTest.properties.getProperty(fullContextName);
setContext(token); return getSecret(token);
}
public static void setContext(String token) throws ObjectNotFound, Exception {
SecurityTokenProvider.instance.set(token);
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
ClientInfo clientInfo = authorizationEntry.getClientInfo();
logger.debug("User : {} - Type : {}", clientInfo.getId(), clientInfo.getType().name());
String qualifier = authorizationEntry.getQualifier();
Caller caller = new Caller(clientInfo, qualifier);
AuthorizationProvider.instance.set(caller);
ScopeProvider.instance.set(getCurrentScope(token));
} }
@BeforeClass @BeforeClass
public static void beforeClass() throws Exception { public static void beforeClass() throws Exception {
setContextByName(DEFAULT_TEST_SCOPE_NAME); setContextByName(ROOT);
} }
@AfterClass @AfterClass
public static void afterClass() throws Exception { public static void afterClass() throws Exception {
SecurityTokenProvider.instance.reset(); SecretManagerProvider.instance.reset();
ScopeProvider.instance.reset();
} }
} }