From 86bbb1947199af6f4dee1c5b70b24e5acf877728 Mon Sep 17 00:00:00 2001 From: lucio Date: Wed, 21 Feb 2024 20:24:06 +0100 Subject: [PATCH] removed unuseful instance from SecurityManageProvider --- .classpath | 13 +------- .settings/org.eclipse.jdt.core.prefs | 6 ++-- pom.xml | 33 ++++++++++--------- .../common/security/AuthorizedTasks.java | 24 +++++++------- .../providers/SecretManagerProvider.java | 10 ++---- 5 files changed, 36 insertions(+), 50 deletions(-) diff --git a/.classpath b/.classpath index 002ad57..4559ca0 100644 --- a/.classpath +++ b/.classpath @@ -6,11 +6,6 @@ - - - - - @@ -18,13 +13,7 @@ - - - - - - - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2f5cc74..2af1e7b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=11 diff --git a/pom.xml b/pom.xml index 13befbc..31f496c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,35 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.gcube.common - common-security - 1.0.0 - gcube security - - scm:git:https://code-repo.d4science.org/gCubeSystem/common-security - scm:git:https://code-repo.d4science.org/gCubeSystem/common-security - https://code-repo.d4science.org/gCubeSystem/common-security - - - - 1.8 - 1.8 - - maven-parent org.gcube.tools 1.2.0 + org.gcube.common + common-security + 1.0.0 + gcube security + + + scm:git:https://code-repo.d4science.org/gCubeSystem/common-security + scm:git:https://code-repo.d4science.org/gCubeSystem/common-security + https://code-repo.d4science.org/gCubeSystem/common-security + + + + 11 + 11 + + org.gcube.distribution gcube-bom - 3.0.0 + 3.0.1-SNAPSHOT pom import diff --git a/src/main/java/org/gcube/common/security/AuthorizedTasks.java b/src/main/java/org/gcube/common/security/AuthorizedTasks.java index 7cea94a..5720eda 100644 --- a/src/main/java/org/gcube/common/security/AuthorizedTasks.java +++ b/src/main/java/org/gcube/common/security/AuthorizedTasks.java @@ -20,20 +20,20 @@ public class AuthorizedTasks { static public Callable bind(final Callable task) { - final Secret secret = SecretManagerProvider.instance.get(); + final Secret secret = SecretManagerProvider.get(); return new Callable() { @Override public V call() throws Exception { - SecretManagerProvider.instance.set(secret); + SecretManagerProvider.set(secret); try { logger.info("setting on authorized task context {} ", secret.getContext()); return task.call(); } finally { - SecretManagerProvider.instance.reset(); + SecretManagerProvider.reset(); } } @@ -48,20 +48,20 @@ public class AuthorizedTasks { static public Runnable bind(final Runnable task) { - final Secret secret = SecretManagerProvider.instance.get(); + final Secret secret = SecretManagerProvider.get(); return new Runnable() { @Override public void run() { - SecretManagerProvider.instance.set(secret); + SecretManagerProvider.set(secret); try { logger.info("setting on authorized task context {} ", secret.getContext()); task.run(); } finally { - SecretManagerProvider.instance.reset(); + SecretManagerProvider.reset(); } } @@ -75,12 +75,12 @@ public class AuthorizedTasks { * @return an equivalent {@link Runnable} task bound to the current scope and user */ static public void executeSafely(final Runnable task, final Secret secret){ - Secret previousSecret = SecretManagerProvider.instance.get(); + Secret previousSecret = SecretManagerProvider.get(); try { - SecretManagerProvider.instance.set(secret); + SecretManagerProvider.set(secret); task.run(); } finally { - SecretManagerProvider.instance.set(previousSecret); + SecretManagerProvider.set(previousSecret); } } @@ -92,12 +92,12 @@ public class AuthorizedTasks { * @return an equivalent {@link Runnable} task bound to the current scope and user */ static public T executeSafely(final Callable task, final Secret secret) throws Throwable { - Secret previousSecret = SecretManagerProvider.instance.get(); + Secret previousSecret = SecretManagerProvider.get(); try { - SecretManagerProvider.instance.set(secret); + SecretManagerProvider.set(secret); return task.call(); } finally { - SecretManagerProvider.instance.set(previousSecret); + SecretManagerProvider.set(previousSecret); } } diff --git a/src/main/java/org/gcube/common/security/providers/SecretManagerProvider.java b/src/main/java/org/gcube/common/security/providers/SecretManagerProvider.java index 2e62504..e6319a6 100644 --- a/src/main/java/org/gcube/common/security/providers/SecretManagerProvider.java +++ b/src/main/java/org/gcube/common/security/providers/SecretManagerProvider.java @@ -7,8 +7,6 @@ import org.gcube.common.security.secrets.Secret; */ public class SecretManagerProvider { - public static SecretManagerProvider instance = new SecretManagerProvider(); - // Thread local variable containing each thread's ID private static final InheritableThreadLocal thread = new InheritableThreadLocal() { @@ -18,19 +16,17 @@ public class SecretManagerProvider { } }; - - private SecretManagerProvider(){} - public Secret get(){ + public static Secret get(){ Secret secret = thread.get(); return secret; } - public void set(Secret secret){ + public static void set(Secret secret){ thread.set(secret); } - public void reset(){ + public static void reset(){ thread.remove(); }