You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/01/10 18:29:06 UTC
stratos git commit: Moving artifact repository password encryption
logic to clients
Repository: stratos
Updated Branches:
refs/heads/master 870d1f820 -> 58b3edba8
Moving artifact repository password encryption logic to clients
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/58b3edba
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/58b3edba
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/58b3edba
Branch: refs/heads/master
Commit: 58b3edba8b5b034e57b9ba8783aacb03dc408186
Parents: 870d1f8
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Jan 10 22:58:39 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Jan 10 22:58:58 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoScalerServiceImpl.java | 34 ++++++++++-
.../components/ApplicationSignUpHandler.java | 47 +--------------
.../rest/endpoint/api/StratosApiV41Utils.java | 60 +++++++++++++++-----
3 files changed, 78 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/58b3edba/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
index 733e38f..5aa4abe 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoScalerServiceImpl.java
@@ -51,6 +51,7 @@ import org.apache.stratos.autoscaler.util.AutoscalerUtil;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.Property;
import org.apache.stratos.common.client.StratosManagerServiceClient;
+import org.apache.stratos.common.util.CommonUtil;
import org.apache.stratos.manager.service.stub.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.manager.service.stub.domain.application.signup.ArtifactRepository;
import org.apache.stratos.messaging.domain.application.Application;
@@ -213,7 +214,7 @@ public class AutoScalerServiceImpl implements AutoScalerService {
// Add deployment policy
PolicyManager.getInstance().addDeploymentPolicy(deploymentPolicy);
// Add application signup in stratos manager
- addApplicationSignUp(applicationContext);
+ addApplicationSignUp(applicationContext, application.getKey());
applicationContext.setStatus(ApplicationContext.STATUS_DEPLOYED);
AutoscalerContext.getInstance().updateApplicationContext(applicationContext);
@@ -260,7 +261,7 @@ public class AutoScalerServiceImpl implements AutoScalerService {
}
}
- private void addApplicationSignUp(ApplicationContext applicationContext) {
+ private void addApplicationSignUp(ApplicationContext applicationContext, String applicationKey) {
try {
if(log.isInfoEnabled()) {
log.info(String.format("Adding application signup: [application-id] %s",
@@ -292,7 +293,10 @@ public class AutoScalerServiceImpl implements AutoScalerService {
new ArtifactRepository[artifactRepositoryList.size()]);
applicationSignUp.setArtifactRepositories(artifactRepositoryArray);
- StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
+ // Encrypt artifact repository passwords
+ encryptRepositoryPasswords(applicationSignUp, applicationKey);
+
+ StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
serviceClient.addApplicationSignUp(applicationSignUp);
if(log.isInfoEnabled()) {
@@ -307,6 +311,30 @@ public class AutoScalerServiceImpl implements AutoScalerService {
}
}
+ /**
+ * Encrypt artifact repository passwords.
+ * @param applicationSignUp
+ * @param applicationKey
+ */
+ private void encryptRepositoryPasswords(ApplicationSignUp applicationSignUp, String applicationKey) {
+ if (applicationSignUp.getArtifactRepositories() != null) {
+ for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
+ String repoPassword = artifactRepository.getRepoPassword();
+ if ((artifactRepository != null) && (StringUtils.isNotBlank(repoPassword))) {
+ String encryptedRepoPassword = CommonUtil.encryptPassword(repoPassword,
+ applicationKey);
+ artifactRepository.setRepoPassword(encryptedRepoPassword);
+
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Artifact repository password encrypted: [application-id] %s " +
+ "[tenant-id] %d [repo-url] %s", applicationSignUp.getApplicationId(),
+ applicationSignUp.getTenantId(), artifactRepository.getRepoUrl()));
+ }
+ }
+ }
+ }
+ }
+
private void updateArtifactRepositoryList(List<ArtifactRepository> artifactRepositoryList, CartridgeContext[] cartridgeContexts) {
for(CartridgeContext cartridgeContext : cartridgeContexts) {
SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
http://git-wip-us.apache.org/repos/asf/stratos/blob/58b3edba/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
index 8a588e5..5e57b6d 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
@@ -61,34 +61,23 @@ public class ApplicationSignUpHandler {
String applicationId = applicationSignUp.getApplicationId();
int tenantId = applicationSignUp.getTenantId();
+ List<String> clusterIds = applicationSignUp.getClusterIds();
try {
- ApplicationManager.acquireReadLockForApplication(applicationId);
-
if (log.isInfoEnabled()) {
log.info(String.format("Adding application signup: [application-id] %s [tenant-id] %d",
applicationId, tenantId));
}
- Application application = ApplicationManager.getApplications().getApplication(applicationId);
- if (application == null) {
- throw new RuntimeException(String.format("Application not found: [application-id] %s", applicationId));
- }
-
if (applicationSignUpExist(applicationId, tenantId)) {
throw new RuntimeException(String.format("Tenant has already signed up for application: " +
"[application-id] %s [tenant-id] %d", applicationId, tenantId));
}
- // Encrypt artifact repository passwords
- encryptRepositoryPasswords(applicationSignUp, application.getKey());
-
// Persist application signup
String resourcePath = prepareApplicationSignupResourcePath(applicationId, tenantId);
RegistryManager.getInstance().persist(resourcePath, applicationSignUp);
- // TODO: Add logic to filter cluster ids based on tenant id, tenant range
- List<String> clusterIds = findClusterIds(application);
ApplicationSignUpEventPublisher.publishApplicationSignUpAddedEvent(applicationId, tenantId, clusterIds);
if (log.isInfoEnabled()) {
@@ -99,19 +88,9 @@ public class ApplicationSignUpHandler {
String message = "Could not add application signup";
log.error(message, e);
throw new ApplicationSignUpException(message, e);
- } finally {
- ApplicationManager.releaseReadLockForApplication(applicationId);
}
}
- private List<String> findClusterIds(Application application) {
- List<String> clusterIds = new ArrayList<String>();
- for(ClusterDataHolder clusterData : application.getClusterDataRecursively()) {
- clusterIds.add(clusterData.getClusterId());
- }
- return clusterIds;
- }
-
/**
* Check application signup availability.
* @param applicationId
@@ -132,30 +111,6 @@ public class ApplicationSignUpHandler {
}
/**
- * Encrypt artifact repository passwords.
- * @param applicationSignUp
- * @param applicationKey
- */
- private void encryptRepositoryPasswords(ApplicationSignUp applicationSignUp, String applicationKey) {
- if (applicationSignUp.getArtifactRepositories() != null) {
- for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
- String repoPassword = artifactRepository.getRepoPassword();
- if ((artifactRepository != null) && (StringUtils.isNotBlank(repoPassword))) {
- String encryptedRepoPassword = CommonUtil.encryptPassword(repoPassword,
- applicationKey);
- artifactRepository.setRepoPassword(encryptedRepoPassword);
-
- if (log.isDebugEnabled()) {
- log.debug(String.format("Artifact repository password encrypted: [application-id] %s " +
- "[tenant-id] %d [repo-url] %s", applicationSignUp.getApplicationId(),
- applicationSignUp.getTenantId(), artifactRepository.getRepoUrl()));
- }
- }
- }
- }
- }
-
- /**
* Remove application signup by application id, tenant id.
*
* @param applicationId
http://git-wip-us.apache.org/repos/asf/stratos/blob/58b3edba/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 631983b..cc3ed64 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -33,19 +33,19 @@ import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig;
import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo;
import org.apache.stratos.cloud.controller.stub.domain.Persistence;
import org.apache.stratos.cloud.controller.stub.domain.Volume;
-import org.apache.stratos.common.beans.*;
+import org.apache.stratos.common.beans.PropertyBean;
import org.apache.stratos.common.beans.application.ApplicationBean;
import org.apache.stratos.common.beans.application.GroupBean;
import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean;
-import org.apache.stratos.common.beans.partition.ApplicationLevelNetworkPartitionBean;
-import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
+import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloadBean;
import org.apache.stratos.common.beans.cartridge.CartridgeBean;
import org.apache.stratos.common.beans.cartridge.PersistenceBean;
import org.apache.stratos.common.beans.cartridge.VolumeBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean;
import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean;
-import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloadBean;
+import org.apache.stratos.common.beans.partition.ApplicationLevelNetworkPartitionBean;
+import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
import org.apache.stratos.common.beans.topology.ApplicationInfoBean;
import org.apache.stratos.common.beans.topology.ApplicationInstanceBean;
@@ -53,7 +53,9 @@ import org.apache.stratos.common.beans.topology.GroupInstanceBean;
import org.apache.stratos.common.client.AutoscalerServiceClient;
import org.apache.stratos.common.client.CloudControllerServiceClient;
import org.apache.stratos.common.client.StratosManagerServiceClient;
+import org.apache.stratos.common.util.CommonUtil;
import org.apache.stratos.manager.service.stub.domain.application.signup.ApplicationSignUp;
+import org.apache.stratos.manager.service.stub.domain.application.signup.ArtifactRepository;
import org.apache.stratos.manager.utils.ApplicationManagementUtil;
import org.apache.stratos.manager.utils.CartridgeConstants;
import org.apache.stratos.messaging.domain.application.Application;
@@ -1330,16 +1332,18 @@ public class StratosApiV41Utils {
throw new RestAPIException("Application id is null");
}
- ApplicationBean application = getApplication(applicationId);
- if(application == null) {
- throw new RestAPIException("Application does not exist: [application-id] " + applicationId);
+ ApplicationBean applicationBean = getApplication(applicationId);
+ Application application = ApplicationManager.getApplications().getApplication(applicationId);
+
+ if((applicationBean == null) || (application == null)) {
+ throw new RestAPIException("Application not found: [application-id] " + applicationId);
}
- if(!APPLICATION_STATUS_DEPLOYED.equals(application.getStatus())) {
+ if(!APPLICATION_STATUS_DEPLOYED.equals(applicationBean.getStatus())) {
throw new RestAPIException("Application has not been deployed: [application-id] " + applicationId);
}
- if(!application.isMultiTenant()) {
+ if(!applicationBean.isMultiTenant()) {
throw new RestAPIException("Application signups cannot be added to single-tenant applications");
}
@@ -1348,23 +1352,27 @@ public class StratosApiV41Utils {
}
if(StringUtils.isBlank(applicationSignUpBean.getApplicationId())) {
- throw new RestAPIException("Application id in application signup is null");
+ throw new RestAPIException("Application id in applicationBean signup is null");
}
if(!applicationId.equals(applicationSignUpBean.getApplicationId())) {
- throw new RestAPIException("Application id does not match with application id in application signup");
+ throw new RestAPIException("Application id does not match with applicationBean id in applicationBean signup");
}
try {
if(log.isInfoEnabled()) {
- log.info(String.format("Adding application signup: [application-id] %s", applicationId));
+ log.info(String.format("Adding applicationBean signup: [application-id] %s", applicationId));
}
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
- StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
ApplicationSignUp applicationSignUp = ObjectConverter.convertApplicationSignUpBeanToStubApplicationSignUp(applicationSignUpBean);
applicationSignUp.setTenantId(tenantId);
+
+ // Encrypt artifact repository passwords
+ encryptRepositoryPasswords(applicationSignUp, application.getKey());
+
+ StratosManagerServiceClient serviceClient = StratosManagerServiceClient.getInstance();
serviceClient.addApplicationSignUp(applicationSignUp);
if(log.isInfoEnabled()) {
@@ -1378,12 +1386,36 @@ public class StratosApiV41Utils {
applicationId, tenantId));
}
} catch (Exception e) {
- String message = "Error in application signup: [application-id] " + applicationId;
+ String message = "Error in applicationBean signup: [application-id] " + applicationId;
log.error(message, e);
throw new RestAPIException(message, e);
}
}
+ /**
+ * Encrypt artifact repository passwords.
+ * @param applicationSignUp
+ * @param applicationKey
+ */
+ private static void encryptRepositoryPasswords(ApplicationSignUp applicationSignUp, String applicationKey) {
+ if (applicationSignUp.getArtifactRepositories() != null) {
+ for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
+ String repoPassword = artifactRepository.getRepoPassword();
+ if ((artifactRepository != null) && (StringUtils.isNotBlank(repoPassword))) {
+ String encryptedRepoPassword = CommonUtil.encryptPassword(repoPassword,
+ applicationKey);
+ artifactRepository.setRepoPassword(encryptedRepoPassword);
+
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Artifact repository password encrypted: [application-id] %s " +
+ "[tenant-id] %d [repo-url] %s", applicationSignUp.getApplicationId(),
+ applicationSignUp.getTenantId(), artifactRepository.getRepoUrl()));
+ }
+ }
+ }
+ }
+ }
+
public static ApplicationSignUpBean getApplicationSignUp(String applicationId) throws RestAPIException {
if(StringUtils.isBlank(applicationId)) {
throw new RestAPIException("Application id is null");