FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work by karuturi · Pull Request #34 · apache/cloudstack · GitHub

/ cloudstack Public

CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
karuturi wants to merge 4 commits into from
Conversation 0 Commits 4 Checks 0 Files changed
Closed

CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d5451c
Fixed CLOUDSTACK-7242: Adding a securing config using configDepo does…
karuturi Nov 4, 2014
0c2dc46
CLOUDSTACK-7384: UI > Instances > detailView > change service offerin…
Nov 4, 2014
f9060bc
CLOUDSTACK-7383: UI > Instances > detailView > snapshot option > hide…
Nov 4, 2014
c526056
CLOUDSTACK-7841: Gracefully reload haproxy config
Nov 5, 2014
File filter

Filter by extension

Filter by extension .java  (3) .js  (1) .sh  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 0 additions & 3 deletions framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,6 @@ public String getValueAndInitIfNotExist(String name, String category, String ini
update(name, category, initValue);
}
} else {
if (category.equals("Hidden") || category.equals("Secure")) {
initValue = DBEncryptionUtil.encrypt(initValue);
}
ConfigurationVO newConfig = new ConfigurationVO(category, "DEFAULT", "management-server", name, initValue, desc);
persist(newConfig);
}
Expand Down
18 changes: 15 additions & 3 deletions framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ public ConfigurationVO(String category, String instance, String component, Strin
this.instance = instance;
this.component = component;
this.name = name;
this.value = value;
this.description = description;
setValue(value);
}

public ConfigurationVO(String component, ConfigKey<?> key) {
Expand Down Expand Up @@ -122,11 +122,23 @@ public void setName(String name) {

@Override
public String getValue() {
return (("Hidden".equals(getCategory()) || "Secure".equals(getCategory())) ? DBEncryptionUtil.decrypt(value) : value);
if(isEncryptedConfig()) {
return DBEncryptionUtil.decrypt(value);
} else {
return value;
}
}

public void setValue(String value) {
this.value = value;
if(isEncryptedConfig()) {
this.value = DBEncryptionUtil.encrypt(value);
} else {
this.value = value;
}
}

private boolean isEncryptedConfig() {
return "Hidden".equals(getCategory()) || "Secure".equals(getCategory());
}

@Override
Expand Down
3 changes: 1 addition & 2 deletions server/src/com/cloud/server/ConfigurationServerImpl.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ public void persistDefaultValues() throws InternalErrorException {
String instance = "DEFAULT";
String component = c.getComponent();
String value = c.getDefaultValue();
value = ("Hidden".equals(category) || "Secure".equals(category)) ? DBEncryptionUtil.encrypt(value) : value;
String description = c.getDescription();
ConfigurationVO configVO = new ConfigurationVO(category, instance, component, name, value, description);
configVO.setDefaultValue(value);
Expand Down Expand Up @@ -635,7 +634,7 @@ protected void updateSSLKeystore() {
}
String base64Keystore = getBase64Keystore(keystorePath);
ConfigurationVO configVO =
new ConfigurationVO("Hidden", "DEFAULT", "management-server", "ssl.keystore", DBEncryptionUtil.encrypt(base64Keystore),
new ConfigurationVO("Hidden", "DEFAULT", "management-server", "ssl.keystore", base64Keystore,
"SSL Keystore for the management servers");
_configDao.persist(configVO);
s_logger.info("Stored SSL keystore to database.");
Expand Down
11 changes: 2 additions & 9 deletions systemvm/patches/debian/config/root/reconfigLB.sh
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,16 @@ new_config=$1

# save previous state
mv /etc/haproxy/haproxy.cfg /etc/haproxy/haproxy.cfg.old
mv /var/run/haproxy.pid /var/run/haproxy.pid.old

mv $new_config /etc/haproxy/haproxy.cfg
kill -TTOU $(cat /var/run/haproxy.pid.old)
sleep 2
if haproxy -D -p /var/run/haproxy.pid -f /etc/haproxy/haproxy.cfg; then
if haproxy -p /var/run/haproxy.pid -f /etc/haproxy/haproxy.cfg -sf $(cat /var/run/haproxy.pid); then
logger -t cloud "New haproxy instance successfully loaded, stopping previous one."
kill -KILL $(cat /var/run/haproxy.pid.old)
rm -f /var/run/haproxy.pid.old
ret=0
else
logger -t cloud "New instance failed to start, resuming previous one."
kill -TTIN $(cat /var/run/haproxy.pid.old)
rm -f /var/run/haproxy.pid
mv /var/run/haproxy.pid.old /var/run/haproxy.pid
mv /etc/haproxy/haproxy.cfg $new_config
mv /etc/haproxy/haproxy.cfg.old /etc/haproxy/haproxy.cfg
haproxy -p /var/run/haproxy.pid -f /etc/haproxy/haproxy.cfg -sf $(cat /var/run/haproxy.pid)
ret=1
fi

Expand Down
16 changes: 12 additions & 4 deletions ui/scripts/instances.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2248,13 +2248,17 @@
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");
allowedActions.push("restart");
if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)

if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
|| (jsonObj.hypervisor != 'LXC')) {
allowedActions.push("snapshot");
}

allowedActions.push("destroy");
allowedActions.push("reinstall");

//when userVm is running, scaleUp is not supported for KVM
if (jsonObj.hypervisor != 'KVM') {
//when userVm is running, scaleUp is not supported for KVM, LXC
if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'LXC') {
allowedActions.push("scaleUp");
}

Expand All @@ -2278,8 +2282,12 @@
allowedActions.push("start");
allowedActions.push("destroy");
allowedActions.push("reinstall");
if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)

if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
|| (jsonObj.hypervisor != 'LXC')) {
allowedActions.push("snapshot");
}

allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("changeAffinity");

Expand Down
Back | FazBrowse Home | New Git URL