Updated Branches: refs/heads/master a925c70ec -> ec878b343
Encrypting repo password before persisting, fixing STRATOS-362 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/89135573 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/89135573 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/89135573 Branch: refs/heads/master Commit: 891355731f9b0262aeadfb983fbd33e08cdf8c6a Parents: af0b54d Author: Sajith Kariyawasam <[email protected]> Authored: Fri Jan 17 12:08:47 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Fri Jan 17 12:08:47 2014 +0530 ---------------------------------------------------------------------- .../manager/manager/CartridgeSubscriptionManager.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/89135573/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index 7e00740..d81e5cc 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -39,6 +39,7 @@ import org.apache.stratos.manager.subscription.tenancy.SubscriptionTenancyBehavi import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils; import org.apache.stratos.manager.utils.ApplicationManagementUtil; import org.apache.stratos.manager.utils.CartridgeConstants; +import org.apache.stratos.manager.utils.RepoPasswordMgtUtil; import org.wso2.carbon.context.CarbonContext; import java.util.Collection; @@ -149,11 +150,14 @@ public class CartridgeSubscriptionManager { //Create the CartridgeSubscription instance CartridgeSubscription cartridgeSubscription = CartridgeSubscriptionFactory. getCartridgeSubscriptionInstance(cartridgeInfo, tenancyBehaviour); - + + String subscriptionKey = CartridgeSubscriptionUtils.generateSubscriptionKey(); + String encryptedRepoPassword = RepoPasswordMgtUtil.encryptPassword(repositoryPassword, subscriptionKey); + //Create repository Repository repository = cartridgeSubscription.manageRepository(repositoryURL, repositoryUsername, - repositoryPassword, + encryptedRepoPassword, isPrivateRepository, cartridgeAlias, cartridgeInfo, tenantDomain); @@ -162,7 +166,7 @@ public class CartridgeSubscriptionManager { Subscriber subscriber = new Subscriber(tenantAdminUsername, tenantId, tenantDomain); //Set the key - cartridgeSubscription.setSubscriptionKey(CartridgeSubscriptionUtils.generateSubscriptionKey()); + cartridgeSubscription.setSubscriptionKey(subscriptionKey); //create subscription cartridgeSubscription.createSubscription(subscriber, cartridgeAlias, autoscalingPolicyName,
