From 5cdc51d173ce351449094f1118273a19e344a440 Mon Sep 17 00:00:00 2001 From: lucio Date: Wed, 25 May 2022 18:57:35 +0200 Subject: [PATCH] first commit --- CHANGELOG.md | 4 ++-- .../gcube/common/security}/providers/ClientIDManager.java | 2 +- .../gcube/common/security}/providers/RenewalProvider.java | 2 +- .../common/security}/providers/SecretManagerProvider.java | 2 +- .../java/org/gcube/common/security/secrets/JWTSecret.java | 3 +-- .../java/org/gcube/common/security/secrets/SecretUtility.java | 2 -- 6 files changed, 6 insertions(+), 9 deletions(-) rename src/main/java/{ => org/gcube/common/security}/providers/ClientIDManager.java (96%) rename src/main/java/{ => org/gcube/common/security}/providers/RenewalProvider.java (79%) rename src/main/java/{ => org/gcube/common/security}/providers/SecretManagerProvider.java (93%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c9e16b..42c1dec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -# Changelog for Common Smartgears +# Changelog for Gcube security -## [v.1.0.0] - 2013-10-24 +## [v1.0.0-SNAPSHOT] - 2022-05-23 - First Release diff --git a/src/main/java/providers/ClientIDManager.java b/src/main/java/org/gcube/common/security/providers/ClientIDManager.java similarity index 96% rename from src/main/java/providers/ClientIDManager.java rename to src/main/java/org/gcube/common/security/providers/ClientIDManager.java index 12bacfc..1210cbf 100644 --- a/src/main/java/providers/ClientIDManager.java +++ b/src/main/java/org/gcube/common/security/providers/ClientIDManager.java @@ -1,4 +1,4 @@ -package providers; +package org.gcube.common.security.providers; import org.gcube.common.keycloak.KeycloakClientFactory; import org.gcube.common.keycloak.model.TokenResponse; diff --git a/src/main/java/providers/RenewalProvider.java b/src/main/java/org/gcube/common/security/providers/RenewalProvider.java similarity index 79% rename from src/main/java/providers/RenewalProvider.java rename to src/main/java/org/gcube/common/security/providers/RenewalProvider.java index 63ab8a3..de5b760 100644 --- a/src/main/java/providers/RenewalProvider.java +++ b/src/main/java/org/gcube/common/security/providers/RenewalProvider.java @@ -1,4 +1,4 @@ -package providers; +package org.gcube.common.security.providers; import org.gcube.common.security.secrets.Secret; diff --git a/src/main/java/providers/SecretManagerProvider.java b/src/main/java/org/gcube/common/security/providers/SecretManagerProvider.java similarity index 93% rename from src/main/java/providers/SecretManagerProvider.java rename to src/main/java/org/gcube/common/security/providers/SecretManagerProvider.java index 2864c68..2e62504 100644 --- a/src/main/java/providers/SecretManagerProvider.java +++ b/src/main/java/org/gcube/common/security/providers/SecretManagerProvider.java @@ -1,4 +1,4 @@ -package providers; +package org.gcube.common.security.providers; import org.gcube.common.security.secrets.Secret; diff --git a/src/main/java/org/gcube/common/security/secrets/JWTSecret.java b/src/main/java/org/gcube/common/security/secrets/JWTSecret.java index 2a2622c..9d03f3b 100644 --- a/src/main/java/org/gcube/common/security/secrets/JWTSecret.java +++ b/src/main/java/org/gcube/common/security/secrets/JWTSecret.java @@ -14,11 +14,10 @@ import org.gcube.common.keycloak.model.TokenResponse; import org.gcube.common.keycloak.model.util.Time; import org.gcube.common.security.Caller; import org.gcube.common.security.GCubeJWTObject; +import org.gcube.common.security.providers.RenewalProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import providers.RenewalProvider; - /** * @author Luca Frosini (ISTI - CNR) */ diff --git a/src/main/java/org/gcube/common/security/secrets/SecretUtility.java b/src/main/java/org/gcube/common/security/secrets/SecretUtility.java index f991fe9..e8cf4cf 100644 --- a/src/main/java/org/gcube/common/security/secrets/SecretUtility.java +++ b/src/main/java/org/gcube/common/security/secrets/SecretUtility.java @@ -2,8 +2,6 @@ package org.gcube.common.security.secrets; import java.util.regex.Pattern; -import org.gcube.common.security.secrets.Secret; - /** * @author Luca Frosini (ISTI - CNR) */