gCubeSystem
/
gcat
16
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Switching code to SecretManagerProvider

This commit is contained in:
Luca Frosini 2022-02-28 15:43:40 +01:00
parent c0cca0aa07
commit f797247c5f
18 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/gcube/gcat/configuration/CatalogueConfigurationFactory.java
View File

@ -3,7 +3,7 @@ package org.gcube.gcat.configuration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
/** /**
* @author Luca Frosini (ISTI - CNR) * @author Luca Frosini (ISTI - CNR)
@ -22,7 +22,7 @@ public class CatalogueConfigurationFactory {
} }
public synchronized static ServiceCatalogueConfiguration getInstance() { public synchronized static ServiceCatalogueConfiguration getInstance() {
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
ServiceCatalogueConfiguration catalogueConfiguration = catalogueConfigurations.get(context); ServiceCatalogueConfiguration catalogueConfiguration = catalogueConfigurations.get(context);
if(catalogueConfiguration == null) { if(catalogueConfiguration == null) {
catalogueConfiguration = load(context); catalogueConfiguration = load(context);
@ -32,7 +32,7 @@ public class CatalogueConfigurationFactory {
} }
public synchronized static void renew() { public synchronized static void renew() {
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
catalogueConfigurations.remove(context); catalogueConfigurations.remove(context);
ServiceCatalogueConfiguration catalogueConfiguration = load(context); ServiceCatalogueConfiguration catalogueConfiguration = load(context);
catalogueConfigurations.put(context, catalogueConfiguration); catalogueConfigurations.put(context, catalogueConfiguration);
@ -40,14 +40,14 @@ public class CatalogueConfigurationFactory {
public synchronized static void purge() { public synchronized static void purge() {
// Remove the resource from IS // Remove the resource from IS
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
catalogueConfigurations.remove(context); catalogueConfigurations.remove(context);
GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context); GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context);
gCoreISConfigurationProxy.delete(); gCoreISConfigurationProxy.delete();
} }
public synchronized static ServiceCatalogueConfiguration createOrUpdate(ServiceCatalogueConfiguration catalogueConfiguration) throws Exception { public synchronized static ServiceCatalogueConfiguration createOrUpdate(ServiceCatalogueConfiguration catalogueConfiguration) throws Exception {
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
catalogueConfigurations.remove(context); catalogueConfigurations.remove(context);
GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context, catalogueConfiguration); GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context, catalogueConfiguration);
catalogueConfiguration = gCoreISConfigurationProxy.createOrUpdateOnIS(); catalogueConfiguration = gCoreISConfigurationProxy.createOrUpdateOnIS();

4
src/main/java/org/gcube/gcat/configuration/GCoreISConfigurationProxy.java
View File

@ -21,7 +21,7 @@ import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.resources.gcore.GenericResource; import org.gcube.common.resources.gcore.GenericResource;
import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.ServiceEndpoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
@ -166,7 +166,7 @@ public class GCoreISConfigurationProxy {
*/ */
private List<ServiceEndpoint> getServiceEndpoints(String category, String name) { private List<ServiceEndpoint> getServiceEndpoints(String category, String name) {
SimpleQuery query = queryFor(ServiceEndpoint.class); SimpleQuery query = queryFor(ServiceEndpoint.class);
query.addCondition("$resource/Scopes/Scope/text() eq '" + SecretManager.instance.get().getContext() + "'"); query.addCondition("$resource/Scopes/Scope/text() eq '" + SecretManagerProvider.instance.get().getContext() + "'");
query.addCondition("$resource/Profile/Category/text() eq '" + category + "'"); query.addCondition("$resource/Profile/Category/text() eq '" + category + "'");
query.addCondition("$resource/Profile/Name/text() eq '" + name + "'"); query.addCondition("$resource/Profile/Name/text() eq '" + name + "'");
DiscoveryClient<ServiceEndpoint> client = clientFor(ServiceEndpoint.class); DiscoveryClient<ServiceEndpoint> client = clientFor(ServiceEndpoint.class);

4
src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java
View File

@ -1,6 +1,6 @@
package org.gcube.gcat.moderation.thread; package org.gcube.gcat.moderation.thread;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.gcat.api.moderation.CMItemStatus; import org.gcube.gcat.api.moderation.CMItemStatus;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -21,7 +21,7 @@ public class FakeModerationThread extends ModerationThread {
@Override @Override
public void postUserMessage(CMItemStatus cmItemStatus, String userMessage) throws Exception { public void postUserMessage(CMItemStatus cmItemStatus, String userMessage) throws Exception {
logger.info("{} is sending a message to the {} for item '{}' (id={}). ItemStatus={}, Message=\"{}\"", logger.info("{} is sending a message to the {} for item '{}' (id={}). ItemStatus={}, Message=\"{}\"",
SecretManager.instance.get().getUser().getUsername(), SecretManagerProvider.instance.get().getUser().getUsername(),
ModerationThread.class.getSimpleName(), itemName, itemID, cmItemStatus, userMessage); ModerationThread.class.getSimpleName(), itemName, itemID, cmItemStatus, userMessage);
} }

5
src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java
View File

@ -8,6 +8,7 @@ import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.utils.secret.Secret; import org.gcube.common.authorization.utils.secret.Secret;
import org.gcube.gcat.api.moderation.CMItemStatus; import org.gcube.gcat.api.moderation.CMItemStatus;
import org.gcube.gcat.api.moderation.Moderated; import org.gcube.gcat.api.moderation.Moderated;
@ -47,13 +48,13 @@ public class ZulipStream extends ModerationThread {
} }
protected ZulipRestExecutor getZulipRestExecutor() { protected ZulipRestExecutor getZulipRestExecutor() {
ZulipAuth zulipAuth = new ZulipAuth(SecretManager.instance.get().getUser().getUsername()); ZulipAuth zulipAuth = new ZulipAuth(SecretManagerProvider.instance.get().getUser().getUsername());
return new ZulipRestExecutor(zulipAuth.getEmail(), zulipAuth.getAPIKey(), zulipAuth.getSite()); return new ZulipRestExecutor(zulipAuth.getEmail(), zulipAuth.getAPIKey(), zulipAuth.getSite());
} }
public ZulipRestExecutor getGCatZulipRestExecutor() throws Exception { public ZulipRestExecutor getGCatZulipRestExecutor() throws Exception {
if(gCatZulipRestExecutor==null) { if(gCatZulipRestExecutor==null) {
SecretManager secretManager = SecretManager.instance.get(); SecretManager secretManager = SecretManagerProvider.instance.get();
Secret secret = Constants.getCatalogueSecret(); Secret secret = Constants.getCatalogueSecret();
secretManager.startSession(secret); secretManager.startSession(secret);
gCatZulipRestExecutor = getZulipRestExecutor(); gCatZulipRestExecutor = getZulipRestExecutor();

4
src/main/java/org/gcube/gcat/persistence/ckan/CKANOrganization.java
View File

@ -2,7 +2,7 @@ package org.gcube.gcat.persistence.ckan;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -68,7 +68,7 @@ public class CKANOrganization extends CKAN {
} }
public static String getCKANOrganizationName() { public static String getCKANOrganizationName() {
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
return getCKANOrganizationName(context); return getCKANOrganizationName(context);
} }

4
src/main/java/org/gcube/gcat/persistence/ckan/CKANResource.java
View File

@ -20,7 +20,7 @@ import org.apache.tika.mime.MimeType;
import org.apache.tika.mime.MimeTypes; import org.apache.tika.mime.MimeTypes;
import org.gcube.com.fasterxml.jackson.databind.JsonNode; import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.gxhttp.request.GXHTTPStringRequest; import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
import org.gcube.gcat.utils.Constants; import org.gcube.gcat.utils.Constants;
import org.gcube.gcat.utils.HTTPCall; import org.gcube.gcat.utils.HTTPCall;
@ -69,7 +69,7 @@ public class CKANResource extends CKAN {
public static final String URI_RESOLVER_STORAGE_HUB_PATH = "/shub/"; public static final String URI_RESOLVER_STORAGE_HUB_PATH = "/shub/";
static { static {
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
if(context.startsWith("/gcube")) { if(context.startsWith("/gcube")) {
URI_RESOLVER_STORAGE_HUB_HOST = URI_RESOLVER_STORAGE_HUB_HOST_DEV; URI_RESOLVER_STORAGE_HUB_HOST = URI_RESOLVER_STORAGE_HUB_HOST_DEV;
} else if(context.startsWith("/pred4s")){ } else if(context.startsWith("/pred4s")){

18
src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java
View File

@ -7,7 +7,7 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.utils.user.User; import org.gcube.common.authorization.utils.user.User;
import org.gcube.gcat.api.moderation.Moderated; import org.gcube.gcat.api.moderation.Moderated;
import org.gcube.gcat.api.roles.Role; import org.gcube.gcat.api.roles.Role;
@ -82,7 +82,7 @@ public class CKANUser extends CKAN {
* @return true if the display name and the full name has been updated in objectNode * @return true if the display name and the full name has been updated in objectNode
*/ */
private boolean checkAndSetJobTitle(ObjectNode objectNode) { private boolean checkAndSetJobTitle(ObjectNode objectNode) {
String jobTitle = SecretManager.instance.get().getUser().getAbout(); String jobTitle = SecretManagerProvider.instance.get().getUser().getAbout();
String ckanJobTitle = ""; String ckanJobTitle = "";
if(objectNode.has(ABOUT)) { if(objectNode.has(ABOUT)) {
@ -121,7 +121,7 @@ public class CKANUser extends CKAN {
* @return true if the display name and the full name has been updated * @return true if the display name and the full name has been updated
*/ */
private boolean checkAndSetEmail(ObjectNode objectNode) { private boolean checkAndSetEmail(ObjectNode objectNode) {
String portalEmail = SecretManager.instance.get().getUser().getEmail(); String portalEmail = SecretManagerProvider.instance.get().getUser().getEmail();
String ckanEmail = ""; String ckanEmail = "";
if(objectNode.has(EMAIL)) { if(objectNode.has(EMAIL)) {
@ -194,7 +194,7 @@ public class CKANUser extends CKAN {
} }
public static String getCKANUsername() { public static String getCKANUsername() {
String username = SecretManager.instance.get().getUser().getUsername(); String username = SecretManagerProvider.instance.get().getUser().getUsername();
return getCKANUsername(username); return getCKANUsername(username);
} }
@ -215,7 +215,7 @@ public class CKANUser extends CKAN {
public Role getRole() { public Role getRole() {
if(role == null) { if(role == null) {
role = Role.MEMBER; role = Role.MEMBER;
Collection<String> roles = SecretManager.instance.get().getUser().getRoles(); Collection<String> roles = SecretManagerProvider.instance.get().getUser().getRoles();
for(String portalRole : roles) { for(String portalRole : roles) {
Role gotRole = Role.getRoleFromPortalRole(portalRole); Role gotRole = Role.getRoleFromPortalRole(portalRole);
if(gotRole != null && gotRole.ordinal() > role.ordinal()) { if(gotRole != null && gotRole.ordinal() > role.ordinal()) {
@ -252,23 +252,23 @@ public class CKANUser extends CKAN {
public boolean isCatalogueModerator() { public boolean isCatalogueModerator() {
if(catalogueModerator == null) { if(catalogueModerator == null) {
catalogueModerator = SecretManager.instance.get().getUser().getRoles().contains(Moderated.CATALOGUE_MODERATOR); catalogueModerator = SecretManagerProvider.instance.get().getUser().getRoles().contains(Moderated.CATALOGUE_MODERATOR);
} }
return catalogueModerator; return catalogueModerator;
} }
public String getSurnameName(){ public String getSurnameName(){
User user = SecretManager.instance.get().getUser(); User user = SecretManagerProvider.instance.get().getUser();
return String.format("%s %s", user.getFamilyName(), user.getGivenName()).trim(); return String.format("%s %s", user.getFamilyName(), user.getGivenName()).trim();
} }
public String getNameSurname() { public String getNameSurname() {
User user = SecretManager.instance.get().getUser(); User user = SecretManagerProvider.instance.get().getUser();
return String.format("%s %s", user.getGivenName(), user.getFamilyName()).trim(); return String.format("%s %s", user.getGivenName(), user.getFamilyName()).trim();
} }
public String getEMail() { public String getEMail() {
return SecretManager.instance.get().getUser().getEmail(); return SecretManagerProvider.instance.get().getUser().getEmail();
} }
} }

3
src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java
View File

@ -13,6 +13,7 @@ import javax.cache.expiry.Duration;
import javax.cache.spi.CachingProvider; import javax.cache.spi.CachingProvider;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
public abstract class CKANUserCache { public abstract class CKANUserCache {
@ -37,7 +38,7 @@ public abstract class CKANUserCache {
} }
public static CKANUser getCurrrentCKANUser() { public static CKANUser getCurrrentCKANUser() {
SecretManager secretManager = SecretManager.instance.get(); SecretManager secretManager = SecretManagerProvider.instance.get();
String context = secretManager.getContext(); String context = secretManager.getContext();
Cache<String,CKANUser> userCache = userCachePerContext.get(context); Cache<String,CKANUser> userCache = userCachePerContext.get(context);
if(userCache == null) { if(userCache == null) {

6
src/main/java/org/gcube/gcat/rest/Configuration.java
View File

@ -23,7 +23,7 @@ import javax.xml.ws.WebServiceException;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.gcat.annotation.PATCH; import org.gcube.gcat.annotation.PATCH;
import org.gcube.gcat.annotation.PURGE; import org.gcube.gcat.annotation.PURGE;
import org.gcube.gcat.api.GCatConstants; import org.gcube.gcat.api.GCatConstants;
@ -50,7 +50,7 @@ public class Configuration extends BaseREST implements org.gcube.gcat.api.interf
throw new BadRequestException("Please provide a valid context as path parameter"); throw new BadRequestException("Please provide a valid context as path parameter");
} }
String c = SecretManager.instance.get().getContext(); String c = SecretManagerProvider.instance.get().getContext();
if(context.compareTo(Configuration.CURRENT_CONTEXT_PATH_PARAMETER)==0) { if(context.compareTo(Configuration.CURRENT_CONTEXT_PATH_PARAMETER)==0) {
return c; return c;
} }
@ -203,7 +203,7 @@ public class Configuration extends BaseREST implements org.gcube.gcat.api.interf
if(node.has(ServiceCatalogueConfiguration.CONTEXT_KEY)) { if(node.has(ServiceCatalogueConfiguration.CONTEXT_KEY)) {
String context = node.get(ServiceCatalogueConfiguration.CONTEXT_KEY).asText(); String context = node.get(ServiceCatalogueConfiguration.CONTEXT_KEY).asText();
String c = SecretManager.instance.get().getContext(); String c = SecretManagerProvider.instance.get().getContext();
if(c.compareTo(context)!=0) { if(c.compareTo(context)!=0) {
throw new BadRequestException("Context provided in the configuration (i.e. " + catalogueConfiguration.getContext() + ") does not match with token request context (i.e. " + c + ")"); throw new BadRequestException("Context provided in the configuration (i.e. " + catalogueConfiguration.getContext() + ") does not match with token request context (i.e. " + c + ")");
} }

4
src/main/java/org/gcube/gcat/social/SocialPost.java
View File

@ -12,7 +12,7 @@ import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.utils.socialservice.SocialService; import org.gcube.common.authorization.utils.socialservice.SocialService;
import org.gcube.common.gxhttp.request.GXHTTPStringRequest; import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
import org.gcube.gcat.api.configuration.CatalogueConfiguration; import org.gcube.gcat.api.configuration.CatalogueConfiguration;
@ -121,7 +121,7 @@ public class SocialPost extends Thread {
CatalogueConfiguration instance = CatalogueConfigurationFactory.getInstance(); CatalogueConfiguration instance = CatalogueConfigurationFactory.getInstance();
if(!instance.isSocialPostEnabled()) { if(!instance.isSocialPostEnabled()) {
logger.info("Social Post are disabled in the context {}", SecretManager.instance.get().getContext()); logger.info("Social Post are disabled in the context {}", SecretManagerProvider.instance.get().getContext());
return; return;
} }
logger.info("Going to send Social Post about the Item {} available at {}", itemID, itemURL); logger.info("Going to send Social Post about the Item {} available at {}", itemID, itemURL);

6
src/main/java/org/gcube/gcat/utils/Constants.java
View File

@ -5,7 +5,7 @@ import java.util.Properties;
import javax.ws.rs.InternalServerErrorException; import javax.ws.rs.InternalServerErrorException;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.utils.secret.JWTSecret; import org.gcube.common.authorization.utils.secret.JWTSecret;
import org.gcube.common.authorization.utils.secret.Secret; import org.gcube.common.authorization.utils.secret.Secret;
import org.gcube.common.keycloak.KeycloakClientFactory; import org.gcube.common.keycloak.KeycloakClientFactory;
@ -34,12 +34,12 @@ public class Constants {
return clientSecret; return clientSecret;
} catch(Exception e) { } catch(Exception e) {
throw new InternalServerErrorException( throw new InternalServerErrorException(
"Unable to retrieve Application Token for context " + SecretManager.instance.get().getContext(), e); "Unable to retrieve Application Token for context " + SecretManagerProvider.instance.get().getContext(), e);
} }
} }
private static TokenResponse getJWTAccessToken() throws Exception { private static TokenResponse getJWTAccessToken() throws Exception {
String contextToAuthorise = SecretManager.instance.get().getContext(); String contextToAuthorise = SecretManagerProvider.instance.get().getContext();
TokenResponse tr = KeycloakClientFactory.newInstance().queryUMAToken(CLIENT_ID, getClientSecret(contextToAuthorise), contextToAuthorise, null); TokenResponse tr = KeycloakClientFactory.newInstance().queryUMAToken(CLIENT_ID, getClientSecret(contextToAuthorise), contextToAuthorise, null);
return tr; return tr;
} }

4
src/main/java/org/gcube/gcat/utils/URIResolver.java
View File

@ -5,7 +5,7 @@ import java.util.Map;
import javax.ws.rs.WebApplicationException; import javax.ws.rs.WebApplicationException;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.portlets.user.uriresolvermanager.UriResolverManager; import org.gcube.portlets.user.uriresolvermanager.UriResolverManager;
public abstract class URIResolver { public abstract class URIResolver {
@ -19,7 +19,7 @@ public abstract class URIResolver {
public static String getCatalogueItemURL(String name) { public static String getCatalogueItemURL(String name) {
try { try {
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
UriResolverManager uriResolverManager = new UriResolverManager("CTLG"); UriResolverManager uriResolverManager = new UriResolverManager("CTLG");
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
params.put(CATALOGUE_CONTEXT, context); params.put(CATALOGUE_CONTEXT, context);

11
src/main/java/org/gcube/gcat/workspace/CatalogueStorageHubManagement.java
View File

@ -5,6 +5,7 @@ import java.net.URL;
import java.util.Map; import java.util.Map;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.utils.secret.Secret; import org.gcube.common.authorization.utils.secret.Secret;
import org.gcube.common.gxhttp.request.GXHTTPStringRequest; import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
import org.gcube.common.storagehub.client.dsl.FileContainer; import org.gcube.common.storagehub.client.dsl.FileContainer;
@ -44,7 +45,7 @@ public class CatalogueStorageHubManagement {
} }
public URL ensureResourcePersistence(URL persistedURL, String itemID, String resourceID) throws Exception { public URL ensureResourcePersistence(URL persistedURL, String itemID, String resourceID) throws Exception {
SecretManager secretManager = SecretManager.instance.get(); SecretManager secretManager = SecretManagerProvider.instance.get();
Secret secret = Constants.getCatalogueSecret(); Secret secret = Constants.getCatalogueSecret();
try { try {
secretManager.startSession(secret); secretManager.startSession(secret);
@ -70,7 +71,7 @@ public class CatalogueStorageHubManagement {
} }
public void deleteResourcePersistence(String itemID, String resourceID, String mimeType) throws Exception { public void deleteResourcePersistence(String itemID, String resourceID, String mimeType) throws Exception {
SecretManager secretManager = SecretManager.instance.get(); SecretManager secretManager = SecretManagerProvider.instance.get();
Secret secret = Constants.getCatalogueSecret(); Secret secret = Constants.getCatalogueSecret();
try { try {
secretManager.startSession(secret); secretManager.startSession(secret);
@ -100,7 +101,7 @@ public class CatalogueStorageHubManagement {
} }
public void renameFile(String resourceID, String revisionID) throws Exception { public void renameFile(String resourceID, String revisionID) throws Exception {
SecretManager secretManager = SecretManager.instance.get(); SecretManager secretManager = SecretManagerProvider.instance.get();
Secret secret = Constants.getCatalogueSecret(); Secret secret = Constants.getCatalogueSecret();
try { try {
secretManager.startSession(secret); secretManager.startSession(secret);
@ -114,7 +115,7 @@ public class CatalogueStorageHubManagement {
} }
public void addRevisionID(String resourceID, String revisionID) throws Exception { public void addRevisionID(String resourceID, String revisionID) throws Exception {
SecretManager secretManager = SecretManager.instance.get(); SecretManager secretManager = SecretManagerProvider.instance.get();
Secret secret = Constants.getCatalogueSecret(); Secret secret = Constants.getCatalogueSecret();
try { try {
secretManager.startSession(secret); secretManager.startSession(secret);
@ -125,7 +126,7 @@ public class CatalogueStorageHubManagement {
} }
public FileContainer retrievePersistedFile(String id, String mimeType) throws Exception { public FileContainer retrievePersistedFile(String id, String mimeType) throws Exception {
SecretManager secretManager = SecretManager.instance.get(); SecretManager secretManager = SecretManagerProvider.instance.get();
Secret secret = Constants.getCatalogueSecret(); Secret secret = Constants.getCatalogueSecret();
try { try {
secretManager.startSession(secret); secretManager.startSession(secret);

9
src/test/java/org/gcube/gcat/ContextTest.java
View File

@ -8,6 +8,7 @@ import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.utils.secret.Secret; import org.gcube.common.authorization.utils.secret.Secret;
import org.gcube.common.authorization.utils.secret.SecretUtility; import org.gcube.common.authorization.utils.secret.SecretUtility;
import org.junit.AfterClass; import org.junit.AfterClass;
@ -48,8 +49,10 @@ public class ContextTest {
} }
public static void set(Secret secret) throws Exception { public static void set(Secret secret) throws Exception {
SecretManager.instance.get().reset(); SecretManagerProvider.instance.reset();
secret.set(); SecretManager secretManager = SecretManagerProvider.instance.get();
secretManager.addSecret(secret);
secretManager.set();
} }
public static void setContext(String token) throws Exception { public static void setContext(String token) throws Exception {
@ -79,7 +82,7 @@ public class ContextTest {
@AfterClass @AfterClass
public static void afterClass() throws Exception { public static void afterClass() throws Exception {
SecretManager.instance.get().reset(); SecretManagerProvider.instance.reset();
} }
} }

10
src/test/java/org/gcube/gcat/configuration/GCoreISConfigurationProxyTest.java
View File

@ -6,7 +6,7 @@ import java.io.InputStreamReader;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.gcat.ContextTest; import org.gcube.gcat.ContextTest;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -23,7 +23,7 @@ public class GCoreISConfigurationProxyTest extends ContextTest {
// @Test // @Test
public void testGetSupportedOrganizationsFromIS() throws Exception { public void testGetSupportedOrganizationsFromIS() throws Exception {
ContextTest.setContextByName("/gcube/devNext/NextNext"); ContextTest.setContextByName("/gcube/devNext/NextNext");
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context); GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context);
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
Set<String> organizations = gCoreISConfigurationProxy.getSupportedOrganizationsFromGenericResource(); Set<String> organizations = gCoreISConfigurationProxy.getSupportedOrganizationsFromGenericResource();
@ -33,7 +33,7 @@ public class GCoreISConfigurationProxyTest extends ContextTest {
@Test @Test
public void testCatalogueConfiguration() throws Exception { public void testCatalogueConfiguration() throws Exception {
ContextTest.setContextByName("/gcube/devsec/devVRE"); ContextTest.setContextByName("/gcube/devsec/devVRE");
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context); GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context);
ServiceCatalogueConfiguration catalogueConfiguration = gCoreISConfigurationProxy.getCatalogueConfigurationFromIS(); ServiceCatalogueConfiguration catalogueConfiguration = gCoreISConfigurationProxy.getCatalogueConfigurationFromIS();
String json = catalogueConfiguration.toJsonString(); String json = catalogueConfiguration.toJsonString();
@ -54,7 +54,7 @@ public class GCoreISConfigurationProxyTest extends ContextTest {
// @Test // @Test
public void updateConfigurationToNewVersion() throws Exception { public void updateConfigurationToNewVersion() throws Exception {
ContextTest.setContextByName("/gcube/devsec/devVRE"); ContextTest.setContextByName("/gcube/devsec/devVRE");
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context); GCoreISConfigurationProxy gCoreISConfigurationProxy = new GCoreISConfigurationProxy(context);
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
ServiceCatalogueConfiguration catalogueConfiguration = gCoreISConfigurationProxy.getOLDCatalogueConfigurationFromIS(); ServiceCatalogueConfiguration catalogueConfiguration = gCoreISConfigurationProxy.getOLDCatalogueConfigurationFromIS();
@ -70,7 +70,7 @@ public class GCoreISConfigurationProxyTest extends ContextTest {
//@Test //@Test
public void createConfiguration() throws Exception { public void createConfiguration() throws Exception {
ContextTest.setContextByName("/gcube/devsec/devVRE"); ContextTest.setContextByName("/gcube/devsec/devVRE");
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(DEVVRE_CONFIG_JSON); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(DEVVRE_CONFIG_JSON);
String json = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining("\n")); String json = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining("\n"));
ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json); ServiceCatalogueConfiguration catalogueConfiguration = ServiceCatalogueConfiguration.getServiceCatalogueConfiguration(json);

4
src/test/java/org/gcube/gcat/persistence/ckan/CKANOrganizationTest.java
View File

@ -3,7 +3,7 @@ package org.gcube.gcat.persistence.ckan;
import org.gcube.com.fasterxml.jackson.databind.JsonNode; import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean;
import org.gcube.gcat.ContextTest; import org.gcube.gcat.ContextTest;
import org.gcube.gcat.api.configuration.CatalogueConfiguration; import org.gcube.gcat.api.configuration.CatalogueConfiguration;
@ -60,7 +60,7 @@ public class CKANOrganizationTest extends ContextTest {
@Test @Test
public void createOrganization() throws Exception { public void createOrganization() throws Exception {
ContextTest.setContextByName("/gcube/devNext/NextNext"); ContextTest.setContextByName("/gcube/devNext/NextNext");
String context = SecretManager.instance.get().getContext(); String context = SecretManagerProvider.instance.get().getContext();
ScopeBean scopeBean = new ScopeBean(context); ScopeBean scopeBean = new ScopeBean(context);
CKANOrganization ckanOrganization = new CKANOrganization(); CKANOrganization ckanOrganization = new CKANOrganization();
ckanOrganization.setApiKey(CKANUtility.getSysAdminAPI()); ckanOrganization.setApiKey(CKANUtility.getSysAdminAPI());

6
src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
View File

@ -22,7 +22,7 @@ import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode; import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.library.provider.UserInfo; import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean;
import org.gcube.gcat.ContextTest; import org.gcube.gcat.ContextTest;
import org.gcube.gcat.api.GCatConstants; import org.gcube.gcat.api.GCatConstants;
@ -54,7 +54,7 @@ public class CKANPackageTest extends ContextTest {
public void count() throws Exception { public void count() throws Exception {
CKANPackage ckanPackage = new CKANPackage(); CKANPackage ckanPackage = new CKANPackage();
int count = ckanPackage.count(); int count = ckanPackage.count();
logger.debug("Number of items in {} is {}", SecretManager.instance.get().getContext(), count); logger.debug("Number of items in {} is {}", SecretManagerProvider.instance.get().getContext(), count);
} }
@Test @Test
@ -311,7 +311,7 @@ public class CKANPackageTest extends ContextTest {
} }
protected CKANPackage createPackage(ObjectMapper mapper, Boolean socialPost) throws Exception { protected CKANPackage createPackage(ObjectMapper mapper, Boolean socialPost) throws Exception {
String currentContext = SecretManager.instance.get().getContext(); String currentContext = SecretManagerProvider.instance.get().getContext();
ScopeBean scopeBean = new ScopeBean(currentContext); ScopeBean scopeBean = new ScopeBean(currentContext);
String organization = CatalogueConfiguration.getOrganizationName(scopeBean); String organization = CatalogueConfiguration.getOrganizationName(scopeBean);

4
src/test/java/org/gcube/gcat/utils/ConstantsTest.java
View File

@ -1,6 +1,6 @@
package org.gcube.gcat.utils; package org.gcube.gcat.utils;
import org.gcube.common.authorization.utils.manager.SecretManager; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.encryption.encrypter.StringEncrypter; import org.gcube.common.encryption.encrypter.StringEncrypter;
import org.gcube.gcat.ContextTest; import org.gcube.gcat.ContextTest;
import org.junit.Test; import org.junit.Test;
@ -13,7 +13,7 @@ public class ConstantsTest extends ContextTest {
@Test @Test
public void testGetApplicationToken() throws Exception { public void testGetApplicationToken() throws Exception {
logger.debug("Application token for Context {} is {}", SecretManager.instance.get().getContext(), logger.debug("Application token for Context {} is {}", SecretManagerProvider.instance.get().getContext(),
Constants.getCatalogueSecret().getToken()); Constants.getCatalogueSecret().getToken());
} }