-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #165 from dinesh-aot/ff-407
Debugging analytics Issue; bpm version changed to 4.0.7; changes made to KeyCloak migration
- Loading branch information
Showing
8 changed files
with
219 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| .vscode/ | ||
|
|
||
| *.iml | ||
| **/.idea/ | ||
| *.iml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
.../main/java/org/camunda/bpm/extension/keycloak/plugin/KeycloakIdentityProviderSession.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| package org.camunda.bpm.extension.keycloak.plugin; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.camunda.bpm.engine.identity.Group; | ||
| import org.camunda.bpm.engine.identity.User; | ||
| import org.camunda.bpm.engine.impl.interceptor.CommandContext; | ||
| import org.camunda.bpm.extension.keycloak.*; | ||
| import org.camunda.bpm.extension.keycloak.cache.QueryCache; | ||
| import org.camunda.bpm.extension.keycloak.rest.KeycloakRestTemplate; | ||
| import org.camunda.bpm.extension.keycloak.util.KeycloakPluginLogger; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| /** | ||
| * @author aot | ||
| * | ||
| */ | ||
| public class KeycloakIdentityProviderSession | ||
| extends org.camunda.bpm.extension.keycloak.KeycloakIdentityProviderSession { | ||
|
|
||
| public KeycloakIdentityProviderSession(KeycloakConfiguration keycloakConfiguration, KeycloakRestTemplate restTemplate, KeycloakContextProvider keycloakContextProvider, | ||
| QueryCache<CacheableKeycloakUserQuery, List<User>> userQueryCache, QueryCache<CacheableKeycloakGroupQuery, List<Group>> groupQueryCache, | ||
| QueryCache<CacheableKeycloakCheckPasswordCall, Boolean> checkPasswordCache, | ||
| String webClientId, boolean enableClientAuth) { | ||
| super(keycloakConfiguration, restTemplate, keycloakContextProvider, userQueryCache, groupQueryCache, checkPasswordCache); | ||
| this.groupService = new KeycloakGroupService(keycloakConfiguration, restTemplate, keycloakContextProvider, webClientId, enableClientAuth); | ||
| this.userService = new KeycloakUserService(keycloakConfiguration, restTemplate, keycloakContextProvider, webClientId, enableClientAuth); | ||
| } | ||
|
|
||
| /** | ||
| * Get the group ID of the configured admin group. Enable configuration using group path as well. | ||
| * This prevents common configuration pitfalls and makes it consistent to other configuration options | ||
| * like the flag 'useGroupPathAsCamundaGroupId'. | ||
| * | ||
| * @param configuredAdminGroupName the originally configured admin group name | ||
| * @return the corresponding keycloak group ID to use: either internal keycloak ID or path, depending on config | ||
| * | ||
| * @see org.camunda.bpm.extension.keycloak.KeycloakGroupService#getKeycloakAdminGroupId(java.lang.String) | ||
| */ | ||
| public String getKeycloakAdminGroupId(String configuredAdminGroupName) { | ||
| return groupService.getKeycloakAdminGroupId(configuredAdminGroupName); | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| * @param userQuery | ||
| * @return | ||
| */ | ||
| protected List<User> findUserByQueryCriteria(KeycloakUserQuery userQuery) { | ||
| StringBuilder resultLogger = new StringBuilder(); | ||
| if (KeycloakPluginLogger.INSTANCE.isDebugEnabled()) { | ||
| resultLogger.append("Keycloak group query results: ["); | ||
| } | ||
|
|
||
| List<User> allMatchingUsers = userQueryCache.getOrCompute(CacheableKeycloakUserQuery.of(userQuery), | ||
| this::doFindUserByQueryCriteria); | ||
| List<User> processedUsers = userService.postProcessResults(userQuery, allMatchingUsers, resultLogger); | ||
| if (KeycloakPluginLogger.INSTANCE.isDebugEnabled()) { | ||
| resultLogger.append("]"); | ||
| KeycloakPluginLogger.INSTANCE.groupQueryResult(resultLogger.toString()); | ||
| } | ||
|
|
||
| return processedUsers; | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| * @param userQuery | ||
| * @return | ||
| */ | ||
| private List<User> doFindUserByQueryCriteria(CacheableKeycloakUserQuery userQuery) { | ||
| return StringUtils.hasLength(userQuery.getGroupId()) ? | ||
| this.userService.requestUsersByGroupId(userQuery) : | ||
| this.userService.requestUsersWithoutGroupId(userQuery); | ||
| } | ||
|
|
||
| } |
123 changes: 123 additions & 0 deletions
123
...flow-bpm/src/main/java/org/camunda/bpm/extension/keycloak/plugin/KeycloakUserService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package org.camunda.bpm.extension.keycloak.plugin; | ||
|
|
||
| import org.camunda.bpm.engine.identity.User; | ||
| import org.camunda.bpm.engine.impl.persistence.entity.UserEntity; | ||
| import org.camunda.bpm.extension.keycloak.KeycloakConfiguration; | ||
| import org.camunda.bpm.extension.keycloak.rest.KeycloakRestTemplate; | ||
| import org.camunda.bpm.extension.keycloak.KeycloakContextProvider; | ||
| import org.camunda.bpm.extension.keycloak.KeycloakGroupNotFoundException; | ||
| import org.camunda.bpm.extension.keycloak.CacheableKeycloakUserQuery; | ||
| import org.camunda.bpm.engine.impl.identity.IdentityProviderException; | ||
| import org.camunda.bpm.extension.keycloak.json.JsonException; | ||
| import org.springframework.web.client.HttpClientErrorException; | ||
| import org.springframework.web.client.RestClientException; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| import java.util.logging.Logger; | ||
|
|
||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.http.HttpMethod; | ||
| import org.springframework.http.HttpStatus; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.google.gson.JsonArray; | ||
| import com.google.gson.JsonObject; | ||
|
|
||
| import static org.camunda.bpm.extension.keycloak.json.JsonUtil.*; | ||
|
|
||
| /** | ||
| * Keycloak User Service. | ||
| * Custom class for Implementation of user queries against Keycloak's REST API. | ||
| */ | ||
| public class KeycloakUserService extends org.camunda.bpm.extension.keycloak.KeycloakUserService { | ||
|
|
||
| /** This class' logger. */ | ||
| private final Logger LOGGER = Logger.getLogger(KeycloakUserService.class.getName()); | ||
|
|
||
| private String webClientId; | ||
| private boolean enableClientAuth; | ||
|
|
||
| public KeycloakUserService(KeycloakConfiguration keycloakConfiguration, KeycloakRestTemplate restTemplate, | ||
| KeycloakContextProvider keycloakContextProvider,String webClientId,boolean enableClientAuth) { | ||
| super(keycloakConfiguration, restTemplate, keycloakContextProvider); | ||
| this.webClientId = webClientId; | ||
| this.enableClientAuth = enableClientAuth; | ||
| } | ||
|
|
||
| @Override | ||
| public List<User> requestUsersByGroupId(CacheableKeycloakUserQuery query) { | ||
| String groupId = query.getGroupId(); | ||
| List<User> userList = new ArrayList<>(); | ||
|
|
||
| try { | ||
| // get Keycloak specific groupID | ||
| String keyCloakID; | ||
| try { | ||
| keyCloakID = getKeycloakGroupID(groupId); | ||
| } catch (KeycloakGroupNotFoundException e) { | ||
| // group not found: empty search result | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| // get members of this group | ||
| ResponseEntity<String> response = restTemplate.exchange( | ||
| keycloakConfiguration.getKeycloakAdminUrl() + "/groups/" + keyCloakID + "/members?max=" + getMaxQueryResultSize(), | ||
| HttpMethod.GET, String.class); | ||
| if (!response.getStatusCode().equals(HttpStatus.OK)) { | ||
| throw new IdentityProviderException( | ||
| "Unable to read group members from " + keycloakConfiguration.getKeycloakAdminUrl() | ||
| + ": HTTP status code " + response.getStatusCodeValue()); | ||
| } | ||
|
|
||
| JsonArray searchResult = parseAsJsonArray(response.getBody()); | ||
| for (int i = 0; i < searchResult.size(); i++) { | ||
| JsonObject keycloakUser = getJsonObjectAtIndex(searchResult, i); | ||
| if (keycloakConfiguration.isUseEmailAsCamundaUserId() && | ||
| !StringUtils.hasLength(getJsonString(keycloakUser, "email"))) { | ||
| continue; | ||
| } | ||
| if (keycloakConfiguration.isUseUsernameAsCamundaUserId() && | ||
| !StringUtils.hasLength(getJsonString(keycloakUser, "username"))) { | ||
| continue; | ||
| } | ||
| userList.add(transformUser(keycloakUser)); | ||
| } | ||
|
|
||
| } catch (HttpClientErrorException hcee) { | ||
| // if groupID is unknown server answers with HTTP 404 not found | ||
| if (hcee.getStatusCode().equals(HttpStatus.NOT_FOUND)) { | ||
| return Collections.emptyList(); | ||
| } | ||
| throw hcee; | ||
| } catch (RestClientException | JsonException rce) { | ||
| throw new IdentityProviderException("Unable to query members of group " + groupId, rce); | ||
| } | ||
|
|
||
| return userList; | ||
| } | ||
|
|
||
| private UserEntity transformUser(JsonObject result) throws JsonException { | ||
| UserEntity user = new UserEntity(); | ||
| String userId = getJsonString(result, "username"); | ||
| JsonObject attributes = getJsonObject(result, "attributes"); | ||
| if(attributes != null) { | ||
| JsonArray userIds = attributes.getAsJsonArray("userid"); | ||
| if(userIds != null) { | ||
| userId = userIds.get(0).getAsString(); | ||
| } | ||
| } | ||
|
|
||
| String email = getJsonString(result, "email"); | ||
| String firstName = getJsonString(result, "firstName"); | ||
| String lastName = getJsonString(result, "lastName"); | ||
| user.setId(userId); | ||
| user.setEmail(email); | ||
| user.setFirstName(firstName); | ||
| user.setLastName(lastName); | ||
| return user; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters