gCubeSystem
/
idm-service
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code formatting

This commit is contained in:
Alfredo Oliviero 2024-03-26 17:41:10 +01:00
parent c4786572ab
commit 9508b7329c
9 changed files with 78 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -11,6 +11,8 @@ This service allows any client to publish on the gCube Catalogue.
[Identity Manager Service](https://wiki.gcube-system.org/gcube/SmartGears) [Identity Manager Service](https://wiki.gcube-system.org/gcube/SmartGears)
configuration: inserte
## Change log ## Change log
See [CHANGELOG.md](CHANGELOG.md). See [CHANGELOG.md](CHANGELOG.md).
@ -18,7 +20,6 @@ See [CHANGELOG.md](CHANGELOG.md).
## Authors ## Authors
* **Alfredo Oliviero** [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience) * **Alfredo Oliviero** [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
* **Luca Frosini** ([ORCID](https://orcid.org/0000-0003-3183-2291)) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
## How to Cite this Software ## How to Cite this Software

4
pom.xml
View File

@ -108,7 +108,7 @@
<!-- <!--
usermanagement-core depends on older httpcommon and gives this error on keycloak client: usermanagement-core depends on older httpcommon and gives this error on keycloak client:
java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy
https://stackoverflow.com/questions/44750124/classnotfoundexception-on-org-apache-http-ssl-truststrategy https://stackoverflow.com/questions/44750124/classnotfoundexception-on-org-apache-http-ssl-truststrategy
solution: bind version, or exclude them in usermanagement-core solution: bind version, or exclude them in usermanagement-core
@ -241,7 +241,7 @@ solution: bind version, or exclude them in usermanagement-core
<!-- <!--
usermanagement-core depends on older httpcommon and gives this error on keycloak client: usermanagement-core depends on older httpcommon and gives this error on keycloak client:
java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy java.lang.NoClassDefFoundError: org/apache/http/ssl/TrustStrategy
https://stackoverflow.com/questions/44750124/classnotfoundexception-on-org-apache-http-ssl-truststrategy https://stackoverflow.com/questions/44750124/classnotfoundexception-on-org-apache-http-ssl-truststrategy
--> -->
<dependency> <dependency>
<groupId>org.gcube.dvos</groupId> <groupId>org.gcube.dvos</groupId>

1
src/main/java/org/gcube/keycloack/ErrorMessages.java
View File

@ -7,7 +7,6 @@ public class ErrorMessages {
private static final String NO_RUNTIME_RESOURCE_TEMPLATE_NAME_CATEGORY = "There is no Runtime Resource having name %s and Category %s in this scope"; private static final String NO_RUNTIME_RESOURCE_TEMPLATE_NAME_CATEGORY = "There is no Runtime Resource having name %s and Category %s in this scope";
public static final String MISSING_TOKEN = "Missing token."; public static final String MISSING_TOKEN = "Missing token.";
public static final String MISSING_PARAMETERS = "Missing request parameters."; public static final String MISSING_PARAMETERS = "Missing request parameters.";
public static final String INVALID_TOKEN = "Invalid token."; public static final String INVALID_TOKEN = "Invalid token.";

6
src/main/java/org/gcube/keycloack/KeycloackApiClient.java
View File

@ -8,7 +8,7 @@ public class KeycloackApiClient {
public String clientIdContext; public String clientIdContext;
public String context; public String context;
public static String getClientIdContext(String context){ public static String getClientIdContext(String context) {
return context.replace("/", "%2F"); return context.replace("/", "%2F");
} }
@ -17,8 +17,8 @@ public class KeycloackApiClient {
this.context = context; this.context = context;
this.kclient = kclient; this.kclient = kclient;
this.realmName = realmName; this.realmName = realmName;
//ClientsResource clients = kclient.realm(realmName).clients().get* // ClientsResource clients = kclient.realm(realmName).clients().get*
//clients.get(context); // clients.get(context);
} }
} }

10
src/main/java/org/gcube/keycloack/KeycloackClientGcatFactory.java
View File

@ -18,7 +18,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.gcube.common.authorization.utils.secret.Secret; import org.gcube.common.authorization.utils.secret.Secret;
/*** /***
* from gcat implementation * from gcat implementation
* *
@ -61,7 +60,7 @@ public class KeycloackClientGcatFactory {
} catch (Exception e) { } catch (Exception e) {
throw new InternalServerErrorException( throw new InternalServerErrorException(
"Unable to retrieve Application Token for context " "Unable to retrieve Application Token for context "
/*+ SecretManagerProvider.instance.get().getContext() */, /* + SecretManagerProvider.instance.get().getContext() */,
e); e);
} }
} }
@ -108,10 +107,11 @@ public class KeycloackClientGcatFactory {
this.gcubeKeycloakClient = new DefaultKeycloakClient(); this.gcubeKeycloakClient = new DefaultKeycloakClient();
} }
private static TokenResponse getJWTAccessToken() throws Exception { private static TokenResponse getJWTAccessToken() throws Exception {
String context = SecretManagerProvider.get().getContext(); String context = SecretManagerProvider.get().getContext();
Entry<String,String> entry = getClientIdAndClientSecret(context); Entry<String, String> entry = getClientIdAndClientSecret(context);
TokenResponse tr = KeycloakClientFactory.newInstance().queryUMAToken(context, entry.getKey(), entry.getValue(), context, null); TokenResponse tr = KeycloakClientFactory.newInstance().queryUMAToken(context, entry.getKey(), entry.getValue(),
context, null);
return tr; return tr;
} }

