Compare commits
14 Commits
| Author | SHA1 | Date |
|---|---|---|
 Luca Frosini
|
c91630d921 | |
|
Luca Frosini
|
c0118a16b4 | |
|
Luca Frosini
|
5cc4267ec2 | |
 Lucio Lelii
|
e68d49fc64 | |
|
Lucio Lelii
|
c0e1360940 | |
|
Luca Frosini
|
4993a52c61 | |
|
Luca Frosini
|
bb505b905c | |
|
Lucio Lelii
|
9b0ad437a5 | |
lucio.lelii
|
279bce0575 | |
|
lucio.lelii
|
131cee828d | |
user1
|
3737d4dcc2 | |
|
Lucio Lelii
|
9af51e60ed | |
|
Lucio Lelii
|
a77353fa2b | |
|
Lucio Lelii
|
43aa106b60 |
|
|
@ -26,7 +26,6 @@
|
|||
<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"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
/target/
|
||||
|
|
@ -7,7 +7,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
|||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
|
|
|
|||
38
CHANGELOG.md
38
CHANGELOG.md
|
|
@ -4,45 +4,47 @@
|
|||
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).
|
||||
|
||||
## [v2.5.1]
|
||||
|
||||
- Added library to support Java 11 JDK
|
||||
|
||||
## [v2.5.0] - [2022-04-20]
|
||||
|
||||
- Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]
|
||||
- Added roles to ExternalService Client info
|
||||
|
||||
## [v2.4.0] - [2021-05-21]
|
||||
|
||||
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.3.0] - [2010-11-17]
|
||||
|
||||
support for the new IAM added
|
||||
|
||||
## [v2.2.1] - [2019-01-14]
|
||||
|
||||
endpoint updated for https
|
||||
|
||||
|
||||
|
||||
## [v2.1.6] - [2019-01-14]
|
||||
|
||||
added ListMapper
|
||||
|
||||
|
||||
|
||||
## [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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -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>
|
||||
|
|
@ -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 +0,0 @@
|
|||
${gcube.license}
|
||||
|
|
@ -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.
|
||||
|
||||
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
||||
147
pom.xml
147
pom.xml
|
|
@ -1,98 +1,59 @@
|
|||
<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>
|
||||
<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>
|
||||
<parent>
|
||||
<artifactId>maven-parent</artifactId>
|
||||
<groupId>org.gcube.tools</groupId>
|
||||
<version>1.1.0</version>
|
||||
</parent>
|
||||
|
||||
<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>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>common-authorization</artifactId>
|
||||
<version>2.5.1</version>
|
||||
<name>authorization service common library</name>
|
||||
|
||||
<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>
|
||||
<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>
|
||||
|
||||
<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>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>gcube-bom</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<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>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-scope</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.11</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
</project>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Added to support Java 11 JDK -->
|
||||
<dependency>
|
||||
<groupId>javax.xml.ws</groupId>
|
||||
<artifactId>jaxws-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- END Added to support Java 11 JDK -->
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
26
profile.xml
26
profile.xml
|
|
@ -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>
|
||||
|
||||
|
|
@ -34,8 +34,10 @@ public class AuthorizationEntry {
|
|||
ClientInfo clientInfo;
|
||||
|
||||
private String context;
|
||||
@XmlElementRefs({@XmlElementRef(type=DefaultServiceMap.class)})
|
||||
|
||||
@XmlElementRef(type = DefaultServiceMap.class)
|
||||
private ServiceMap map;
|
||||
|
||||
@XmlElementRefs({
|
||||
@XmlElementRef(type = Service2ServicePolicy.class),
|
||||
@XmlElementRef(type = User2ServicePolicy.class),
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package org.gcube.common.authorization.library;
|
|||
|
||||
import java.util.concurrent.Callable;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.AccessTokenProvider;
|
||||
import org.gcube.common.authorization.library.provider.AuthorizationProvider;
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.authorization.library.utils.Caller;
|
||||
|
|
@ -28,13 +29,17 @@ public class AuthorizedTasks {
|
|||
|
||||
final String scope = ScopeProvider.instance.get();
|
||||
|
||||
final String accessToken = AccessTokenProvider.instance.get();
|
||||
|
||||
return new Callable<V>() {
|
||||
@Override
|
||||
public V call() throws Exception {
|
||||
|
||||
|
||||
AuthorizationProvider.instance.set(userCall);
|
||||
SecurityTokenProvider.instance.set(token);
|
||||
ScopeProvider.instance.set(scope);
|
||||
AccessTokenProvider.instance.set(accessToken);
|
||||
|
||||
try {
|
||||
logger.info("setting on authorized task scope {} and token {}", scope, token);
|
||||
|
|
@ -64,12 +69,16 @@ public class AuthorizedTasks {
|
|||
|
||||
final String scope = ScopeProvider.instance.get();
|
||||
|
||||
final String accessToken = AccessTokenProvider.instance.get();
|
||||
|
||||
return new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
AuthorizationProvider.instance.set(userCall);
|
||||
SecurityTokenProvider.instance.set(token);
|
||||
ScopeProvider.instance.set(scope);
|
||||
AccessTokenProvider.instance.set(accessToken);
|
||||
|
||||
try {
|
||||
logger.info("setting on authorized task scope {} and token {}", scope, token);
|
||||
task.run();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
package org.gcube.common.authorization.library.provider;
|
||||
|
||||
public class UmaJWTProvider {
|
||||
@Deprecated
|
||||
public class AccessTokenProvider {
|
||||
|
||||
public static UmaJWTProvider instance = new UmaJWTProvider();
|
||||
public static AccessTokenProvider instance = new AccessTokenProvider();
|
||||
|
||||
private static final InheritableThreadLocal<String> threadToken = new InheritableThreadLocal<String>() {
|
||||
|
||||
|
|
@ -13,7 +14,7 @@ public class UmaJWTProvider {
|
|||
|
||||
};
|
||||
|
||||
private UmaJWTProvider() {
|
||||
private AccessTokenProvider() {
|
||||
}
|
||||
|
||||
public String get() {
|
||||
|
|
@ -2,6 +2,7 @@ package org.gcube.common.authorization.library.provider;
|
|||
|
||||
import org.gcube.common.authorization.library.utils.Caller;
|
||||
|
||||
@Deprecated
|
||||
public class AuthorizationProvider {
|
||||
|
||||
public static AuthorizationProvider instance = new AuthorizationProvider();
|
||||
|
|
|
|||
|
|
@ -22,10 +22,20 @@ 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() {
|
||||
|
|
@ -43,7 +53,7 @@ public class ExternalServiceInfo extends ClientInfo{
|
|||
|
||||
@Override
|
||||
public List<String> getRoles() {
|
||||
return Collections.emptyList();
|
||||
return roles;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package org.gcube.common.authorization.library.provider;
|
||||
|
||||
|
||||
@Deprecated
|
||||
public class SecurityTokenProvider {
|
||||
|
||||
public static SecurityTokenProvider instance = new SecurityTokenProvider();
|
||||
|
|
|
|||
|
|
@ -22,6 +22,11 @@ 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) {
|
||||
|
|
@ -30,6 +35,15 @@ 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() {
|
||||
|
|
@ -41,6 +55,18 @@ 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;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
Loading…
Reference in New Issue