apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #927 from karuturi/secure-configs

Browse Source 
CLOUDSTACK-9901 secure and hidden config values are returned as plaintext string
This commit is contained in:
Rajani Karuturi 2017-06-06 15:37:44 +05:30 committed by GitHub
commit 511ebe6dd4
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/config/src/org/apache/cloudstack/config/Configuration.java
View File

@ -81,4 +81,10 @@ public interface Configuration {
* parameter is no longer used and can be deleted. * parameter is no longer used and can be deleted.
*/ */
Date getUpdated(); Date getUpdated();
/**
*
* @return returns true if the configuration is encrypted else false.
*/
boolean isEncrypted();
} }

7
framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
View File

@ -122,7 +122,7 @@ public class ConfigurationVO implements Configuration {
@Override @Override
public String getValue() { public String getValue() {
if(isEncryptedConfig()) { if(isEncrypted()) {
return DBEncryptionUtil.decrypt(value); return DBEncryptionUtil.decrypt(value);
} else { } else {
return value; return value;
@ -130,14 +130,15 @@ public class ConfigurationVO implements Configuration {
} }
public void setValue(String value) { public void setValue(String value) {
if(isEncryptedConfig()) { if(isEncrypted()) {
this.value = DBEncryptionUtil.encrypt(value); this.value = DBEncryptionUtil.encrypt(value);
} else { } else {
this.value = value; this.value = value;
} }
} }
private boolean isEncryptedConfig() { @Override
public boolean isEncrypted() {
return "Hidden".equals(getCategory()) || "Secure".equals(getCategory()); return "Hidden".equals(getCategory()) || "Secure".equals(getCategory());
} }

5
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -16,6 +16,7 @@
// under the License. // under the License.
package com.cloud.api; package com.cloud.api;
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.agent.api.VgpuTypesInfo; import com.cloud.agent.api.VgpuTypesInfo;
import com.cloud.api.query.ViewResponseHelper; import com.cloud.api.query.ViewResponseHelper;
import com.cloud.api.query.vo.AccountJoinVO; import com.cloud.api.query.vo.AccountJoinVO;
@ -455,7 +456,11 @@ public class ApiResponseHelper implements ResponseGenerator {
cfgResponse.setCategory(cfg.getCategory()); cfgResponse.setCategory(cfg.getCategory());
cfgResponse.setDescription(cfg.getDescription()); cfgResponse.setDescription(cfg.getDescription());
cfgResponse.setName(cfg.getName()); cfgResponse.setName(cfg.getName());
if(cfg.isEncrypted()) {
cfgResponse.setValue(DBEncryptionUtil.encrypt(cfg.getValue()));
} else {
cfgResponse.setValue(cfg.getValue()); cfgResponse.setValue(cfg.getValue());
}
cfgResponse.setObjectName("configuration"); cfgResponse.setObjectName("configuration");
return cfgResponse; return cfgResponse;

8
test/integration/smoke/test_internal_lb.py
View File

@ -705,8 +705,12 @@ class TestInternalLb(cloudstackTestCase):
self.apiclient, name="network.loadbalancer.haproxy.stats.port")[0].value self.apiclient, name="network.loadbalancer.haproxy.stats.port")[0].value
settings["stats_uri"] = Configurations.list( settings["stats_uri"] = Configurations.list(
self.apiclient, name="network.loadbalancer.haproxy.stats.uri")[0].value self.apiclient, name="network.loadbalancer.haproxy.stats.uri")[0].value
settings["username"], settings["password"] = Configurations.list( # Update global setting network.loadbalancer.haproxy.stats.auth to a known value
self.apiclient, name="network.loadbalancer.haproxy.stats.auth")[0].value.split(":") haproxy_auth = "admin:password"
Configurations.update(self.apiclient, "network.loadbalancer.haproxy.stats.auth", haproxy_auth)
self.logger.debug(
"Updated global setting stats network.loadbalancer.haproxy.stats.auth to %s" % (haproxy_auth))
settings["username"], settings["password"] = haproxy_auth.split(":")
settings["visibility"] = Configurations.list( settings["visibility"] = Configurations.list(
self.apiclient, name="network.loadbalancer.haproxy.stats.visibility")[0].value self.apiclient, name="network.loadbalancer.haproxy.stats.visibility")[0].value
self.logger.debug(settings) self.logger.debug(settings)