3
src/main/java/org/gcube/keycloack/KeycloakClientFactory.java
View File

@ -22,9 +22,6 @@ import org.keycloak.admin.client.KeycloakBuilder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.QueryParam;
public class KeycloakClientFactory { public class KeycloakClientFactory {
private static final Logger logger = LoggerFactory.getLogger(KeycloakClientFactory.class); private static final Logger logger = LoggerFactory.getLogger(KeycloakClientFactory.class);

5
src/main/java/org/gcube/service/idm/rest/test/KeycloakTestService.java
View File

@ -30,7 +30,6 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
@ManagedBy(IdMManager.class) @ManagedBy(IdMManager.class)
@Path("") @Path("")
public class KeycloakTestService { public class KeycloakTestService {
@ -51,8 +50,7 @@ public class KeycloakTestService {
@QueryParam("realm") @DefaultValue("d4science") String realm, @QueryParam("realm") @DefaultValue("d4science") String realm,
@QueryParam("role-name") @DefaultValue("Member") String roleName, @QueryParam("role-name") @DefaultValue("Member") String roleName,
@QueryParam("client_id") @DefaultValue("id.d4science.org") String clientId, @QueryParam("client_id") @DefaultValue("id.d4science.org") String clientId,
@QueryParam("client_secret") @DefaultValue(CLIENT_SECRET) String client_secret @QueryParam("client_secret") @DefaultValue(CLIENT_SECRET) String client_secret) {
) {
String client_contenxt = "/gcube"; String client_contenxt = "/gcube";
@ -139,4 +137,3 @@ public class KeycloakTestService {
return users_repr; return users_repr;
} }
} }

8
src/main/java/org/gcube/service/idm/serializers/ContextSerializator.java
View File

@ -25,13 +25,15 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
public class ContextSerializator { public class ContextSerializator {
private static ObjectMapper serializer = null; private static ObjectMapper serializer = null;
protected static TypeReference<HashMap<String,Object>> typeRefHashmap = new TypeReference<HashMap<String,Object>>() {}; protected static TypeReference<HashMap<String, Object>> typeRefHashmap = new TypeReference<HashMap<String, Object>>() {
};
public static String decodeBase64String(String encodedString){ public static String decodeBase64String(String encodedString) {
return new String(Base64.getUrlDecoder().decode(encodedString), StandardCharsets.UTF_8); return new String(Base64.getUrlDecoder().decode(encodedString), StandardCharsets.UTF_8);
} }
public static HashMap<String, Object> jsonStringToHasmap(String jsonString) throws JsonMappingException, JsonProcessingException { public static HashMap<String, Object> jsonStringToHasmap(String jsonString)
throws JsonMappingException, JsonProcessingException {
return getSerializer().readValue(jsonString, typeRefHashmap); return getSerializer().readValue(jsonString, typeRefHashmap);
} }

24
src/main/java/org/gcube/service/idm/utils/TokensUtils.java
View File

@ -4,7 +4,6 @@ import org.gcube.common.authorization.library.ClientType;
import org.gcube.common.authorization.library.utils.Caller; import org.gcube.common.authorization.library.utils.Caller;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* Tokens utils methods * Tokens utils methods
*/ */
@ -14,19 +13,22 @@ public class TokensUtils {
private static final String DEFAULT_QUALIFIER_USER_TOKEN = "TOKEN"; private static final String DEFAULT_QUALIFIER_USER_TOKEN = "TOKEN";
// Logger // Logger
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TokensUtils.class); private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TokensUtils.class);
/** /**
* Check if it is a service token * Check if it is a service token
*
* @return a boolean value * @return a boolean value
*/ */
public static boolean isServiceToken(Caller caller){ public static boolean isServiceToken(Caller caller) {
return caller.getClient().getType().equals(ClientType.SERVICE); return caller.getClient().getType().equals(ClientType.SERVICE);
} }
/** /**
* Check if it is an application token * Check if it is an application token
*
* @return a boolean value * @return a boolean value
*/ */
public static boolean isApplicationToken(Caller caller){ public static boolean isApplicationToken(Caller caller) {
String username = caller.getClient().getId(); String username = caller.getClient().getId();
if (username.startsWith("service-account-")) { if (username.startsWith("service-account-")) {
return true; return true;
@ -37,9 +39,10 @@ public class TokensUtils {
/** /**
* Check if it is a container token * Check if it is a container token
*
* @return a boolean value * @return a boolean value
*/ */
public static boolean isContainerToken(Caller caller){ public static boolean isContainerToken(Caller caller) {
return caller.getClient().getType().equals(ClientType.CONTAINER); return caller.getClient().getType().equals(ClientType.CONTAINER);
@ -47,10 +50,12 @@ public class TokensUtils {
/** /**
* Check if it is a user token * Check if it is a user token
*
* @return a boolean value * @return a boolean value
*/ */
public static boolean isUserToken(Caller caller) { public static boolean isUserToken(Caller caller) {
logger.debug("\n ****** \n isUserToken: caller.getClient().getType().equals(ClientType.USER) => " + caller.getClient().getType().equals(ClientType.USER)); logger.debug("\n ****** \n isUserToken: caller.getClient().getType().equals(ClientType.USER) => "
+ caller.getClient().getType().equals(ClientType.USER));
String username = caller.getClient().getId(); String username = caller.getClient().getId();
if (username.startsWith("service-account-")) { if (username.startsWith("service-account-")) {
return false; return false;
@ -61,19 +66,22 @@ public class TokensUtils {
/** /**
* Check if it is a user token (not qualified) * Check if it is a user token (not qualified)
*
* @return a boolean value * @return a boolean value
*/ */
public static boolean isUserTokenDefault(Caller caller){ public static boolean isUserTokenDefault(Caller caller) {
return isUserToken(caller); return isUserToken(caller);
} }
/** /**
* Check if it is a user token (qualified) * Check if it is a user token (qualified)
*
* @return a boolean value * @return a boolean value
*/ */
public static boolean isUserTokenQualified(Caller caller){ public static boolean isUserTokenQualified(Caller caller) {
return caller.getClient().getType().equals(ClientType.USER) && !caller.getTokenQualifier().equals(DEFAULT_QUALIFIER_USER_TOKEN); return caller.getClient().getType().equals(ClientType.USER)
&& !caller.getTokenQualifier().equals(DEFAULT_QUALIFIER_USER_TOKEN);
} }