Compare commits
5 Commits
Author | SHA1 | Date |
---|---|---|
Lucio Lelii | cb29bb3883 | |
Lucio Lelii | 2f5091c517 | |
Lucio Lelii | e876a4d9dd | |
Lucio Lelii | a71108f4ea | |
Lucio Lelii | 663b3e7675 |
|
@ -21,7 +21,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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
|
|
4
.project
4
.project
|
@ -16,12 +16,12 @@
|
|||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
|
|
|
@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for Common Smartgears
|
||||
|
||||
## [v1.3.1] - 2020-11-18
|
||||
|
||||
- added "d4s-user" as header
|
||||
|
||||
|
||||
## [v1.3.0] - 2020-11-18
|
||||
|
||||
- Changed UmaTokenProvider with AccessTokenProvider
|
||||
|
|
9
pom.xml
9
pom.xml
|
@ -11,7 +11,7 @@
|
|||
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-gcube-calls</artifactId>
|
||||
<version>1.3.0</version>
|
||||
<version>1.3.1</version>
|
||||
|
||||
<properties>
|
||||
<distroDirectory>distro</distroDirectory>
|
||||
|
@ -29,7 +29,7 @@
|
|||
<artifactId>common-authorization</artifactId>
|
||||
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-scope</artifactId>
|
||||
|
@ -40,6 +40,11 @@
|
|||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>gcube-jackson-databind</artifactId>
|
||||
<version>2.8.11</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
package org.gcube.common.calls.interceptors;
|
||||
|
||||
import java.util.Base64;
|
||||
|
||||
import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import org.gcube.com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.gcube.common.authorization.library.provider.AccessTokenProvider;
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.calls.Call;
|
||||
|
@ -15,6 +20,7 @@ public class AuthorizationInterceptor implements Interceptor {
|
|||
|
||||
public static final String token_header="gcube-token";
|
||||
public static final String uma_token_header="Authorization";
|
||||
public static final String user_header="d4s-user";
|
||||
|
||||
@Override
|
||||
public void handleRequest(Request request, Call call) {
|
||||
|
@ -24,6 +30,11 @@ public class AuthorizationInterceptor implements Interceptor {
|
|||
if (accessToken!=null) {
|
||||
request.addHeader(uma_token_header, "Bearer "+accessToken);
|
||||
logger.trace("uma token set");
|
||||
try {
|
||||
request.addHeader(user_header, getUserFromToken(accessToken) );
|
||||
}catch (Throwable e) {
|
||||
logger.warn("errror setting {} header", user_header );
|
||||
}
|
||||
} else logger.warn("uma token is not set");
|
||||
|
||||
if (token==null)
|
||||
|
@ -36,4 +47,27 @@ public class AuthorizationInterceptor implements Interceptor {
|
|||
|
||||
@Override
|
||||
public void handleResponse(Response context, Call callContext) {}
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
private static class AccessTokenJSON {
|
||||
@JsonProperty("preferred_username")
|
||||
private String username;
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static String getUserFromToken(String accessToken) throws Exception {
|
||||
String realAccessTokenEncoded = accessToken.split("\\.")[1];
|
||||
|
||||
String decodedAccessPart = new String(Base64.getDecoder().decode(realAccessTokenEncoded.getBytes()));
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
AccessTokenJSON tokenMapped = mapper.readValue(decodedAccessPart, AccessTokenJSON.class);
|
||||
|
||||
String userName = Base64.getEncoder().encodeToString(tokenMapped.getUsername().getBytes());
|
||||
return userName;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue