You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/06/05 15:58:40 UTC
[2/3] airavata git commit: AIRAVATA-2423 Configuration of custom role
names
AIRAVATA-2423 Configuration of custom role names
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1c320eb2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1c320eb2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1c320eb2
Branch: refs/heads/develop
Commit: 1c320eb2d17aa912476937aca5dac288b2b1e74c
Parents: 7157992
Author: Marcus Christie <ma...@apache.org>
Authored: Mon Jun 5 10:34:16 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon Jun 5 10:34:16 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/MigrationManager.java | 15 ++++++++++++---
.../user-profile-migration.properties.template | 5 +++++
2 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1c320eb2/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
----------------------------------------------------------------------
diff --git a/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java b/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
index a0eaf4d..6b808e2 100644
--- a/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
+++ b/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
@@ -59,8 +59,11 @@ public class MigrationManager {
private final static String GATEWAY_ID = "gateway-id";
private final static String WSO2IS_ADMIN_USERNAME = "wso2is.admin.username";
private final static String WSO2IS_ADMIN_PASSWORD = "wso2is.admin.password";
- // TODO: add role name conversions
- private final static String WSO2IS_GATEWAY_ADMIN_ROLENAME = "";
+ private final static String WSO2IS_ADMIN_ROLENAME = "wso2is.admin.rolename";
+ private final static String WSO2IS_ADMIN_READ_ONLY_ROLENAME = "wso2is.admin-read-only.rolename";
+ private final static String WSO2IS_GATEWAY_USER_ROLENAME = "wso2is.gateway-user.rolename";
+ private final static String WSO2IS_USER_PENDING_ROLENAME = "wso2is.user-pending.rolename";
+ private final static String WSO2IS_GATEWAY_PROVIDER_ROLENAME = "wso2is.gateway-provider.rolename";
private final static String PROFILE_SERVICE_HOST = "profile.service.host";
private final static String PROFILE_SERVICE_PORT = "profile.service.port";
private final static String KEYCLOAK_ADMIN_USERNAME = "keycloak.admin.username";
@@ -202,6 +205,7 @@ public class MigrationManager {
Properties properties = new Properties();
try {
properties.load(new FileInputStream(filename));
+ // Load values from properties if they exist, otherwise will just use default values
this.gatewayId = properties.getProperty(GATEWAY_ID, this.gatewayId);
this.wso2ISAdminUsername = properties.getProperty(WSO2IS_ADMIN_USERNAME, this.wso2ISAdminUsername);
this.wso2ISAdminPassword = properties.getProperty(WSO2IS_ADMIN_PASSWORD, this.wso2ISAdminPassword);
@@ -214,7 +218,12 @@ public class MigrationManager {
this.keycloakTrustStorePath = properties.getProperty(KEYCLOAK_TRUSTSTORE_PATH, this.keycloakTrustStorePath);
this.keycloakTrustStorePassword = properties.getProperty(KEYCLOAK_TRUSTSTORE_PASSWORD, this.keycloakTrustStorePassword);
this.keycloakTemporaryUserPassword = properties.getProperty(KEYCLOAK_USER_TEMP_PASSWORD, this.keycloakTemporaryUserPassword);
- // TODO: get custom IS role names
+ // Custom role names
+ this.roleConversionMap.put(properties.getProperty(WSO2IS_ADMIN_ROLENAME, "admin"), "admin");
+ this.roleConversionMap.put(properties.getProperty(WSO2IS_ADMIN_READ_ONLY_ROLENAME, "admin-read-only"), "admin-read-only");
+ this.roleConversionMap.put(properties.getProperty(WSO2IS_GATEWAY_USER_ROLENAME, "gateway-user"), "gateway-user");
+ this.roleConversionMap.put(properties.getProperty(WSO2IS_USER_PENDING_ROLENAME, "user-pending"), "user-pending");
+ this.roleConversionMap.put(properties.getProperty(WSO2IS_GATEWAY_PROVIDER_ROLENAME, "gateway-provider"), "gateway-provider");
} catch (IOException e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/1c320eb2/modules/user-profile-migration/user-profile-migration.properties.template
----------------------------------------------------------------------
diff --git a/modules/user-profile-migration/user-profile-migration.properties.template b/modules/user-profile-migration/user-profile-migration.properties.template
index dffb8b1..aa751b2 100644
--- a/modules/user-profile-migration/user-profile-migration.properties.template
+++ b/modules/user-profile-migration/user-profile-migration.properties.template
@@ -4,6 +4,11 @@ gateway-id = gateway-id
# WSO2 Identity Server settings
wso2is.admin.username = username
wso2is.admin.password = password
+wso2is.admin.rolename = admin
+wso2is.admin-read-only.rolename = admin-read-only
+wso2is.gateway-user.rolename = gateway-user
+wso2is.user-pending.rolename = user-pending
+wso2is.gateway-provider.rolename = gateway-provider
# Profile Service settings
profile.service.host = localhost