gCubeSystem
/
common-authorization
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Compare commits

base: gCubeSystem:master
Branches Tags
gCubeSystem:master
gCubeSystem:r5.14.0
gCubeSystem:v2.5.1
gCubeSystem:r5.11.0
gCubeSystem:v2.5.0
gCubeSystem:r5.4.0
gCubeSystem:v2.4.0
gCubeSystem:r5.0.0
gCubeSystem:v2.3.0
gCubeSystem:r4.23.0
gCubeSystem:v2.2.1
gCubeSystem:r4.19.0
gCubeSystem:v2.2.0
gCubeSystem:r4.15.0
gCubeSystem:v2.1.5
..
compare: gCubeSystem:r5.11.0
Branches Tags
gCubeSystem:master
gCubeSystem:r5.14.0
gCubeSystem:v2.5.1
gCubeSystem:r5.11.0
gCubeSystem:v2.5.0
gCubeSystem:r5.4.0
gCubeSystem:v2.4.0
gCubeSystem:r5.0.0
gCubeSystem:v2.3.0
gCubeSystem:r4.23.0
gCubeSystem:v2.2.1
gCubeSystem:r4.19.0
gCubeSystem:v2.2.0
gCubeSystem:r4.15.0
gCubeSystem:v2.1.5

No commits in common. "master" and "r5.11.0" have entirely different histories.
master ... r5.11.0

41 changed files with 439 additions and 228 deletions
Show Stats Expand all files Collapse all files

10
.classpath
View File

@ -9,7 +9,6 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@ -19,14 +18,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>

6
.project
View File

@ -6,12 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
@ -27,6 +27,8 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

13
.settings/org.eclipse.jdt.core.prefs
View File

@ -1,8 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
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=11
org.eclipse.jdt.core.compiler.source=1.8

9
CHANGELOG.md
View File

@ -4,15 +4,6 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v3.0.1-SNAPSHOT] - [2024-02-02]
- authorization endpoints configuration retrieving moved from common scanner to reflection library
## [v3.0.0] - [2022-06-06]
- removed common-scope from the dependencies
## [v2.5.0] - [2022-04-20]
- Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]

108
pom.xml
View File

@ -1,69 +1,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.common</groupId>
<artifactId>common-authorization</artifactId>
<version>3.0.1-SNAPSHOT</version>
<name>authorization service common library</name>
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId>
<version>1.2.0</version>
</parent>
<scm>
<connection>
scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection>
<developerConnection>
scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection>
<url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url>
</scm>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.common</groupId>
<artifactId>common-authorization</artifactId>
<version>2.5.0</version>
<name>authorization service common library</name>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>3.0.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId>
<version>1.1.0</version>
</parent>
<scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection>
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection>
<url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url>
</scm>
<dependencies>
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-scope</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>
</dependencies>
</project>

28
src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
View File

