forked from apache/atlas
-
Notifications
You must be signed in to change notification settings - Fork 10
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 #2736 from atlanhq/plt-524-auth-api
feat: Policy Cache mechanism improvements[staging]
- Loading branch information
Showing
28 changed files
with
633 additions
and
434 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
315 changes: 75 additions & 240 deletions
315
auth-agents-common/src/main/java/org/apache/atlas/plugin/util/KeycloakUserStore.java
Large diffs are not rendered by default.
Oops, something went wrong.
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
100 changes: 100 additions & 0 deletions
100
client-auth/src/main/java/org/apache/atlas/auth/client/config/AuthConfig.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,100 @@ | ||
| package org.apache.atlas.auth.client.config; | ||
|
|
||
| import org.apache.atlas.AtlasErrorCode; | ||
| import org.apache.atlas.exception.AtlasBaseException; | ||
| import org.apache.commons.lang.StringUtils; | ||
| import org.codehaus.jettison.json.JSONObject; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.File; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.util.Optional; | ||
|
|
||
| import static org.apache.atlas.ApplicationProperties.ATLAS_CONFIGURATION_DIRECTORY_PROPERTY; | ||
|
|
||
| public class AuthConfig { | ||
| private static final Logger LOG = LoggerFactory.getLogger(AuthConfig.class); | ||
|
|
||
| public String authServerUrl; | ||
| public String realmId; | ||
| public String clientId; | ||
| public String clientSecret; | ||
| public String grantType; | ||
| public String heraclesApiServerUrl; | ||
|
|
||
| private static final String KEYCLOAK_PROPERTIES = "keycloak.json"; | ||
| private static final String DEFAULT_GRANT_TYPE = "client_credentials"; | ||
| private static final String KEY_REALM_ID = "realm"; | ||
| private static final String KEY_AUTH_SERVER_URL = "auth-server-url"; | ||
| private static final String KEY_CLIENT_ID = "resource"; | ||
| private static final String KEY_CREDENTIALS = "credentials"; | ||
| private static final String KEY_SECRET = "secret"; | ||
|
|
||
| public String getAuthServerUrl() { | ||
| return authServerUrl; | ||
| } | ||
|
|
||
| public String getRealmId() { | ||
| return realmId; | ||
| } | ||
|
|
||
| public String getClientId() { | ||
| return clientId; | ||
| } | ||
|
|
||
| public String getClientSecret() { | ||
| return clientSecret; | ||
| } | ||
|
|
||
| public String getGrantType() { | ||
| return grantType; | ||
| } | ||
|
|
||
| public String getHeraclesApiServerUrl() { | ||
| return heraclesApiServerUrl; | ||
| } | ||
|
|
||
| public static AuthConfig getConfig() throws AtlasBaseException { | ||
| String confLocation = System.getProperty(ATLAS_CONFIGURATION_DIRECTORY_PROPERTY); | ||
| Optional<File> confFile = getConfigurationFile(confLocation); | ||
|
|
||
| if (confFile.isPresent()) { | ||
| try { | ||
| JSONObject object = new JSONObject(readFileToString(confFile.get())); | ||
| return buildAuthConfigFromJson(object); | ||
| } catch (Exception e) { | ||
| LOG.error("Error parsing Keycloak configuration: ", e); | ||
| throw new AtlasBaseException(AtlasErrorCode.KEYCLOAK_INIT_FAILED, "Error parsing Keycloak configuration"); | ||
| } | ||
| } else { | ||
| throw new AtlasBaseException(AtlasErrorCode.KEYCLOAK_INIT_FAILED, "Keycloak configuration file not found in location " + confLocation); | ||
| } | ||
| } | ||
|
|
||
| private static Optional<File> getConfigurationFile(String confLocation) { | ||
| if (StringUtils.isNotEmpty(confLocation)) { | ||
| File confFile = new File(confLocation, KEYCLOAK_PROPERTIES); | ||
| if (confFile.exists()) { | ||
| return Optional.of(confFile); | ||
| } | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| private static String readFileToString(File file) throws Exception { | ||
| return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8); | ||
| } | ||
|
|
||
| private static AuthConfig buildAuthConfigFromJson(JSONObject object) throws Exception { | ||
| String realmId = object.getString(KEY_REALM_ID); | ||
| String authServerUrl = object.getString(KEY_AUTH_SERVER_URL) + "/"; | ||
| String clientId = object.getString(KEY_CLIENT_ID); | ||
| String grantType = DEFAULT_GRANT_TYPE; | ||
| String clientSecret = object.getJSONObject(KEY_CREDENTIALS).getString(KEY_SECRET); | ||
|
|
||
| LOG.info("Keycloak configuration: REALM_ID:{}, AUTH_SERVER_URL:{}", realmId, authServerUrl); | ||
| return AuthConfigBuilder.builder().realId(realmId).authServerUrl(authServerUrl).clientId(clientId).grantType(grantType).clientSecret(clientSecret).build(); | ||
| } | ||
| } |
55 changes: 55 additions & 0 deletions
55
client-auth/src/main/java/org/apache/atlas/auth/client/config/AuthConfigBuilder.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,55 @@ | ||
| package org.apache.atlas.auth.client.config; | ||
|
|
||
| import org.apache.atlas.AtlasConfiguration; | ||
|
|
||
| public class AuthConfigBuilder { | ||
|
|
||
| private String authServerUrl; | ||
| private String realmId; | ||
| private String clientId; | ||
| private String clientSecret; | ||
| private String grantType = "client_credentials"; | ||
|
|
||
| private AuthConfigBuilder() { | ||
| } | ||
|
|
||
| public static AuthConfigBuilder builder() { | ||
| return new AuthConfigBuilder(); | ||
| } | ||
|
|
||
| public AuthConfigBuilder authServerUrl(String authServerUrl) { | ||
| this.authServerUrl = authServerUrl; | ||
| return this; | ||
| } | ||
|
|
||
| public AuthConfigBuilder realId(String realId) { | ||
| this.realmId = realId; | ||
| return this; | ||
| } | ||
|
|
||
| public AuthConfigBuilder clientId(String clientId) { | ||
| this.clientId = clientId; | ||
| return this; | ||
| } | ||
|
|
||
| public AuthConfigBuilder clientSecret(String clientSecret) { | ||
| this.clientSecret = clientSecret; | ||
| return this; | ||
| } | ||
|
|
||
| public AuthConfigBuilder grantType(String grantType) { | ||
| this.grantType = grantType; | ||
| return this; | ||
| } | ||
|
|
||
| public AuthConfig build() { | ||
| AuthConfig authConfig = new AuthConfig(); | ||
| authConfig.authServerUrl = authServerUrl; | ||
| authConfig.realmId = realmId; | ||
| authConfig.clientId = clientId; | ||
| authConfig.clientSecret = clientSecret; | ||
| authConfig.grantType = grantType; | ||
| authConfig.heraclesApiServerUrl= AtlasConfiguration.HERACLES_API_SERVER_URL.getString()+"/"; | ||
| return authConfig; | ||
| } | ||
| } |
Oops, something went wrong.