gCubeSystem
/
common-authorization
15
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:v2.2.1
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 "v2.2.1" have entirely different histories.
master ... v2.2.1

52 changed files with 725 additions and 311 deletions
Show Stats Expand all files Collapse all files

11
.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>
@ -34,6 +26,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

1
.gitignore vendored
View File

@ -1 +0,0 @@
/target/

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>

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

@ -1,8 +1,13 @@
eclipse.preferences.version=1
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.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.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

45
CHANGELOG.md
View File

@ -1,51 +1,48 @@
# Changelog
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.0]
- Authorization endpoints configuration retrieving moved from common scanner to reflection library
- Removed common-scope from the dependencies
## [v2.2.1] - [2019-01-14]
endpoint updated for https
## [v2.5.0] - 2022-04-20
- Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]
- Added roles to ExternalService Client info
## [v2.1.6] - [2019-01-14]
## [v2.4.0] - 2021-05-21
added ListMapper
- JWTUmaTokenProvider changed to AccessTokenProvider
## [v2.3.1] - 2021-03-30
- User info returns also email, first name and Last name according to the new UMA token
## [v2.1.3] - [2019-01-14]
## [v2.3.0] - 2010-11-17
added the support for authorization control library
- Support for the new IAM added
## [v2.2.1] - 2019-01-14
- Endpoint updated for https
## [v2.1.6] - 2019-01-14
## [v2.0.2] - [2017-02-27]
- Added ListMapper
added set and reset of scope in AuthorizedTask
## [v2.1.3] - 2019-01-14
- Added the support for authorization control library
## [v2.0.2] - 2017-02-27
- Added set and reset of scope in AuthorizedTask
## [v2.0.0] - [2016-09-30]
new model for auth2
## [v1.0.0] - [2015-05-18]
First Release
## [v2.0.0] - 2016-09-30
- New model for auth2
## [v1.0.0] - 2015-05-18
- First Release

26
FUNDING.md
View File

