gCubeSystem
/
gcube-secrets
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

secrets updated

This commit is contained in:
Lucio Lelii 2022-07-26 15:48:35 +02:00
parent cec6726b90
commit 53274e1c67
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/gcube/common/security/secrets/AccessTokenSecret.java
View File

@ -9,10 +9,10 @@ import org.gcube.common.keycloak.model.AccessToken;
import org.gcube.common.security.Owner; import org.gcube.common.security.Owner;
public class AccessTokenSecret extends Secret { public class AccessTokenSecret extends Secret {
private static final String AUTH_HEADER = "Authorization"; private static final String AUTH_HEADER = "Authorization";
private static final String USER_HEADER = "d4s-user"; private static final String USER_HEADER = "d4s-user";
private String encodedAccessToken; private String encodedAccessToken;
private Owner owner; private Owner owner;
@ -24,7 +24,7 @@ public class AccessTokenSecret extends Secret {
public AccessTokenSecret(String encodedAccessToken) { public AccessTokenSecret(String encodedAccessToken) {
this.encodedAccessToken = encodedAccessToken; this.encodedAccessToken = encodedAccessToken;
} }
@Override @Override
@ -48,12 +48,12 @@ public class AccessTokenSecret extends Secret {
return authorizationHeaders; return authorizationHeaders;
} }
protected String getEncodedAccessToken() { protected String getEncodedAccessToken() {
return encodedAccessToken; return encodedAccessToken;
} }
@Override @Override
public boolean isExpired() { public boolean isExpired() {
init(); init();
@ -63,11 +63,11 @@ public class AccessTokenSecret extends Secret {
private synchronized void init() { private synchronized void init() {
if (!initialised) if (!initialised)
try { try {
String realAccessTokenEncoded = encodedAccessToken.split("\\.")[1]; String realAccessTokenEncoded = encodedAccessToken.split("\\.")[1];
String decodedAccessPart = new String(Base64.getDecoder().decode(realAccessTokenEncoded.getBytes())); String decodedAccessPart = new String(Base64.getDecoder().decode(realAccessTokenEncoded.getBytes()));
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
GCubeJWTObject obj = objectMapper.readValue(decodedAccessPart, GCubeJWTObject.class); GCubeJWTObject obj = objectMapper.readValue(decodedAccessPart, GCubeJWTObject.class);
owner = new Owner(obj.getUsername(), obj.getRoles(), obj.getEmail(), obj.getFirstName(), obj.getLastName(), obj.isExternalService()); owner = new Owner(obj.getUsername(), obj.getRoles(), obj.getEmail(), obj.getFirstName(), obj.getLastName(), obj.isExternalService());
@ -75,14 +75,14 @@ public class AccessTokenSecret extends Secret {
owner.setContactOrganisation(obj.getContactOrganisation()); owner.setContactOrganisation(obj.getContactOrganisation());
owner.setClientName(obj.getClientName()); owner.setClientName(obj.getClientName());
context = obj.getContext(); context = obj.getContext();
this.accessToken = objectMapper.readValue(decodedAccessPart, AccessToken.class); this.accessToken = objectMapper.readValue(decodedAccessPart, AccessToken.class);
initialised = true; initialised = true;
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
} }

1
src/main/java/org/gcube/common/security/secrets/CredentialSecret.java
View File

@ -61,5 +61,4 @@ public class CredentialSecret extends Secret {
public boolean isExpired() { public boolean isExpired() {
return false; return false;
} }
} }

3
src/main/java/org/gcube/common/security/secrets/JWTSecret.java
View File

@ -24,7 +24,7 @@ public class JWTSecret extends Secret {
private String jwtToken; private String jwtToken;
private String context; private String context;
private AccessTokenSecret accessTokenSecret; private AccessTokenSecret accessTokenSecret;
@ -79,4 +79,5 @@ public class JWTSecret extends Secret {
return false; return false;
} }
} }