gCubeSystem
/
dataminer
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge pull request 'feature/23107' (!3) from feature/23107 into master 

Reviewed-on: #3
This commit is contained in:
Giancarlo Panichi 2022-04-07 15:23:24 +02:00
parent 69ee033316 8d02cd3e83
commit 7a64b7c5be
5 changed files with 185 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
# Changelog for "dataminer"
## [v1.9.0] - 2022-04-05
- Added support to new JWT token via URI Resolver [#23107]
## [v1.8.1] - 2022-03-21
- Update wps service to support not writing of the computation status to the user's workspace [#23054]

16
pom.xml
View File

@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@ -9,10 +10,10 @@
</parent>
<groupId>org.gcube.dataanalysis</groupId>
<artifactId>dataminer</artifactId>
<version>1.8.1</version>
<version>1.9.0</version>
<name>dataminer</name>
<description>An e-Infrastructure service providing state-of-the art DataMining algorithms and ecological modelling approaches under the Web Processing Service (WPS) standard.</description>
<scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
@ -39,14 +40,14 @@
</roles>
</developer>
</developers>
<properties>
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
<distroDirectory>distro</distroDirectory>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencyManagement>
<!-- Old solution <dependencies> <dependency> <groupId>org.gcube.distribution</groupId>
<artifactId>maven-smartgears-bom</artifactId> <version>2.1.0</version> <type>pom</type>
@ -61,8 +62,8 @@
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- https://mvnrepository.com/artifact/org.reflections/reflections-maven -->
<dependency>
@ -145,6 +146,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

67
src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/is/InformationSystemUtils.java Normal file
View File

@ -0,0 +1,67 @@
package org.gcube.dataanalysis.wps.statisticalmanager.synchserver.is;
import java.util.List;
import org.gcube.common.resources.gcore.ServiceEndpoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.Runtime;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
import org.gcube.resources.discovery.icclient.ICFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class InformationSystemUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(InformationSystemUtils.class);
private static final String URI_RESOLVER_SERVICE_CATEGORY = "Service";
private static final String URI_RESOLVER_SERVICE_NAME = "HTTP-URI-Resolver";
public static String retrieveUriResolverOat(String scope) throws Exception {
try {
LOGGER.info("Retrieve URI Resolver Oat Service Info");
if (scope == null || scope.length() == 0) {
String error="Invalid request scope: " + scope;
LOGGER.error(error);
throw new Exception(error);
}
ScopeProvider.instance.set(scope);
SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class);
query.addCondition("$resource/Profile/Category/text() eq '" + URI_RESOLVER_SERVICE_CATEGORY + "'")
.addCondition("$resource/Profile/Name/text() eq '" + URI_RESOLVER_SERVICE_NAME + "'")
.setResult("$resource/Profile/RunTime");
DiscoveryClient<Runtime> client = ICFactory.clientFor(Runtime.class);
List<Runtime> runtimeList = client.submit(query);
String serviceAddress = null;
if (runtimeList != null && !runtimeList.isEmpty()) {
for (int i = 0; i < runtimeList.size(); i++) {
Runtime accessPoint = runtimeList.get(i);
if (accessPoint != null) {
StringBuilder sb=new StringBuilder();
sb.append("https://");
sb.append(accessPoint.hostedOn());
sb.append("/oat/get");
serviceAddress=sb.toString();
break;
}
}
} else {
String error="RuntimeList error: "+runtimeList;
LOGGER.error(error);
throw new Exception(error);
}
LOGGER.info("Uri Resolver Oat Service Info: " + serviceAddress);
return serviceAddress;
} catch (Throwable e) {
LOGGER.error("Error in discovery Uri Resolver Oat Service Endpoint in scope: " + scope);
LOGGER.error(e.getLocalizedMessage(),e);
throw e;
}
}
}

93
src/main/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/TokenManager.java
View File

@ -2,59 +2,122 @@ package org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mapping;
import static org.gcube.common.authorization.client.Constants.authorizationService;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import javax.ws.rs.core.Response;
import org.gcube.common.authorization.library.AuthorizationEntry;
import org.gcube.common.authorization.library.provider.AccessTokenProvider;
import org.gcube.common.authorization.library.provider.AuthorizationProvider;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.dataanalysis.wps.statisticalmanager.synchserver.is.InformationSystemUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TokenManager {
private static final Logger LOGGER= LoggerFactory.getLogger(TokenManager.class);
private static final Logger LOGGER = LoggerFactory.getLogger(TokenManager.class);
String username;
String scope;
String token;
String tokenQualifier;
public String getScope(){
public String getScope() {
return scope;
}
public String getUserName(){
public String getUserName() {
return username;
}
public String getToken(){
public String getToken() {
return token;
}
public String getTokenQualifier() {
return tokenQualifier;
}
public void getCredentials() {
try{
LOGGER.debug("Retrieving token credentials");
//get username from SmartGears
try {
LOGGER.info("Retrieving token credentials");
// get username from SmartGears
username = AuthorizationProvider.instance.get().getClient().getId();
token = SecurityTokenProvider.instance.get();
if (token == null || token.isEmpty()) {
String jwtToken = AccessTokenProvider.instance.get();
scope = ScopeProvider.instance.get();
token = getGcubeTokenFromUriResolver(jwtToken, scope);
}
AuthorizationEntry entry = authorizationService().get(token);
scope = entry.getContext();
tokenQualifier = entry.getQualifier();
}catch(Exception e){
LOGGER.error("Error Retrieving token credentials ",e);
} catch (Exception e) {
LOGGER.error("Error Retrieving token credentials: "+e.getLocalizedMessage(),e);
scope = null;
username= null;
username = null;
}
if ((scope==null || username==null) && ConfigurationManager.isSimulationMode()){
if ((scope == null || username == null) && ConfigurationManager.isSimulationMode()) {
scope = ConfigurationManager.defaultScope;
username = ConfigurationManager.defaultUsername;
}
LOGGER.debug("Retrieved scope: {} Username: {} Token {} SIMULATION MODE: {} ",scope, username, token, ConfigurationManager.isSimulationMode());
LOGGER.info("Retrieved scope: {} Username: {} Token {} SIMULATION MODE: {} ", scope, username, token,
ConfigurationManager.isSimulationMode());
}
public String getGcubeTokenFromUriResolver(String jwtToken, String scope) throws Exception {
String gcubeToken = null;
String uriResolverOatURL = InformationSystemUtils.retrieveUriResolverOat(scope);
try {
LOGGER.info("Create Request: "+ uriResolverOatURL);
URL urlObj = new URL(uriResolverOatURL);
HttpURLConnection connection = (HttpURLConnection) urlObj.openConnection();
connection.setRequestMethod("GET");
connection.setRequestProperty("Authorization", "Bearer " + jwtToken);
connection.setDoOutput(true);
try (AutoCloseable conc = () -> connection.disconnect()) {
int responseCode = connection.getResponseCode();
LOGGER.info("Response Code: " + responseCode);
if (Response.Status.fromStatusCode(responseCode).compareTo(Response.Status.OK) == 0) {
try (InputStream ins = connection.getInputStream();
BufferedReader in = new BufferedReader(new InputStreamReader(ins))) {
String inputLine = null;
while ((inputLine = in.readLine()) != null) {
break;
}
gcubeToken = inputLine;
}
} else {
String error = "Invalid Response Code retrieving GCube Token from Uri Resolver: " + responseCode;
LOGGER.error(error);
try (InputStream ins = connection.getErrorStream();
BufferedReader in = new BufferedReader(new InputStreamReader(ins))) {
String inputLine = null;
while ((inputLine = in.readLine()) != null) {
LOGGER.error(inputLine);
}
}
throw new Exception(error);
}
}
} catch (IOException e) {
LOGGER.error("Error retrieving GcubeToken from Uri Resolver: "+e.getLocalizedMessage());
e.printStackTrace();
throw e;
}
LOGGER.info("Retrieved GcubeToken: "+gcubeToken);
return gcubeToken;
}
}

26
src/test/java/org/gcube/dataanalysis/wps/statisticalmanager/synchserver/mapping/TokenManagerTest.java Normal file
View File

@ -0,0 +1,26 @@
package org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mapping;
import org.apache.log4j.BasicConfigurator;
import org.junit.Test;
public class TokenManagerTest {
private static final String JWT_TOKEN = "";
private static final String SCOPE = "/gcube/devsec/devVRE";
@Test
public void retrieveTokenFromUriResolver() throws Exception {
try {
BasicConfigurator.configure();
System.out.println("Test Retrieve Token From Uri Resolver");
TokenManager tm = new TokenManager();
String token = tm.getGcubeTokenFromUriResolver(JWT_TOKEN, SCOPE);
System.out.println("GcubeToken retrieved: "+token);
} catch (Exception e) {
System.out.println(e.getLocalizedMessage());
e.getStackTrace();
}
}
}