You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/03/21 16:22:15 UTC
git commit: Fixing mistakenly removed git repo password encryption
logic. Changed few agent logs to debug mode
Repository: incubator-stratos
Updated Branches:
refs/heads/master 484b6277c -> 027875f1d
Fixing mistakenly removed git repo password encryption logic. Changed few agent logs to debug mode
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/027875f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/027875f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/027875f1
Branch: refs/heads/master
Commit: 027875f1d6e3705a61daf2efdf1f5f6e985a2824
Parents: 484b627
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Fri Mar 21 20:51:46 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Fri Mar 21 20:51:46 2014 +0530
----------------------------------------------------------------------
.../cartridge/agent/RepositoryFileListener.java | 8 +-
.../git/impl/GitBasedArtifactRepository.java | 90 ++------------------
.../publisher/HealthStatisticsNotifier.java | 8 +-
.../agent/util/CartridgeAgentUtils.java | 17 +++-
.../manager/CartridgeSubscriptionManager.java | 11 ++-
5 files changed, 36 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/027875f1/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/RepositoryFileListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/RepositoryFileListener.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/RepositoryFileListener.java
index 77c844c..8e79c66 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/RepositoryFileListener.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/RepositoryFileListener.java
@@ -29,12 +29,12 @@ public class RepositoryFileListener implements Runnable {
@Override
public void run() {
- if(log.isInfoEnabled()) {
- log.info("Executing repository file listener");
+ if(log.isDebugEnabled()) {
+ log.debug("Executing repository file listener");
}
boolean commitStatus = GitBasedArtifactRepository.getInstance().commit();
- if(log.isInfoEnabled()) {
- log.info("Commit status: " + commitStatus);
+ if(log.isDebugEnabled()) {
+ log.debug("Commit status: " + commitStatus);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/027875f1/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
index c614ad7..0e3982b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
@@ -280,7 +280,7 @@ public class GitBasedArtifactRepository {
//log.info("status : " + status.toString());
if (status.isClean()) {// no changes, nothing to commit
- log.info("No changes detected in the local repository for tenant "
+ log.debug("No changes detected in the local repository for tenant "
+ tenantId);
return false;
}
@@ -519,8 +519,8 @@ public class GitBasedArtifactRepository {
* @return true if success, else false
*/
private boolean pullArtifacts (RepositoryContext gitRepoCtx) {
- if(log.isInfoEnabled()) {
- log.info("Pulling artifacts");
+ if(log.isDebugEnabled()) {
+ log.debug("Pulling artifacts");
}
PullCommand pullCmd = gitRepoCtx.getGit().pull();
@@ -612,10 +612,7 @@ public class GitBasedArtifactRepository {
log.error("Error saving git configuration file in local repo at " + gitRepoCtx.getGitLocalRepoPath(), e);
e.printStackTrace();
- } /*catch (ConfigInvalidException e) {
- log.error("Invalid configurations in local repo at " + gitRepoCtx.getGitLocalRepoPath(), e);
- e.printStackTrace();
- } */
+ }
}
}
}
@@ -677,32 +674,6 @@ public class GitBasedArtifactRepository {
* username/password is not valid
*/
private static UsernamePasswordCredentialsProvider createCredentialsProvider (RepositoryContext gitRepoCtx) {
-
- //RepositoryCredentials repoCredentials = null;
- // TODO - set repo creds using the received message
- //repoCredentials = new RepositoryCredentials();
-
- /*try {
- repoCredentials = gitRepoCtx.getRepoInfoServiceClient().
- getJsonRepositoryInformation(gitRepoCtx.getTenantId(), cartridgeShortName);
-
- } catch (Exception e) {
- log.error("Git json repository information query failed", e);
- return null;
- }*/
-
- /*if (repoCredentials != null) {
- String userName = repoCredentials.getUserName();
- String password = repoCredentials.getPassword();
-
- log.info("Recieved repo url [" + repoCredentials.getUrl() + "] for tenant " + gitRepoCtx.getTenantId() +
- ", username " + userName);
-
- if (userName!= null && password != null) {
- return new UsernamePasswordCredentialsProvider(userName, password);
- }
- }*/
-
return new UsernamePasswordCredentialsProvider(gitRepoCtx.getRepoUsername(), gitRepoCtx.getRepoPassword());
}
@@ -724,33 +695,6 @@ public class GitBasedArtifactRepository {
return false;
}
- /**
- * Calls a utility method to extract the username from a json string
- *
- * @param repoInfoJsonString json format string
- *
- * @return username if exists, else an empty String
- */
- private String getUserName (String repoInfoJsonString) {
- return Utilities.getMatch(repoInfoJsonString,
- GitDeploymentSynchronizerConstants.USERNAME_REGEX, 1);
- }
-
- /**
- * Calls a utility method to extract the password from a json string
- *
- * @param repoInfoJsonString json format string
- *
- * @return password if exists, else an empty String
- */
- private String getPassword (String repoInfoJsonString) {
- return Utilities.getMatch(repoInfoJsonString,
- GitDeploymentSynchronizerConstants.PASSWORD_REGEX, 1);
- }
-
- /* public void initAutoCheckout(boolean b) throws Exception {
-
- }*/
public void cleanupAutoCheckout() {
@@ -758,32 +702,8 @@ public class GitBasedArtifactRepository {
public String getRepositoryType() {
- return /*DeploymentSynchronizerConstants.REPOSITORY_TYPE_GIT;*/null;
- }
-
- /* public List<RepositoryConfigParameter> getParameters() {
-
return null;
- }*/
-
- //public boolean update(String rootPath, String filePath, int depth) throws DeploymentSynchronizerException {
-
- // TODO - implemetn later
-
- /*RepositoryContext gitRepoCtx = retrieveCachedGitContext(filePath);
- if(gitRepoCtx == null) {
- if(log.isDebugEnabled())
- log.debug("No git repository context information found for deployment synchonizer at " + filePath);
-
- return false;
- }
- if(gitRepoCtx.getTenantId() == GitDeploymentSynchronizerConstants.SUPER_TENANT_ID)
- return true; //Super Tenant is inactive
- if(gitRepoCtx.cloneExists())
- return pullArtifacts(gitRepoCtx);*/
-
- /* return false;
- }*/
+ }
private class ArtifactSyncTask implements Runnable {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/027875f1/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
index d8a04e7..e6c7e28 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
@@ -71,8 +71,8 @@ public class HealthStatisticsNotifier implements Runnable {
}
double memoryConsumption = HealthStatisticsReader.getMemoryConsumption();
- if(log.isInfoEnabled()) {
- log.info(String.format("Publishing memory consumption: %f", memoryConsumption));
+ if(log.isDebugEnabled()) {
+ log.debug(String.format("Publishing memory consumption: %f", memoryConsumption));
}
statsPublisher.publish(
CartridgeAgentConfiguration.getInstance().getClusterId(),
@@ -84,8 +84,8 @@ public class HealthStatisticsNotifier implements Runnable {
);
double loadAverage = HealthStatisticsReader.getLoadAverage();
- if(log.isInfoEnabled()) {
- log.info(String.format("Publishing load average: %f", loadAverage));
+ if(log.isDebugEnabled()) {
+ log.debug(String.format("Publishing load average: %f", loadAverage));
}
statsPublisher.publish(
CartridgeAgentConfiguration.getInstance().getClusterId(),
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/027875f1/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
index 7e44cc9..8c2aca9 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
@@ -52,6 +52,11 @@ public class CartridgeAgentUtils {
}
public static String decryptPassword(String repoUserPassword) {
+
+ if(repoUserPassword == null) {
+ return repoUserPassword;
+ }
+
String decryptPassword = "";
String secret = CartridgeAgentConfiguration.getInstance().getCartridgeKey();
SecretKey key;
@@ -66,8 +71,12 @@ public class CartridgeAgentUtils {
byte[] decrypted = cipher.doFinal(encrypted);
decryptPassword = new String(decrypted);
} catch (Exception e) {
+ log.error("Exception has occurred. " + e.getMessage());
e.printStackTrace();
}
+ if (log.isDebugEnabled()) {
+ log.debug("Decrypted PWD : [" + decryptPassword + "] ");
+ }
return decryptPassword;
}
@@ -111,12 +120,12 @@ public class CartridgeAgentUtils {
SocketAddress httpSockaddr = new InetSocketAddress(ipAddress, port);
socket = new Socket();
socket.connect(httpSockaddr, 5000);
- if (log.isInfoEnabled()) {
- log.info(String.format("Port %s is active", port));
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Port %s is active", port));
}
} catch (Exception e) {
- if (log.isInfoEnabled()) {
- log.info(String.format("Port %s is not active", port));
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Port %s is not active", port));
}
return false;
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/027875f1/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 24cfa66..0b63076 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
@@ -45,6 +45,7 @@ import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils;
import org.apache.stratos.manager.topology.model.TopologyClusterInformationModel;
import org.apache.stratos.manager.utils.ApplicationManagementUtil;
import org.apache.stratos.manager.utils.CartridgeConstants;
+import org.apache.stratos.manager.utils.RepoPasswordMgtUtil;
import org.apache.stratos.messaging.util.Constants;
import org.wso2.carbon.context.CarbonContext;
@@ -243,10 +244,18 @@ public class CartridgeSubscriptionManager {
// Generate and set the key
String subscriptionKey = CartridgeSubscriptionUtils.generateSubscriptionKey();
cartridgeSubscription.setSubscriptionKey(subscriptionKey);
+
+ String encryptedRepoPassword;
+ String repositoryPassword = subscriptionData.getRepositoryPassword();
+ if(repositoryPassword != null && !repositoryPassword.isEmpty()) {
+ encryptedRepoPassword = RepoPasswordMgtUtil.encryptPassword(repositoryPassword, subscriptionKey);
+ } else {
+ encryptedRepoPassword = repositoryPassword;
+ }
// Create repository
Repository repository = cartridgeSubscription.manageRepository(subscriptionData.getRepositoryURL(), subscriptionData.getRepositoryUsername(),
- subscriptionData.getRepositoryPassword(),
+ encryptedRepoPassword,
subscriptionData.isPrivateRepository());
// Create subscriber