moved Authorization interfaces to common security
This commit is contained in:
parent
c5c57f5b34
commit
d2aaf739ee
|
@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for Common Smartgears
|
||||
|
||||
## [v4.0.0]
|
||||
## [v4.0.0-SNAPSHOT]
|
||||
|
||||
- porting to keycloak
|
||||
- moved to jakarta and servlet6
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -10,7 +10,7 @@
|
|||
</parent>
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-smartgears</artifactId>
|
||||
<version>4.0.0</version>
|
||||
<version>4.0.0-SNAPSHOT</version>
|
||||
<name>SmartGears</name>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
package org.gcube.smartgears.configuration;
|
||||
|
||||
import org.gcube.common.security.credentials.Credentials;
|
||||
import org.gcube.common.security.factories.AuthorizationProviderFactory;
|
||||
import org.gcube.common.validator.annotations.IsValid;
|
||||
import org.gcube.common.validator.annotations.NotNull;
|
||||
import org.gcube.smartgears.security.AuthorizationProviderFactory;
|
||||
|
||||
public class AuthorizationProviderConfiguration {
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ import java.util.Map.Entry;
|
|||
import java.util.stream.Collectors;
|
||||
|
||||
import org.gcube.common.security.credentials.Credentials;
|
||||
import org.gcube.common.security.factories.AuthorizationProviderFactory;
|
||||
import org.gcube.smartgears.configuration.AuthorizationProviderConfiguration;
|
||||
import org.gcube.smartgears.configuration.ComponentConfiguration;
|
||||
import org.gcube.smartgears.configuration.ConfiguredWith;
|
||||
|
@ -21,7 +22,6 @@ import org.gcube.smartgears.handlers.container.lifecycle.ContainerProfileManager
|
|||
import org.gcube.smartgears.persistence.LocalWriter;
|
||||
import org.gcube.smartgears.persistence.LocalWriterConfiguration;
|
||||
import org.gcube.smartgears.persistence.PersistenceWriter;
|
||||
import org.gcube.smartgears.security.AuthorizationProviderFactory;
|
||||
import org.gcube.smartgears.security.defaults.DefaultAuthorizationProviderFactory;
|
||||
import org.gcube.smartgears.utils.Utils;
|
||||
import org.ini4j.Ini;
|
||||
|
|
|
@ -4,13 +4,13 @@ import java.nio.file.Path;
|
|||
import java.util.List;
|
||||
|
||||
import org.gcube.common.events.Hub;
|
||||
import org.gcube.common.security.factories.AuthorizationProvider;
|
||||
import org.gcube.common.security.secrets.Secret;
|
||||
import org.gcube.smartgears.configuration.application.ApplicationConfiguration;
|
||||
import org.gcube.smartgears.context.Properties;
|
||||
import org.gcube.smartgears.context.container.ContainerContext;
|
||||
import org.gcube.smartgears.lifecycle.application.ApplicationLifecycle;
|
||||
import org.gcube.smartgears.persistence.PersistenceWriter;
|
||||
import org.gcube.smartgears.security.AuthorizationProvider;
|
||||
import org.gcube.smartgears.security.secrets.SecretFactory;
|
||||
|
||||
import jakarta.servlet.ServletContext;
|
||||
|
|
|
@ -14,6 +14,7 @@ import java.util.List;
|
|||
import java.util.UUID;
|
||||
|
||||
import org.gcube.common.events.Hub;
|
||||
import org.gcube.common.security.factories.AuthorizationProvider;
|
||||
import org.gcube.common.security.secrets.Secret;
|
||||
import org.gcube.smartgears.configuration.PersistenceConfiguration;
|
||||
import org.gcube.smartgears.configuration.application.ApplicationConfiguration;
|
||||
|
@ -21,7 +22,6 @@ import org.gcube.smartgears.context.Properties;
|
|||
import org.gcube.smartgears.context.container.ContainerContext;
|
||||
import org.gcube.smartgears.lifecycle.application.ApplicationLifecycle;
|
||||
import org.gcube.smartgears.persistence.PersistenceWriter;
|
||||
import org.gcube.smartgears.security.AuthorizationProvider;
|
||||
import org.gcube.smartgears.security.secrets.GCubeKeyCloakSecretFactory;
|
||||
import org.gcube.smartgears.security.secrets.LegacyGCubeTokenSecretFactory;
|
||||
import org.gcube.smartgears.security.secrets.SecretFactory;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package org.gcube.smartgears.context.container;
|
||||
|
||||
import org.gcube.common.events.Hub;
|
||||
import org.gcube.common.security.factories.AuthorizationProvider;
|
||||
import org.gcube.smartgears.configuration.container.ContainerConfiguration;
|
||||
import org.gcube.smartgears.context.Properties;
|
||||
import org.gcube.smartgears.lifecycle.container.ContainerLifecycle;
|
||||
import org.gcube.smartgears.persistence.PersistenceWriter;
|
||||
import org.gcube.smartgears.security.AuthorizationProvider;
|
||||
|
||||
/**
|
||||
* The management context of the container.
|
||||
|
|
|
@ -8,12 +8,12 @@ import java.io.ObjectInputStream;
|
|||
import java.util.UUID;
|
||||
|
||||
import org.gcube.common.events.Hub;
|
||||
import org.gcube.common.security.factories.AuthorizationProvider;
|
||||
import org.gcube.smartgears.configuration.PersistenceConfiguration;
|
||||
import org.gcube.smartgears.configuration.container.ContainerConfiguration;
|
||||
import org.gcube.smartgears.context.Properties;
|
||||
import org.gcube.smartgears.lifecycle.container.ContainerLifecycle;
|
||||
import org.gcube.smartgears.persistence.PersistenceWriter;
|
||||
import org.gcube.smartgears.security.AuthorizationProvider;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
|
|
@ -18,6 +18,8 @@ import jakarta.servlet.ServletContext;
|
|||
import org.gcube.common.events.Hub;
|
||||
import org.gcube.common.events.impl.DefaultHub;
|
||||
import org.gcube.common.security.credentials.Credentials;
|
||||
import org.gcube.common.security.factories.AuthorizationProvider;
|
||||
import org.gcube.common.security.factories.AuthorizationProviderFactory;
|
||||
import org.gcube.smartgears.configuration.SmartgearsConfiguration;
|
||||
import org.gcube.smartgears.configuration.application.ApplicationConfiguration;
|
||||
import org.gcube.smartgears.configuration.application.ApplicationConfigurationBinder;
|
||||
|
@ -36,8 +38,6 @@ import org.gcube.smartgears.lifecycle.application.ApplicationLifecycle;
|
|||
import org.gcube.smartgears.lifecycle.container.ContainerLifecycle;
|
||||
import org.gcube.smartgears.publishing.Publisher;
|
||||
import org.gcube.smartgears.publishing.SmartgearsProfilePublisher;
|
||||
import org.gcube.smartgears.security.AuthorizationProvider;
|
||||
import org.gcube.smartgears.security.AuthorizationProviderFactory;
|
||||
import org.gcube.smartgears.utils.Utils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
package org.gcube.smartgears.security;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import org.gcube.common.security.credentials.Credentials;
|
||||
import org.gcube.common.security.secrets.Secret;
|
||||
|
||||
public interface AuthorizationProvider {
|
||||
|
||||
Set<String> getContexts();
|
||||
|
||||
Secret getSecretForContext(String context);
|
||||
|
||||
@Deprecated
|
||||
Credentials getCredentials();
|
||||
|
||||
}
|
|
@ -1,9 +0,0 @@
|
|||
package org.gcube.smartgears.security;
|
||||
|
||||
import org.gcube.common.security.credentials.Credentials;
|
||||
|
||||
public interface AuthorizationProviderFactory<T extends AuthorizationProvider> {
|
||||
|
||||
T connect(Credentials credentials);
|
||||
|
||||
}
|
|
@ -12,9 +12,9 @@ import org.gcube.common.keycloak.model.AccessToken.Access;
|
|||
import org.gcube.common.keycloak.model.ModelUtils;
|
||||
import org.gcube.common.keycloak.model.TokenResponse;
|
||||
import org.gcube.common.security.ContextBean;
|
||||
import org.gcube.common.security.factories.AuthorizationProvider;
|
||||
import org.gcube.common.security.secrets.Secret;
|
||||
import org.gcube.common.security.secrets.UmaTokenSecret;
|
||||
import org.gcube.smartgears.security.AuthorizationProvider;
|
||||
import org.gcube.smartgears.security.SimpleCredentials;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
@ -3,10 +3,10 @@ package org.gcube.smartgears.security.defaults;
|
|||
import java.util.List;
|
||||
|
||||
import org.gcube.common.security.credentials.Credentials;
|
||||
import org.gcube.common.security.factories.AuthorizationProviderFactory;
|
||||
import org.gcube.common.validator.ValidationError;
|
||||
import org.gcube.common.validator.ValidatorFactory;
|
||||
import org.gcube.common.validator.annotations.NotEmpty;
|
||||
import org.gcube.smartgears.security.AuthorizationProviderFactory;
|
||||
import org.gcube.smartgears.security.SimpleCredentials;
|
||||
|
||||
public class DefaultAuthorizationProviderFactory implements AuthorizationProviderFactory<DefaultAuthorizationProvider>{
|
||||
|
|
Loading…
Reference in New Issue