gCubeSystem
/
accounting-postgresql-utilities
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed static var

This commit is contained in:
Luca Frosini 2024-02-29 16:12:51 +01:00
parent c62ba9f3f9
commit ff4d7502d1
6 changed files with 145 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for Accounting Postgresql Utilities # Changelog for Accounting Postgresql Utilities
## [v2.0.0-SNAPSHOT]
- RecordToDBMapping is no more singleton
## [v1.0.0] ## [v1.0.0]

8
pom.xml
View File

@ -7,7 +7,7 @@
</parent> </parent>
<groupId>org.gcube.accounting</groupId> <groupId>org.gcube.accounting</groupId>
<artifactId>accounting-postgresql-utilities</artifactId> <artifactId>accounting-postgresql-utilities</artifactId>
<version>1.0.0</version> <version>2.0.0-SNAPSHOT</version>
<name>Accounting Postgresql Utilities</name> <name>Accounting Postgresql Utilities</name>
<description>Utility classes to persist/query Record in PostgreSQL database</description> <description>Utility classes to persist/query Record in PostgreSQL database</description>
@ -45,6 +45,12 @@
<version>42.2.19</version> <version>42.2.19</version>
</dependency> </dependency>
<!-- Test Dependencies --> <!-- Test Dependencies -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>authorization-utils</artifactId>
<version>[2.2.0, 3.0.0-SNAPSHOT)</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.accounting</groupId> <groupId>org.gcube.accounting</groupId>
<artifactId>accounting-lib</artifactId> <artifactId>accounting-lib</artifactId>

13
src/main/java/org/gcube/accounting/utility/postgresql/RecordToDBMapping.java
View File

@ -22,15 +22,19 @@ public class RecordToDBMapping {
} }
} }
protected final static Map<String, RecordToDBFields> classToRecordToDBMapper; protected static final Map<String, RecordToDBFields> classToRecordToDBMapper;
protected final static Map<String, RecordToDBConnection> recordToDBInfo;
static { static {
classToRecordToDBMapper = new HashMap<>(); classToRecordToDBMapper = new HashMap<>();
}
protected final Map<String, RecordToDBConnection> recordToDBInfo;
public RecordToDBMapping() {
recordToDBInfo= new HashMap<>(); recordToDBInfo= new HashMap<>();
} }
public static void addRecordToDB(Class<? extends AggregatedRecord<?, ?>> clz, PersistenceBackendConfiguration configuration) throws Exception { public void addRecordToDB(Class<? extends AggregatedRecord<?, ?>> clz, PersistenceBackendConfiguration configuration) throws Exception {
String type = getRecordTypeByClass(clz); String type = getRecordTypeByClass(clz);
getRecordToDBFields(clz); getRecordToDBFields(clz);
RecordToDBConnection recordDBInfo = new RecordToDBConnection(type, clz, configuration); RecordToDBConnection recordDBInfo = new RecordToDBConnection(type, clz, configuration);
@ -54,8 +58,9 @@ public class RecordToDBMapping {
return recordToDBFields; return recordToDBFields;
} }
public static synchronized RecordToDBConnection getRecordDBInfo(Class<? extends Record> clz) throws Exception { public synchronized RecordToDBConnection getRecordDBInfo(Class<? extends Record> clz) throws Exception {
String type = getRecordTypeByClass(clz); String type = getRecordTypeByClass(clz);
return recordToDBInfo.get(type); return recordToDBInfo.get(type);
} }
} }

3
src/main/resources/AccountingManagerTables.sql
View File