@ -1,26 +0,0 @@
# Acknowledgments
The projects leading to this software have received funding from a series of European Union programmes including:
- the Sixth Framework Programme for Research and Technological Development
- [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
- the Seventh Framework Programme for research, technological development and demonstration
- [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
- [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
- [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
- [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
- [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
- the H2020 research and innovation programme
- [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
- [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
- [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
- [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
- [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
- [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
- [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
- [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
- [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
- [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
- [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
- [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
- [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);

17
changelog.xml Normal file
View File

@ -0,0 +1,17 @@
<ReleaseNotes>
<Changeset component="authorization-library-1.0.0" date="2015-05-18">
<Change>First Release</Change>
</Changeset>
<Changeset component="authorization-library-2.0.0" date="2016-09-30">
<Change>new model for auth2</Change>
</Changeset>
<Changeset component="authorization-library-2.0.2" date="2017-02-27">
<Change>added set and reset of scope in AuthorizedTask</Change>
</Changeset>
<Changeset component="authorization-library-2.1.3" date="2019-01-14">
<Change>added the support for authorization control library</Change>
</Changeset>
<Changeset component="authorization-library-2.1.6" date="2019-01-14">
<Change>added ListMapper</Change>
</Changeset>
</ReleaseNotes>

33
descriptor.xml Normal file
View File

@ -0,0 +1,33 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>servicearchive</id>
<formats>
<format>tar.gz</format>
</formats>
<baseDirectory>/</baseDirectory>
<fileSets>
<fileSet>
<directory>.</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>README.md</include>
<include>LICENSE.md</include>
<include>changelog.xml</include>
<include>profile.xml</include>
</includes>
<fileMode>755</fileMode>
<filtered>true</filtered>
</fileSet>
</fileSets>
<files>
<file>
<source>target/${build.finalName}.jar</source>
<outputDirectory>/${artifactId}</outputDirectory>
</file>
</files>
</assembly>

1
distro/LICENSE Normal file
View File

@ -0,0 +1 @@
${gcube.license}

64
distro/README Normal file
View File

@ -0,0 +1,64 @@
The gCube System - ${name}
--------------------------------------------------
${description}
${gcube.description}
${gcube.funding}
Version
--------------------------------------------------
${version} (${buildDate})
Please see the file named "changelog.xml" in this directory for the release notes.
Authors
--------------------------------------------------
* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
Maintainers
--------------------------------------------------
* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy
Download information
--------------------------------------------------
Source code is available from SVN:
${scm.url}
Binaries can be downloaded from the gCube website:
${gcube.website}
Installation
--------------------------------------------------
Installation documentation is available on-line in the gCube Wiki:
${gcube.wikiRoot}
Documentation
--------------------------------------------------
Documentation is available on-line in the gCube Wiki:
${gcube.wikiRoot}
Support
--------------------------------------------------
Bugs and support requests can be reported in the gCube issue tracking tool:
${gcube.issueTracking}
Licensing
--------------------------------------------------
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.

14
distro/changelog.xml Normal file
View File

@ -0,0 +1,14 @@
<ReleaseNotes>
<Changeset component="authorization-library-1.0.0" date="2015-05-18">
<Change>First Release</Change>
</Changeset>
<Changeset component="authorization-library-2.0.0" date="2016-09-30">
<Change>new model for auth2</Change>
</Changeset>
<Changeset component="authorization-library-2.0.2" date="2017-02-27">
<Change>added set and reset of scope in AuthorizedTask</Change>
</Changeset>
<Changeset component="authorization-library-2.1.3" date="2019-01-14">
<Change>added the support for authorization control library</Change>
</Changeset>
</ReleaseNotes>

36
distro/descriptor.xml Normal file
View File

@ -0,0 +1,36 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>servicearchive</id>
<formats>
<format>tar.gz</format>
</formats>
<baseDirectory>/</baseDirectory>
<fileSets>
<fileSet>
<directory>${distroDirectory}</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>README</include>
<include>LICENSE</include>
<include>changelog.xml</include>
<include>profile.xml</include>
</includes>
<fileMode>755</fileMode>
<filtered>true</filtered>
</fileSet>
</fileSets>
<files>
<!-- <file>
<source>${distroDirectory}/profile.xml</source>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
</file>-->
<file>
<source>target/${build.finalName}.jar</source>
<outputDirectory>/${artifactId}</outputDirectory>
</file>
</files>
</assembly>

26
distro/profile.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ID />
<Type>Service</Type>
<Profile>
<Description>${description}</Description>
<Class>Common</Class>
<Name>${artifactId}</Name>
<Version>1.0.0</Version>
<Packages>
<Software>
<Name>${artifactId}</Name>
<Version>${version}</Version>
<MavenCoordinates>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
</MavenCoordinates>
<Files>
<File>${build.finalName}.jar</File>
</Files>
</Software>
</Packages>
</Profile>
</Resource>

165
pom.xml
View File

@ -1,69 +1,98 @@
<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.0</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.2.1</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>4.0.0</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>
<properties>
<distroDirectory>distro</distroDirectory>
</properties>
<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>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>copy-profile</id>
<phase>install</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target</outputDirectory>
<resources>
<resource>
<directory>.</directory>
<filtering>true</filtering>
<includes>
<include>profile.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>descriptor.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>servicearchive</id>
<phase>install</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

26
profile.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ID />
<Type>Service</Type>
<Profile>
<Description>${description}</Description>
<Class>Common</Class>
<Name>${artifactId}</Name>
<Version>1.0.0</Version>
<Packages>
<Software>
<Name>${artifactId}</Name>
<Version>${version}</Version>
<MavenCoordinates>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
</MavenCoordinates>
<Files>
<File>${build.finalName}.jar</File>
</Files>
</Software>
</Packages>
</Profile>
</Resource>

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)
@ -32,7 +34,8 @@ public class AuthorizationEntry {
ClientInfo clientInfo;
private String context;
@XmlElementRefs({@XmlElementRef(type=DefaultServiceMap.class)})
private ServiceMap map;
@XmlElementRefs({
@XmlElementRef(type = Service2ServicePolicy.class),
@XmlElementRef(type = User2ServicePolicy.class),
@ -63,11 +66,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 +126,7 @@ public class AuthorizationEntry {
@Override
public String toString() {
return "AuthorizationEntry [clientInfo=" + clientInfo + ", context="
+ context + ", qualifier=" + qualifier
+ context + ", map=" + map + ", qualifier=" + qualifier
+ ", policies=" + policies + "]";
}

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

@ -0,0 +1,87 @@
package org.gcube.common.authorization.library;
import java.util.concurrent.Callable;
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();
return new Callable<V>() {
@Override
public V call() throws Exception {
AuthorizationProvider.instance.set(userCall);
SecurityTokenProvider.instance.set(token);
ScopeProvider.instance.set(scope);
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();
return new Runnable() {
@Override
public void run() {
AuthorizationProvider.instance.set(userCall);
SecurityTokenProvider.instance.set(token);
ScopeProvider.instance.set(scope);
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)

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

@ -0,0 +1,34 @@
package org.gcube.common.authorization.library.provider;
import org.gcube.common.authorization.library.utils.Caller;
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)

20
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)
@ -22,20 +22,10 @@ public class ExternalServiceInfo extends ClientInfo{
private String generatedBy;
private List<String> roles;
public ExternalServiceInfo(String id, String generatedBy) {
super();
this.id = id;
this.generatedBy = generatedBy;
this.roles = Collections.emptyList();
}
public ExternalServiceInfo(String id, String generatedBy, List<String> roles) {
super();
this.id = id;
this.generatedBy = generatedBy;
this.roles = roles;
}
protected ExternalServiceInfo() {
@ -53,7 +43,7 @@ public class ExternalServiceInfo extends ClientInfo{
@Override
public List<String> getRoles() {
return roles;
return Collections.emptyList();
}
@Override

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;
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)

30
src/main/java/org/gcube/common/authorization/library/provider/UmaJWTProvider.java Normal file
View File

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

34
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
@ -22,11 +22,6 @@ public class UserInfo extends ClientInfo {
private String clientId;
private List<String> roles = new ArrayList<String>();
private String email;
private String firstName;
private String lastName;
protected UserInfo(){}
public UserInfo(String clientId, List<String> roles) {
@ -35,15 +30,6 @@ public class UserInfo extends ClientInfo {
this.roles = roles;
}
public UserInfo(String clientId, List<String> roles, String email, String firstName, String lastName) {
super();
this.clientId = clientId;
this.roles = roles;
this.email = email;
this.firstName = firstName;
this.lastName = lastName;
}
@Override
public String getId() {
@ -55,18 +41,6 @@ public class UserInfo extends ClientInfo {
return roles;
}
public String getEmail() {
return email;
}
public String getFirstName() {
return firstName;
}
public String getLastName() {
return lastName;
}
@Override
public int hashCode() {
final int prime = 31;

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)

2
src/main/resources/gcube.authorization
View File

@ -1 +1 @@
<authorization-endpoint priority="10" infrastructure="gcube"><host>auth.dev.d4science.org</host><secure>true</secure><port>443</port></authorization-endpoint>
<authorization-endpoint priority="10" infrastructure="gcube"><host>auth-d.dev.d4science.org</host><secure>false</secure><port>80</port></authorization-endpoint>

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;