@ -3,6 +3,13 @@ package org.gcube.common.authorization.library;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.policies.Policy;
import org.gcube.common.authorization.library.policies.Service2ServicePolicy;
import org.gcube.common.authorization.library.policies.User2ServicePolicy;
@ -11,13 +18,8 @@ import org.gcube.common.authorization.library.provider.ContainerInfo;
import org.gcube.common.authorization.library.provider.ExternalServiceInfo;
import org.gcube.common.authorization.library.provider.ServiceInfo;
import org.gcube.common.authorization.library.provider.UserInfo;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementRef;
import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.gcube.common.scope.api.ServiceMap;
import org.gcube.common.scope.impl.DefaultServiceMap;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@ -33,6 +35,9 @@ public class AuthorizationEntry {
private String context;
@XmlElementRef(type = DefaultServiceMap.class)
private ServiceMap map;
@XmlElementRefs({
@XmlElementRef(type = Service2ServicePolicy.class),
@XmlElementRef(type = User2ServicePolicy.class),
@ -63,11 +68,18 @@ public class AuthorizationEntry {
return context;
}
public ServiceMap getMap() {
return map;
}
public String getQualifier() {
return qualifier;
}
public void setMap(ServiceMap map) {
this.map = map;
}
public List<Policy> getPolicies() {
return policies;
}
@ -116,7 +128,7 @@ public class AuthorizationEntry {
@Override
public String toString() {
return "AuthorizationEntry [clientInfo=" + clientInfo + ", context="
+ context + ", qualifier=" + qualifier
+ context + ", map=" + map + ", qualifier=" + qualifier
+ ", policies=" + policies + "]";
}

96
src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java Normal file
View File

@ -0,0 +1,96 @@
package org.gcube.common.authorization.library;
import java.util.concurrent.Callable;
import org.gcube.common.authorization.library.provider.AccessTokenProvider;
import org.gcube.common.authorization.library.provider.AuthorizationProvider;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.authorization.library.utils.Caller;
import org.gcube.common.scope.api.ScopeProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AuthorizedTasks {
private static Logger logger= LoggerFactory.getLogger(AuthorizedTasks.class);
/**
* Binds a {@link Callable} task to the current scope and user.
* @param task the task
* @return an equivalent {@link Callable} task bound to the current scope and user
*/
static public <V> Callable<V> bind(final Callable<V> task) {
final Caller userCall = AuthorizationProvider.instance.get();
final String token = SecurityTokenProvider.instance.get();
final String scope = ScopeProvider.instance.get();
final String accessToken = AccessTokenProvider.instance.get();
return new Callable<V>() {
@Override
public V call() throws Exception {
AuthorizationProvider.instance.set(userCall);
SecurityTokenProvider.instance.set(token);
ScopeProvider.instance.set(scope);
AccessTokenProvider.instance.set(accessToken);
try {
logger.info("setting on authorized task scope {} and token {}", scope, token);
return task.call();
}
finally {
AuthorizationProvider.instance.reset();
SecurityTokenProvider.instance.reset();
ScopeProvider.instance.reset();
}
}
};
}
/**
* Binds a {@link Runnable} task to the current scope and user.
* @param task the task
* @return an equivalent {@link Runnable} task bound to the current scope and user
*/
static public <V> Runnable bind(final Runnable task) {
final Caller userCall = AuthorizationProvider.instance.get();
final String token = SecurityTokenProvider.instance.get();
final String scope = ScopeProvider.instance.get();
final String accessToken = AccessTokenProvider.instance.get();
return new Runnable() {
@Override
public void run() {
AuthorizationProvider.instance.set(userCall);
SecurityTokenProvider.instance.set(token);
ScopeProvider.instance.set(scope);
AccessTokenProvider.instance.set(accessToken);
try {
logger.info("setting on authorized task scope {} and token {}", scope, token);
task.run();
}
finally {
AuthorizationProvider.instance.reset();
SecurityTokenProvider.instance.reset();
ScopeProvider.instance.reset();
}
}
};
}
}

6
src/main/java/org/gcube/common/authorization/library/CalledService.java
View File

@ -1,8 +1,8 @@
package org.gcube.common.authorization.library;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

10
src/main/java/org/gcube/common/authorization/library/ExternalServiceList.java
View File

@ -3,12 +3,12 @@ package org.gcube.common.authorization.library;
import java.util.HashMap;
import java.util.Map;
import org.gcube.common.authorization.library.utils.MapAdapter;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.gcube.common.authorization.library.utils.MapAdapter;

12
src/main/java/org/gcube/common/authorization/library/Policies.java
View File

@ -3,16 +3,16 @@ package org.gcube.common.authorization.library;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.policies.Policy;
import org.gcube.common.authorization.library.policies.Service2ServicePolicy;
import org.gcube.common.authorization.library.policies.User2ServicePolicy;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElementRef;
import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class Policies {

10
src/main/java/org/gcube/common/authorization/library/QualifiersList.java
View File

@ -3,12 +3,12 @@ package org.gcube.common.authorization.library;
import java.util.HashMap;
import java.util.Map;
import org.gcube.common.authorization.library.utils.MapAdapter;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.gcube.common.authorization.library.utils.MapAdapter;

12
src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpoint.java → src/main/java/org/gcube/common/authorization/library/enpoints/AuthorizationEndpoint.java
View File

@ -1,10 +1,10 @@
package org.gcube.common.authorization.library.endpoints;
package org.gcube.common.authorization.library.enpoints;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name="authorization-endpoint")
@XmlAccessorType(XmlAccessType.FIELD)

59
src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpointScanner.java → src/main/java/org/gcube/common/authorization/library/enpoints/AuthorizationEndpointScanner.java
View File

@ -1,20 +1,21 @@
package org.gcube.common.authorization.library.endpoints;
package org.gcube.common.authorization.library.enpoints;
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.reflections.Reflections;
import org.reflections.scanners.ResourcesScanner;
import org.reflections.util.ClasspathHelper;
import org.reflections.util.ConfigurationBuilder;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
import org.gcube.common.scan.ClasspathScanner;
import org.gcube.common.scan.ClasspathScannerFactory;
import org.gcube.common.scan.matchers.NameMatcher;
import org.gcube.common.scan.resources.ClasspathResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.Unmarshaller;
public class AuthorizationEndpointScanner {
private static Logger log = LoggerFactory.getLogger(AuthorizationEndpointScanner.class);
@ -37,22 +38,17 @@ public class AuthorizationEndpointScanner {
try {
ConfigurationBuilder reflectionConf = new ConfigurationBuilder().addUrls(ClasspathHelper.forJavaClassPath()).addUrls(ClasspathHelper.forClassLoader()).addClassLoader(AuthorizationEndpointScanner.class.getClassLoader()).setScanners(new ResourcesScanner());
Reflections reflection = new Reflections(reflectionConf);
Set<String> resources = reflection.getResources((String input)-> input.endsWith(".authorization"));
log.info("loading resources {} ", resources);
JAXBContext context = JAXBContext.newInstance(AuthorizationEndpoint.class);
Unmarshaller um = context.createUnmarshaller();
String defaultInfrastructure = null;
int defaultInfraPriority= Integer.MAX_VALUE;
for (String resource: resources) {
log.info("loading {} ", resource);
URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
for (String r :getEnpointResourceNames()){
URL url = Thread.currentThread().getContextClassLoader().getResource(r);
AuthorizationEndpoint endpoint = (AuthorizationEndpoint)um.unmarshal(url);
if (defaultInfrastructure==null)
defaultInfrastructure = endpoint.getInfrastructure();
@ -60,7 +56,7 @@ public class AuthorizationEndpointScanner {
if (!endpointsMap.containsKey(endpoint.getInfrastructure())
|| endpointsMap.get(endpoint.getInfrastructure()).getPriority()> endpoint.getPriority()){
if (resource.startsWith("default") && endpoint.getPriority()<defaultInfraPriority ){
if (r.startsWith("default") && endpoint.getPriority()<defaultInfraPriority ){
defaultInfrastructure = endpoint.getInfrastructure();
defaultInfraPriority = endpoint.getPriority();
}
@ -68,22 +64,27 @@ public class AuthorizationEndpointScanner {
}
log.info("loaded endpoint {} ",endpoint.toString());
}
}
if (endpointsMap.size()==0)
throw new Exception("no endpoints retreived");
endpoints = new EndpointsContainer(endpointsMap, defaultInfrastructure);
log.trace("authorization endpoint retrieving finished");
} catch (Throwable e) {
log.error("error scanning auth endpoints",e);
throw new RuntimeException("could not load auth endpoints", e);
} catch (Exception e) {
throw new RuntimeException("could not load authorization endpoints", e);
}
}
return endpoints;
}
}
private static Set<String> getEnpointResourceNames() {
ClasspathScanner scanner = ClasspathScannerFactory.scanner();
Set<String> names = new HashSet<String>();
for (ClasspathResource r : scanner.scan(new NameMatcher(configurationPattern)))
names.add(r.name());
return names;
}
}

2
src/main/java/org/gcube/common/authorization/library/endpoints/EndpointsContainer.java → src/main/java/org/gcube/common/authorization/library/enpoints/EndpointsContainer.java
View File

@ -1,4 +1,4 @@
package org.gcube.common.authorization.library.endpoints;
package org.gcube.common.authorization.library.enpoints;
import java.util.Map;

6
src/main/java/org/gcube/common/authorization/library/policies/ExternalService.java
View File

@ -1,8 +1,8 @@
package org.gcube.common.authorization.library.policies;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

8
src/main/java/org/gcube/common/authorization/library/policies/Policy.java
View File

@ -2,10 +2,10 @@ package org.gcube.common.authorization.library.policies;
import java.util.Calendar;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/org/gcube/common/authorization/library/policies/Role.java
View File

@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies;
import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/org/gcube/common/authorization/library/policies/Service2ServicePolicy.java
View File

@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies;
import java.util.Calendar;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/org/gcube/common/authorization/library/policies/ServiceAccess.java
View File

@ -3,9 +3,9 @@ package org.gcube.common.authorization.library.policies;
import java.util.HashMap;
import java.util.Map.Entry;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/org/gcube/common/authorization/library/policies/ServiceEntity.java
View File

@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

6
src/main/java/org/gcube/common/authorization/library/policies/User.java
View File

@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies;
import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

10
src/main/java/org/gcube/common/authorization/library/policies/User2ServicePolicy.java
View File

@ -2,11 +2,11 @@ package org.gcube.common.authorization.library.policies;
import java.util.Calendar;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElementRef;
import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

8
src/main/java/org/gcube/common/authorization/library/policies/UserEntity.java
View File

@ -3,10 +3,10 @@ package org.gcube.common.authorization.library.policies;
import java.util.ArrayList;
import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

31
src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java Normal file
View File

@ -0,0 +1,31 @@
package org.gcube.common.authorization.library.provider;
@Deprecated
public class AccessTokenProvider {
public static AccessTokenProvider instance = new AccessTokenProvider();
private static final InheritableThreadLocal<String> threadToken = new InheritableThreadLocal<String>() {
@Override
protected String initialValue() {
return null;
}
};
private AccessTokenProvider() {
}
public String get() {
return threadToken.get();
}
public void set(String jwt) {
threadToken.set(jwt);
}
public void reset() {
threadToken.remove();
}
}

35
src/main/java/org/gcube/common/authorization/library/provider/AuthorizationProvider.java Normal file
View File

@ -0,0 +1,35 @@
package org.gcube.common.authorization.library.provider;
import org.gcube.common.authorization.library.utils.Caller;
@Deprecated
public class AuthorizationProvider {
public static AuthorizationProvider instance = new AuthorizationProvider();
// Thread local variable containing each thread's ID
private static final InheritableThreadLocal<Caller> threadAuth =
new InheritableThreadLocal<Caller>() {
@Override protected Caller initialValue() {
return null;
}
};
private AuthorizationProvider(){}
public Caller get(){
Caller info = threadAuth.get();
return info;
}
public void set(Caller info){
threadAuth.set(info);
}
public void reset(){
threadAuth.remove();
}
}

39
src/main/java/org/gcube/common/authorization/library/provider/CalledMethodProvider.java Normal file
View File

@ -0,0 +1,39 @@
package org.gcube.common.authorization.library.provider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class CalledMethodProvider {
public static CalledMethodProvider instance = new CalledMethodProvider();
private static Logger logger = LoggerFactory.getLogger(CalledMethodProvider.class);
// Thread local variable containing each thread's ID
private static final InheritableThreadLocal<String> threadMethod =
new InheritableThreadLocal<String>() {
@Override protected String initialValue() {
return "UNKNOWN";
}
};
private CalledMethodProvider(){}
public String get(){
String calledMethod = threadMethod.get();
logger.trace("getting calledMethod as "+calledMethod+" in thread "+Thread.currentThread().getId() );
return calledMethod;
}
public void set(String calledMethod){
if (calledMethod==null) return;
threadMethod.set(calledMethod);
logger.trace("setting calledMethod as "+calledMethod+" in thread "+Thread.currentThread().getId() );
}
public void reset(){
threadMethod.remove();
}
}

10
src/main/java/org/gcube/common/authorization/library/provider/ClientInfo.java
View File

@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
import java.io.Serializable;
import java.util.List;
import org.gcube.common.authorization.library.ClientType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
import org.gcube.common.authorization.library.ClientType;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

8
src/main/java/org/gcube/common/authorization/library/provider/ContainerInfo.java
View File

@ -3,11 +3,11 @@ package org.gcube.common.authorization.library.provider;
import java.util.Collections;
import java.util.List;
import org.gcube.common.authorization.library.ClientType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

8
src/main/java/org/gcube/common/authorization/library/provider/ExternalServiceInfo.java
View File

@ -3,11 +3,11 @@ package org.gcube.common.authorization.library.provider;
import java.util.Collections;
import java.util.List;
import org.gcube.common.authorization.library.ClientType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

33
src/main/java/org/gcube/common/authorization/library/provider/SecurityTokenProvider.java Normal file
View File

@ -0,0 +1,33 @@
package org.gcube.common.authorization.library.provider;
@Deprecated
public class SecurityTokenProvider {
public static SecurityTokenProvider instance = new SecurityTokenProvider();
//private static Logger logger = LoggerFactory.getLogger(SecurityTokenProvider.class);
// Thread local variable containing each thread's ID
private static final InheritableThreadLocal<String> threadToken =
new InheritableThreadLocal<String>() {
@Override protected String initialValue() {
return null;
}
};
private SecurityTokenProvider(){}
public String get(){
return threadToken.get();
}
public void set(String authorizationToken){
threadToken.set(authorizationToken);
}
public void reset(){
threadToken.remove();
}
}

6
src/main/java/org/gcube/common/authorization/library/provider/ServiceIdentifier.java
View File

@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.provider;
import java.io.Serializable;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

8
src/main/java/org/gcube/common/authorization/library/provider/ServiceInfo.java
View File

@ -3,11 +3,11 @@ package org.gcube.common.authorization.library.provider;
import java.util.Collections;
import java.util.List;
import org.gcube.common.authorization.library.ClientType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

8
src/main/java/org/gcube/common/authorization/library/provider/UserInfo.java
View File

@ -3,11 +3,11 @@ package org.gcube.common.authorization.library.provider;
import java.util.ArrayList;
import java.util.List;
import org.gcube.common.authorization.library.ClientType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType;
@XmlRootElement

4
src/main/java/org/gcube/common/authorization/library/utils/AuthorizationEntryList.java
View File

@ -3,9 +3,9 @@ package org.gcube.common.authorization.library.utils;
import java.util.ArrayList;
import java.util.List;
import org.gcube.common.authorization.library.AuthorizationEntry;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.AuthorizationEntry;
@XmlRootElement
public class AuthorizationEntryList {

2
src/main/java/org/gcube/common/authorization/library/utils/ListMapper.java
View File

@ -3,7 +3,7 @@ package org.gcube.common.authorization.library.utils;
import java.util.ArrayList;
import java.util.List;
import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class ListMapper {

2
src/main/java/org/gcube/common/authorization/library/utils/MapAdapter.java
View File

@ -3,7 +3,7 @@ package org.gcube.common.authorization.library.utils;
import java.util.HashMap;
import java.util.Map;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.bind.annotation.adapters.XmlAdapter;
public class MapAdapter extends XmlAdapter<MapElements[], Map<String, String>> {

2
src/main/java/org/gcube/common/authorization/library/utils/MapElement.java
View File

@ -1,6 +1,6 @@
package org.gcube.common.authorization.library.utils;
import jakarta.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElement;
class MapElements
{

8
src/main/java/org/gcube/common/authorization/library/utils/MultiServiceTokenRequest.java
View File

@ -3,11 +3,11 @@ package org.gcube.common.authorization.library.utils;
import java.util.ArrayList;
import java.util.List;
import org.gcube.common.authorization.library.provider.ServiceInfo;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.provider.ServiceInfo;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)

6
src/test/java/org/gcube/common/authorization/library/binder/AuthorizationEntryBinder.java
View File

@ -7,6 +7,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.gcube.common.authorization.library.AuthorizationEntry;
import org.gcube.common.authorization.library.QualifiersList;
import org.gcube.common.authorization.library.policies.Policy;
@ -14,9 +17,6 @@ import org.gcube.common.authorization.library.provider.UserInfo;
import org.junit.Assert;
import org.junit.Test;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
public class AuthorizationEntryBinder {
public static JAXBContext getContext() throws JAXBException{

10
src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java
View File

@ -5,14 +5,14 @@ import java.io.StringWriter;
import java.util.Arrays;
import java.util.Map;
import org.gcube.common.authorization.library.endpoints.AuthorizationEndpoint;
import org.gcube.common.authorization.library.endpoints.AuthorizationEndpointScanner;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.gcube.common.authorization.library.enpoints.AuthorizationEndpoint;
import org.gcube.common.authorization.library.enpoints.AuthorizationEndpointScanner;
import org.junit.Assert;
import org.junit.Test;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
public class EndpointBinder {

4
src/test/java/org/gcube/common/authorization/library/policies/SerializationTest.java
View File

@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.policies;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.bind.JAXBContext;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import jakarta.xml.bind.JAXBContext;
public class SerializationTest {
static JAXBContext context;