@ -16,10 +16,11 @@ CREATE TABLE "aggregation_status"(
recovered_records_number NUMERIC NOT NULL, recovered_records_number NUMERIC NOT NULL,
malformed_records_number NUMERIC NOT NULL DEFAULT 0, malformed_records_number NUMERIC NOT NULL DEFAULT 0,
percentage NUMERIC NOT NULL, percentage NUMERIC NOT NULL,
restart_from NUMERIC NOT NULL DEFAULT 0,
context TEXT, context TEXT,
current_aggregation_state aggregation_state NOT NULL, current_aggregation_state aggregation_state NOT NULL,
last_update_time TIMESTAMP WITH TIME ZONE NOT NULL, last_update_time TIMESTAMP WITH TIME ZONE NOT NULL,
previous UUID REFERENCES aggregation_status (id) previous UUID REFERENCES aggregation_status (id) DEFAULT NULL ON DELETE SET NULL
); );
CREATE TABLE "aggregation_status_event"( CREATE TABLE "aggregation_status_event"(

177
src/test/java/org/gcube/accounting/utility/postgresql/ContextTest.java
View File

@ -7,14 +7,14 @@ 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.JWTSecret;
import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.utils.secret.Secret;
import org.gcube.common.authorization.library.provider.ClientInfo; import org.gcube.common.authorization.utils.secret.SecretUtility;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.keycloak.KeycloakClientFactory;
import org.gcube.common.authorization.library.utils.Caller; import org.gcube.common.keycloak.KeycloakClientHelper;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.keycloak.model.TokenResponse;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -27,80 +27,147 @@ public class ContextTest {
private static final Logger logger = LoggerFactory.getLogger(ContextTest.class); private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
protected static Properties properties; protected static final String CONFIG_INI_FILENAME = "config.ini";
protected static final String PROPERTIES_FILENAME = "token.properties";
public static final String PARENT_DEFAULT_TEST_SCOPE;
public static final String DEFAULT_TEST_SCOPE; public static final String DEFAULT_TEST_SCOPE;
public static final String ALTERNATIVE_TEST_SCOPE;
public static final String DEFAULT_TEST_SCOPE_ANOTHER_USER; public static final String GCUBE;
public static final String DEVNEXT;
public static final String NEXTNEXT;
public static final String DEVSEC;
public static final String DEVVRE;
public static final String ROOT_PROD;
protected static final Properties properties;
public static final String TYPE_PROPERTY_KEY = "type";
public static final String USERNAME_PROPERTY_KEY = "username";
public static final String PASSWORD_PROPERTY_KEY = "password";
public static final String CLIENT_ID_PROPERTY_KEY = "clientId";
static { static {
properties = new Properties(); GCUBE = "/gcube";
InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(PROPERTIES_FILENAME); DEVNEXT = GCUBE + "/devNext";
NEXTNEXT = DEVNEXT + "/NextNext";
DEVSEC = GCUBE + "/devsec";
DEVVRE = DEVSEC + "/devVRE";
ROOT_PROD = "/d4science.research-infrastructures.eu";
DEFAULT_TEST_SCOPE = GCUBE;
properties = new Properties();
InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(CONFIG_INI_FILENAME);
try { try {
// load the properties file // load the properties file
properties.load(input); properties.load(input);
} catch(IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// PARENT_DEFAULT_TEST_SCOPE = "/pred4s" }
// DEFAULT_TEST_SCOPE_NAME = PARENT_DEFAULT_TEST_SCOPE + "/preprod";
// ALTERNATIVE_TEST_SCOPE = DEFAULT_TEST_SCOPE_NAME + "/preVRE"; private enum Type{
USER, CLIENT_ID
};
public static void set(Secret secret) throws Exception {
SecretManagerProvider.instance.reset();
SecretManager secretManager = new SecretManager();
secretManager.addSecret(secret);
SecretManagerProvider.instance.set(secretManager);
SecretManagerProvider.instance.get().set();
}
public static void setContextByName(String fullContextName) throws Exception {
logger.debug("Going to set credentials for context {}", fullContextName);
Secret secret = getSecretByContextName(fullContextName);
set(secret);
}
private static TokenResponse getJWTAccessToken(String context) throws Exception {
Type type = Type.valueOf(properties.get(TYPE_PROPERTY_KEY).toString());
TokenResponse tr = null;
PARENT_DEFAULT_TEST_SCOPE = "/gcube"; int index = context.indexOf('/', 1);
DEFAULT_TEST_SCOPE = PARENT_DEFAULT_TEST_SCOPE + "/devNext"; String root = context.substring(0, index == -1 ? context.length() : index);
ALTERNATIVE_TEST_SCOPE = DEFAULT_TEST_SCOPE + "/NextNext";
DEFAULT_TEST_SCOPE_ANOTHER_USER = "lucio.lelii_" + DEFAULT_TEST_SCOPE; switch (type) {
case CLIENT_ID:
String clientId = properties.getProperty(CLIENT_ID_PROPERTY_KEY);
String clientSecret = properties.getProperty(root);
tr = KeycloakClientFactory.newInstance().queryUMAToken(context, clientId, clientSecret, context, null);
break;
case USER:
default:
String username = properties.getProperty(USERNAME_PROPERTY_KEY);
String password = properties.getProperty(PASSWORD_PROPERTY_KEY);
switch (root) {
case "/gcube":
default:
clientId = "next.d4science.org";
break;
case "/pred4s":
clientId = "pre.d4science.org";
break;
case "/d4science.research-infrastructures.eu":
clientId = "services.d4science.org";
break;
}
clientSecret = null;
tr = KeycloakClientHelper.getTokenForUser(context, username, password);
break;
}
return tr;
}
public static Secret getSecretByContextName(String context) throws Exception {
TokenResponse tr = getJWTAccessToken(context);
Secret secret = new JWTSecret(tr.getAccessToken());
return secret;
}
public static void setContext(String token) throws Exception {
Secret secret = getSecret(token);
set(secret);
}
private static Secret getSecret(String token) throws Exception {
Secret secret = SecretUtility.getSecretByTokenString(token);
return secret;
}
public static String getUser() {
String user = "UNKNOWN";
try { try {
setContextByName(DEFAULT_TEST_SCOPE); user = SecretManagerProvider.instance.get().getUser().getUsername();
} catch(Exception e) { } catch(Exception e) {
throw new RuntimeException(e); logger.error("Unable to retrieve user. {} will be used", user);
} }
} return user;
public static String getCurrentContextFullName() throws ObjectNotFound, Exception {
return getContextFullNameByToken(SecurityTokenProvider.instance.get());
}
public static String getContextFullNameByToken(String token) throws ObjectNotFound, Exception {
AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
String context = authorizationEntry.getContext();
logger.info("Context of token {} is {}", token, context);
return context;
}
public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
String token = ContextTest.properties.getProperty(fullContextName);
setContext(token);
}
private 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(getContextFullNameByToken(token));
} }
@BeforeClass @BeforeClass
public static void beforeClass() throws Exception { public static void beforeClass() throws Exception {
setContextByName(DEFAULT_TEST_SCOPE); setContextByName(ROOT_PROD);
} }
@AfterClass @AfterClass
public static void afterClass() throws Exception { public static void afterClass() throws Exception {
SecurityTokenProvider.instance.reset(); SecretManagerProvider.instance.reset();
ScopeProvider.instance.reset();
} }
} }

1
src/test/resources/.gitignore vendored
View File

@ -2,3 +2,4 @@
/devNext.gcubekey /devNext.gcubekey
/devsec.gcubekey /devsec.gcubekey
/gcube.gcubekey /gcube.gcubekey
/config.ini