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

Compare commits

base: 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
..
compare: 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

26 Commits
v2.2.1 ... master

Author SHA1 Message Date
Giancarlo Panichi c5ac47b3e8 Update CHANGELOG.md 
Updated CHANGELOG.md info
 2024-10-14 15:48:48 +02:00
lucio 62c0da513d commit for release 2024-10-01 11:06:10 +02:00
lucio 9452d618ef updated 2024-10-01 11:04:20 +02:00
lucio 95c87ddab6 adedd dep to jaxb-impl 2024-05-15 16:54:53 +02:00
lucio f0ceeac163 moved to jakarta 2024-03-12 10:35:57 +01:00
lucio 4ec7f88f0a added resources to target 2024-02-02 12:24:23 +01:00
lucio d218e82385 commit for release 2023-08-03 15:34:51 +02:00
Lucio Lelii 6a4629eaea Merge remote-tracking branch 'origin/road_to_smartgears_4' 2023-04-04 12:00:07 +02:00
lucio 5d3cc12610 update 2023-03-31 14:45:23 +02:00
Luca Frosini c91630d921 Added missing scope to jaxws-api 2022-11-09 15:54:07 +01:00
Luca Frosini c0118a16b4 Removed -SNAPSHOT to release the component 2022-10-19 14:22:30 +02:00
Luca Frosini 5cc4267ec2 Added library to support Java 11 JDK 2022-10-19 14:21:47 +02:00
Lucio Lelii 54fc75efe5 package updated 2022-06-28 12:26:51 +02:00
Lucio Lelii 2a0f1d2582 removed common-scope dependency 2022-06-06 15:37:32 +02:00
Lucio Lelii d3e0062060 removed all providers 2022-05-30 18:55:04 +02:00
Lucio Lelii e68d49fc64 commit for release 2022-04-20 16:41:30 +02:00
Lucio Lelii c0e1360940 Added roles to ExternalServiceInfo constructor 2022-04-20 16:25:31 +02:00
Luca Frosini 4993a52c61 Added reference ticket to change 2022-02-25 15:05:32 +01:00
Luca Frosini bb505b905c Deprecated AccessTokenProvider, AuthorizationProvider and 
SecurityTokenProvider
 2022-02-25 15:03:42 +01:00
Lucio Lelii 9b0ad437a5 Update 'CHANGELOG.md' 2021-06-21 16:08:29 +02:00
lucio.lelii 279bce0575 JWTUmaTokenProvider changed to AccessTokenProvider 2021-05-24 16:30:18 +02:00
lucio.lelii 131cee828d User info returns also email, first name and last name according to the 
new UMA token
 2021-03-30 10:33:36 +02:00
user1 3737d4dcc2 commit for IAM release 2020-11-18 18:29:28 +01:00
Lucio Lelii 9af51e60ed Merge branch 'master' of code-repo.d4science.org:gCubeSystem/common-authorization 2020-11-17 15:45:28 +01:00
Lucio Lelii a77353fa2b porting to the new IAM 2020-11-17 15:37:12 +01:00
Lucio Lelii 43aa106b60 Added UmaTokenProvider to authorized tasks 2020-05-29 17:23:37 +02:00
52 changed files with 311 additions and 725 deletions
Show Stats Expand all files Collapse all files

11
.classpath
View File

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

1
.gitignore vendored Normal file
View File

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

6
.project
View File

@ -6,12 +6,12 @@
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
@ -27,8 +27,6 @@
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <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.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>

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

@ -1,13 +1,8 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
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.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.source=11

45
CHANGELOG.md
View File

@ -1,48 +1,51 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. 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). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v3.0.0]
## [v2.2.1] - [2019-01-14] - Authorization endpoints configuration retrieving moved from common scanner to reflection library
- Removed common-scope from the dependencies
endpoint updated for https
## [v2.5.0] - 2022-04-20
## [v2.1.6] - [2019-01-14] - Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]
- Added roles to ExternalService Client info
added ListMapper ## [v2.4.0] - 2021-05-21
- JWTUmaTokenProvider changed to AccessTokenProvider
## [v2.3.1] - 2021-03-30
## [v2.1.3] - [2019-01-14] - User info returns also email, first name and Last name according to the new UMA token
added the support for authorization control library ## [v2.3.0] - 2010-11-17
- Support for the new IAM added
## [v2.2.1] - 2019-01-14
- Endpoint updated for https
## [v2.0.2] - [2017-02-27] ## [v2.1.6] - 2019-01-14
added set and reset of scope in AuthorizedTask - Added ListMapper
## [v2.1.3] - 2019-01-14
- Added the support for authorization control library
## [v2.0.2] - 2017-02-27
## [v2.0.0] - [2016-09-30] - Added set and reset of scope in AuthorizedTask
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 Normal file
View File

@ -0,0 +1,26 @@
# 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
View File

@ -1,17 +0,0 @@
<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
View File

@ -1,33 +0,0 @@
<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
View File

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

64
distro/README
View File

@ -1,64 +0,0 @@
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
View File

@ -1,14 +0,0 @@
<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
View File

@ -1,36 +0,0 @@
<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
View File

@ -1,26 +0,0 @@
<?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,98 +1,69 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.gcube.common</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>common-authorization</artifactId> <groupId>org.gcube.common</groupId>
<version>2.2.1</version> <artifactId>common-authorization</artifactId>
<name>authorization service common library</name> <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>
<parent> <properties>
<artifactId>maven-parent</artifactId> <maven.compiler.source>11</maven.compiler.source>
<groupId>org.gcube.tools</groupId> <maven.compiler.target>11</maven.compiler.target>
<version>1.1.0</version> </properties>
</parent> <dependencyManagement>
<dependencies>
<scm> <dependency>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection> <groupId>org.gcube.distribution</groupId>
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection> <artifactId>gcube-bom</artifactId>
<url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url> <version>4.0.0</version>
</scm> <type>pom</type>
<properties> <scope>import</scope>
<distroDirectory>distro</distroDirectory> </dependency>
</properties> </dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.reflections</groupId>
<artifactId>common-scope</artifactId> <artifactId>reflections</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>junit</groupId>
<groupId>junit</groupId> <artifactId>junit</artifactId>
<artifactId>junit</artifactId> <version>4.11</version>
<version>4.11</version> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
<groupId>org.slf4j</groupId>
<dependency> <artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId> </dependency>
<artifactId>slf4j-api</artifactId> <dependency>
<version>1.7.5</version> <groupId>jakarta.xml.bind</groupId>
</dependency> <artifactId>jakarta.xml.bind-api</artifactId>
</dependencies> </dependency>
<dependency>
<build> <groupId>com.sun.xml.bind</groupId>
<plugins> <artifactId>jaxb-impl</artifactId>
<plugin> </dependency>
<groupId>org.apache.maven.plugins</groupId> </dependencies>
<artifactId>maven-compiler-plugin</artifactId> <build>
</plugin> <resources>
<plugin> <resource>
<groupId>org.apache.maven.plugins</groupId> <directory>src/main/resources</directory>
<artifactId>maven-resources-plugin</artifactId> <filtering>true</filtering>
<version>2.5</version> </resource>
<executions> </resources>
<execution> </build>
<id>copy-profile</id> </project>
<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
View File

@ -1,26 +0,0 @@
<?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,13 +3,6 @@ package org.gcube.common.authorization.library;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.Policy;
import org.gcube.common.authorization.library.policies.Service2ServicePolicy; import org.gcube.common.authorization.library.policies.Service2ServicePolicy;
import org.gcube.common.authorization.library.policies.User2ServicePolicy; import org.gcube.common.authorization.library.policies.User2ServicePolicy;
@ -18,8 +11,13 @@ import org.gcube.common.authorization.library.provider.ContainerInfo;
import org.gcube.common.authorization.library.provider.ExternalServiceInfo; import org.gcube.common.authorization.library.provider.ExternalServiceInfo;
import org.gcube.common.authorization.library.provider.ServiceInfo; import org.gcube.common.authorization.library.provider.ServiceInfo;
import org.gcube.common.authorization.library.provider.UserInfo; import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.common.scope.api.ServiceMap;
import org.gcube.common.scope.impl.DefaultServiceMap; 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;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@ -34,8 +32,7 @@ public class AuthorizationEntry {
ClientInfo clientInfo; ClientInfo clientInfo;
private String context; private String context;
@XmlElementRefs({@XmlElementRef(type=DefaultServiceMap.class)})
private ServiceMap map;
@XmlElementRefs({ @XmlElementRefs({
@XmlElementRef(type = Service2ServicePolicy.class), @XmlElementRef(type = Service2ServicePolicy.class),
@XmlElementRef(type = User2ServicePolicy.class), @XmlElementRef(type = User2ServicePolicy.class),
@ -66,18 +63,11 @@ public class AuthorizationEntry {
return context; return context;
} }
public ServiceMap getMap() {
return map;
}
public String getQualifier() { public String getQualifier() {
return qualifier; return qualifier;
} }
public void setMap(ServiceMap map) {
this.map = map;
}
public List<Policy> getPolicies() { public List<Policy> getPolicies() {
return policies; return policies;
} }
@ -126,7 +116,7 @@ public class AuthorizationEntry {
@Override @Override
public String toString() { public String toString() {
return "AuthorizationEntry [clientInfo=" + clientInfo + ", context=" return "AuthorizationEntry [clientInfo=" + clientInfo + ", context="
+ context + ", map=" + map + ", qualifier=" + qualifier + context + ", qualifier=" + qualifier
+ ", policies=" + policies + "]"; + ", policies=" + policies + "]";
} }

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

@ -1,87 +0,0 @@
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; package org.gcube.common.authorization.library;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

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

@ -3,13 +3,13 @@ package org.gcube.common.authorization.library;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
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 org.gcube.common.authorization.library.utils.MapAdapter; import org.gcube.common.authorization.library.utils.MapAdapter;
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;
@XmlRootElement @XmlRootElement

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.ArrayList;
import java.util.List; 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.Policy;
import org.gcube.common.authorization.library.policies.Service2ServicePolicy; import org.gcube.common.authorization.library.policies.Service2ServicePolicy;
import org.gcube.common.authorization.library.policies.User2ServicePolicy; 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 @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class Policies { public class Policies {

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

@ -3,13 +3,13 @@ package org.gcube.common.authorization.library;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
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 org.gcube.common.authorization.library.utils.MapAdapter; import org.gcube.common.authorization.library.utils.MapAdapter;
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;
@XmlRootElement @XmlRootElement

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

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

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

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

@ -1,4 +1,4 @@
package org.gcube.common.authorization.library.enpoints; package org.gcube.common.authorization.library.endpoints;
import java.util.Map; 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; package org.gcube.common.authorization.library.policies;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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 java.util.Calendar;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlSeeAlso;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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 java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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 java.util.Calendar;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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.HashMap;
import java.util.Map.Entry; import java.util.Map.Entry;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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.Collections;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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 java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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 java.util.Calendar;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef; import jakarta.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs; import jakarta.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @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.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlSeeAlso;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

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

@ -1,34 +0,0 @@
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
View File

@ -1,39 +0,0 @@
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,13 +3,13 @@ package org.gcube.common.authorization.library.provider;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
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 org.gcube.common.authorization.library.ClientType; import org.gcube.common.authorization.library.ClientType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlSeeAlso(value={UserInfo.class, ServiceInfo.class, ExternalServiceInfo.class, ContainerInfo.class}) @XmlSeeAlso(value={UserInfo.class, ServiceInfo.class, ExternalServiceInfo.class, ContainerInfo.class})

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

@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType; import org.gcube.common.authorization.library.ClientType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ContainerInfo extends ClientInfo{ public class ContainerInfo extends ClientInfo{

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

@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType; import org.gcube.common.authorization.library.ClientType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ExternalServiceInfo extends ClientInfo{ public class ExternalServiceInfo extends ClientInfo{
@ -22,10 +22,20 @@ public class ExternalServiceInfo extends ClientInfo{
private String generatedBy; private String generatedBy;
private List<String> roles;
public ExternalServiceInfo(String id, String generatedBy) { public ExternalServiceInfo(String id, String generatedBy) {
super(); super();
this.id = id; this.id = id;
this.generatedBy = generatedBy; 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() { protected ExternalServiceInfo() {
@ -43,7 +53,7 @@ public class ExternalServiceInfo extends ClientInfo{
@Override @Override
public List<String> getRoles() { public List<String> getRoles() {
return Collections.emptyList(); return roles;
} }
@Override @Override

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

@ -1,33 +0,0 @@
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 java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)

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

@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType; import org.gcube.common.authorization.library.ClientType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ServiceInfo extends ClientInfo{ public class ServiceInfo extends ClientInfo{

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

@ -1,30 +0,0 @@
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,12 +3,12 @@ package org.gcube.common.authorization.library.provider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.ClientType; import org.gcube.common.authorization.library.ClientType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@ -22,6 +22,11 @@ public class UserInfo extends ClientInfo {
private String clientId; private String clientId;
private List<String> roles = new ArrayList<String>(); private List<String> roles = new ArrayList<String>();
private String email;
private String firstName;
private String lastName;
protected UserInfo(){} protected UserInfo(){}
public UserInfo(String clientId, List<String> roles) { public UserInfo(String clientId, List<String> roles) {
@ -30,6 +35,15 @@ public class UserInfo extends ClientInfo {
this.roles = roles; 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 @Override
public String getId() { public String getId() {
@ -41,6 +55,18 @@ public class UserInfo extends ClientInfo {
return roles; return roles;
} }
public String getEmail() {
return email;
}
public String getFirstName() {
return firstName;
}
public String getLastName() {
return lastName;
}
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;

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

@ -3,10 +3,10 @@ package org.gcube.common.authorization.library.utils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.AuthorizationEntry;
import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
public class AuthorizationEntryList { 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.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement @XmlRootElement
public class ListMapper { 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.HashMap;
import java.util.Map; import java.util.Map;
import javax.xml.bind.annotation.adapters.XmlAdapter; import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class MapAdapter extends XmlAdapter<MapElements[], Map<String, String>> { 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; package org.gcube.common.authorization.library.utils;
import javax.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElement;
class MapElements class MapElements
{ {

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

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

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

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

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

@ -7,9 +7,6 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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.AuthorizationEntry;
import org.gcube.common.authorization.library.QualifiersList; import org.gcube.common.authorization.library.QualifiersList;
import org.gcube.common.authorization.library.policies.Policy; import org.gcube.common.authorization.library.policies.Policy;
@ -17,6 +14,9 @@ import org.gcube.common.authorization.library.provider.UserInfo;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
public class AuthorizationEntryBinder { public class AuthorizationEntryBinder {
public static JAXBContext getContext() throws JAXBException{ 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.Arrays;
import java.util.Map; import java.util.Map;
import javax.xml.bind.JAXBContext; import org.gcube.common.authorization.library.endpoints.AuthorizationEndpoint;
import javax.xml.bind.JAXBException; import org.gcube.common.authorization.library.endpoints.AuthorizationEndpointScanner;
import org.gcube.common.authorization.library.enpoints.AuthorizationEndpoint;
import org.gcube.common.authorization.library.enpoints.AuthorizationEndpointScanner;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
public class EndpointBinder { 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.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
import javax.xml.bind.JAXBContext;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import jakarta.xml.bind.JAXBContext;
public class SerializationTest { public class SerializationTest {
static JAXBContext context; static JAXBContext context;