You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2014/01/17 21:36:52 UTC
[1/3] git commit: updated refs/heads/master to ca81e7b
Updated Branches:
refs/heads/master 36920a3a3 -> ca81e7b46
CLOUDSTACK-5779: Clean up savepassword scripts
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ca81e7b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ca81e7b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ca81e7b4
Branch: refs/heads/master
Commit: ca81e7b465fb40866fd14d1d1d27a2c42e1a2741
Parents: 0ea1c7d
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jan 17 11:51:42 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Jan 17 12:36:42 2014 -0800
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 2 -
scripts/network/domr/save_password_to_domr.sh | 73 --------------------
2 files changed, 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca81e7b4/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index c66b9cb..ff99b92 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -537,9 +537,7 @@ public class VirtualRoutingResource implements Manager {
protected Answer execute(final SavePasswordCommand cmd) {
final String password = cmd.getPassword();
final String routerPrivateIPAddress = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
- final String vmName = cmd.getVmName();
final String vmIpAddress = cmd.getVmIpAddress();
- final String local = vmName;
String args = "-v " + vmIpAddress;
args += " -p " + password;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca81e7b4/scripts/network/domr/save_password_to_domr.sh
----------------------------------------------------------------------
diff --git a/scripts/network/domr/save_password_to_domr.sh b/scripts/network/domr/save_password_to_domr.sh
deleted file mode 100755
index 9b44663..0000000
--- a/scripts/network/domr/save_password_to_domr.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-# $Id: save_password_to_domr.sh 9804 2010-06-22 18:36:49Z alex $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/scripts/network/domr/save_password_to_domr.sh $
-# @VERSION@
-
-PASSWD_FILE=/var/cache/cloud/passwords
-
-# $1 filename
-# $2 keyname
-# $3 value
-replace_in_file_on_domr() {
- local filename=$1
- local keyname=$2
- local value=$3
- $VIA_SSH "sed -i /$keyname=/d $filename; \
- echo "$keyname=$value" >> $filename "
-
- # $VIA_SSH "sed -e /$keyname/d $filename > $filename.new; \
- # mv $filename.new $filename;\
- # echo "$keyname=$value" >> $filename "
-
- return $?
-}
-
-cert="/root/.ssh/id_rsa.cloud"
-
-while getopts 'r:v:p:' OPTION
-do
- case $OPTION in
- r)
- DOMR_IP="$OPTARG"
- ;;
- v) VM_IP="$OPTARG"
- ;;
- p)
- ENCODEDPASSWORD="$OPTARG"
- PASSWORD=$(echo $ENCODEDPASSWORD | tr '[a-m][n-z][A-M][N-Z]' '[n-z][a-m][N-Z][A-M]')
- ;;
- ?) echo "Incorrect usage"
- exit 1
- ;;
- esac
-done
-
-VIA_SSH="ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$DOMR_IP"
-
-$VIA_SSH "if [ ! -f $PASSWD_FILE ]; then touch $PASSWD_FILE; fi;"
-
-replace_in_file_on_domr $PASSWD_FILE $VM_IP $PASSWORD
-
-if [ $? -ne 0 ]
-then
- exit 1
-fi
-
-exit 0
[2/3] git commit: updated refs/heads/master to ca81e7b
Posted by ya...@apache.org.
CLOUDSTACK-5779: Move firewall to use routerProxy
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0ea1c7df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0ea1c7df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0ea1c7df
Branch: refs/heads/master
Commit: 0ea1c7dfc411db0d3710ac2c4fb238111cbec328
Parents: ce67e24
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jan 17 11:51:42 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Jan 17 12:36:42 2014 -0800
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 82 ++---
.../vmware/resource/VmwareResource.java | 16 +-
.../xen/resource/CitrixResourceBase.java | 16 +-
scripts/network/domr/call_firewall.sh | 70 ----
scripts/vm/hypervisor/xenserver/vmops | 19 +-
.../config/opt/cloud/bin/firewall_egress.sh | 187 ++++++++++
.../config/opt/cloud/bin/firewall_ingress.sh | 202 +++++++++++
.../debian/config/opt/cloud/bin/firewall_nat.sh | 358 +++++++++++++++++++
systemvm/patches/debian/config/root/firewall.sh | 358 -------------------
.../debian/config/root/firewallRule_egress.sh | 187 ----------
.../patches/debian/config/root/firewall_rule.sh | 202 -----------
11 files changed, 803 insertions(+), 894 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 20cc0cc..c66b9cb 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -102,7 +102,6 @@ import java.util.Map;
public class VirtualRoutingResource implements Manager {
private static final Logger s_logger = Logger.getLogger(VirtualRoutingResource.class);
private String _publicIpAddress;
- private String _firewallPath;
private String _loadbPath;
private String _publicEthIf;
private String _privateEthIf;
@@ -232,18 +231,16 @@ public class VirtualRoutingResource implements Manager {
FirewallRule.TrafficType trafficType = allrules[0].getTrafficType();
String[][] rules = cmd.generateFwRules();
- final Script command = new Script(_firewallPath, _timeout, s_logger);
- command.add(routerIp);
- command.add("-F");
+ String args = " -F";
if (trafficType == FirewallRule.TrafficType.Egress) {
- command.add("-E");
+ args += "-E";
if (egressDefault.equals("true")) {
- command.add("-P ", "1");
+ args += " -P 1";
} else if (egressDefault.equals("System")) {
- command.add("-P ", "2");
+ args += " -P 2";
} else {
- command.add("-P ", "0");
+ args += " -P 0";
}
}
@@ -253,10 +250,17 @@ public class VirtualRoutingResource implements Manager {
for (int i = 0; i < fwRules.length; i++) {
sb.append(fwRules[i]).append(',');
}
- command.add("-a", sb.toString());
+ args += " -a " + sb.toString();
+ }
+
+ String result = null;
+
+ if (trafficType == FirewallRule.TrafficType.Egress) {
+ result = routerProxy("firewall_egress.sh", routerIp, args);
+ } else {
+ result = routerProxy("firewall_ingress.sh", routerIp, args);
}
- String result = command.execute();
if (result != null) {
return new SetFirewallRulesAnswer(cmd, false, results);
}
@@ -270,22 +274,21 @@ public class VirtualRoutingResource implements Manager {
int i = 0;
boolean endResult = true;
for (PortForwardingRuleTO rule : cmd.getRules()) {
- String result = null;
- final Script command = new Script(_firewallPath, _timeout, s_logger);
-
- command.add(routerIp);
- command.add(rule.revoked() ? "-D" : "-A");
- command.add("-P ", rule.getProtocol().toLowerCase());
- command.add("-l ", rule.getSrcIp());
- command.add("-p ", rule.getStringSrcPortRange());
- command.add("-r ", rule.getDstIp());
- command.add("-d ", rule.getStringDstPortRange());
- result = command.execute();
- if (result == null) {
- results[i++] = null;
- } else {
+ StringBuilder args = new StringBuilder();
+ args.append(rule.revoked() ? " -D " : " -A ");
+ args.append(" -P ").append(rule.getProtocol().toLowerCase());
+ args.append(" -l ").append(rule.getSrcIp());
+ args.append(" -p ").append(rule.getStringSrcPortRange());
+ args.append(" -r ").append(rule.getDstIp());
+ args.append(" -d ").append(rule.getStringDstPortRange());
+
+ String result = routerProxy("firewall_nat.sh", routerIp, args.toString());
+
+ if (result == null || result.isEmpty()) {
results[i++] = "Failed";
endResult = false;
+ } else {
+ results[i++] = null;
}
}
@@ -325,28 +328,26 @@ public class VirtualRoutingResource implements Manager {
int i = 0;
boolean endResult = true;
for (StaticNatRuleTO rule : cmd.getRules()) {
- String result = null;
- final Script command = new Script(_firewallPath, _timeout, s_logger);
- command.add(routerIp);
- command.add(rule.revoked() ? "-D" : "-A");
-
//1:1 NAT needs instanceip;publicip;domrip;op
- command.add(" -l ", rule.getSrcIp());
- command.add(" -r ", rule.getDstIp());
+ StringBuilder args = new StringBuilder();
+ args.append(rule.revoked() ? " -D " : " -A ");
+ args.append(" -l ").append(rule.getSrcIp());
+ args.append(" -r ").append(rule.getDstIp());
if (rule.getProtocol() != null) {
- command.add(" -P ", rule.getProtocol().toLowerCase());
+ args.append(" -P ").append(rule.getProtocol().toLowerCase());
}
- command.add(" -d ", rule.getStringSrcPortRange());
- command.add(" -G ");
+ args.append(" -d ").append(rule.getStringSrcPortRange());
+ args.append(" -G ");
- result = command.execute();
- if (result == null) {
- results[i++] = null;
- } else {
+ String result = routerProxy("firewall_nat.sh", routerIp, args.toString());
+
+ if (result == null || result.isEmpty()) {
results[i++] = "Failed";
endResult = false;
+ } else {
+ results[i++] = null;
}
}
@@ -1105,11 +1106,6 @@ public class VirtualRoutingResource implements Manager {
s_logger.warn("Incoming public ip address is overriden. Will always be using the same ip address: " + _publicIpAddress);
}
- _firewallPath = findScript("call_firewall.sh");
- if (_firewallPath == null) {
- throw new ConfigurationException("Unable to find the call_firewall.sh");
- }
-
_loadbPath = findScript("call_loadbalancer.sh");
if (_loadbPath == null) {
throw new ConfigurationException("Unable to find the call_loadbalancer.sh");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 817fdec..1a0b97b 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -847,10 +847,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
- Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/root/firewall.sh " + args);
+ Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/firewall_nat.sh " + args);
if (s_logger.isDebugEnabled())
- s_logger.debug("Executing script on domain router " + controlIp + ": /root/firewall.sh " + args);
+ s_logger.debug("Executing script on domain router " + controlIp + ": /opt/cloud/bin/firewall_nat.sh " + args);
if (!result.first()) {
s_logger.error("SetPortForwardingRulesCommand failure on setting one rule. args: " + args);
@@ -905,16 +905,16 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
Pair<Boolean, String> result = null;
if (trafficType == FirewallRule.TrafficType.Egress) {
- result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/root/firewallRule_egress.sh " + args);
+ result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/firewall_egress.sh " + args);
} else {
- result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/root/firewall_rule.sh " + args);
+ result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/firewall_ingress.sh " + args);
}
if (s_logger.isDebugEnabled()) {
if (trafficType == FirewallRule.TrafficType.Egress) {
- s_logger.debug("Executing script on domain router " + controlIp + ": /root/firewallRule_egress.sh " + args);
+ s_logger.debug("Executing script on domain router " + controlIp + ": /opt/cloud/bin/firewall_egress.sh " + args);
} else {
- s_logger.debug("Executing script on domain router " + controlIp + ": /root/firewall_rule.sh " + args);
+ s_logger.debug("Executing script on domain router " + controlIp + ": /opt/cloud/bin/firewall_ingress.sh " + args);
}
}
@@ -1012,10 +1012,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
String controlIp = getRouterSshControlIp(cmd);
- Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/root/firewall.sh " + args);
+ Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/firewall_nat.sh " + args);
if (s_logger.isDebugEnabled())
- s_logger.debug("Executing script on domain router " + controlIp + ": /root/firewall.sh " + args);
+ s_logger.debug("Executing script on domain router " + controlIp + ": /opt/cloud/bin/firewall_nat.sh " + args);
if (!result.first()) {
s_logger.error("SetStaticNatRulesCommand failure on setting one rule. args: " + args);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index ddb7912..e7e4ee3 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2047,7 +2047,6 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
boolean endResult = true;
for (PortForwardingRuleTO rule : cmd.getRules()) {
StringBuilder args = new StringBuilder();
- args.append(routerIp);
args.append(rule.revoked() ? " -D " : " -A ");
args.append(" -P ").append(rule.getProtocol().toLowerCase());
args.append(" -l ").append(rule.getSrcIp());
@@ -2055,7 +2054,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
args.append(" -r ").append(rule.getDstIp());
args.append(" -d ").append(rule.getStringDstPortRange());
- String result = callHostPlugin(conn, "vmops", "setFirewallRule", "args", args.toString());
+ String result = routerProxy("firewall_nat.sh", routerIp, args.toString());
if (result == null || result.isEmpty()) {
results[i++] = "Failed";
@@ -2096,14 +2095,12 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
Connection conn = getConnection();
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
- //String args = routerIp;
String[] results = new String[cmd.getRules().length];
int i = 0;
boolean endResult = true;
for (StaticNatRuleTO rule : cmd.getRules()) {
//1:1 NAT needs instanceip;publicip;domrip;op
StringBuilder args = new StringBuilder();
- args.append(routerIp);
args.append(rule.revoked() ? " -D " : " -A ");
args.append(" -l ").append(rule.getSrcIp());
args.append(" -r ").append(rule.getDstIp());
@@ -2115,7 +2112,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
args.append(" -d ").append(rule.getStringSrcPortRange());
args.append(" -G ");
- String result = callHostPlugin(conn, "vmops", "setFirewallRule", "args", args.toString());
+ String result = routerProxy("firewall_nat.sh", routerIp, args.toString());
if (result == null || result.isEmpty()) {
results[i++] = "Failed";
@@ -7606,8 +7603,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
String[][] rules = cmd.generateFwRules();
- String args = "";
- args += routerIp + " -F";
+ String args = " -F";
if (trafficType == FirewallRule.TrafficType.Egress) {
args += " -E";
if (egressDefault.equals("true")) {
@@ -7627,7 +7623,11 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
args += " -a " + sb.toString();
}
- callResult = callHostPlugin(conn, "vmops", "setFirewallRule", "args", args);
+ if (trafficType == FirewallRule.TrafficType.Egress) {
+ callResult = routerProxy("firewall_egress.sh", routerIp, args);
+ } else {
+ callResult = routerProxy("firewall_ingress.sh", routerIp, args);
+ }
if (callResult == null || callResult.isEmpty()) {
//FIXME - in the future we have to process each rule separately; now we temporarily set every rule to be false if single rule fails
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/scripts/network/domr/call_firewall.sh
----------------------------------------------------------------------
diff --git a/scripts/network/domr/call_firewall.sh b/scripts/network/domr/call_firewall.sh
deleted file mode 100755
index f6ad0be..0000000
--- a/scripts/network/domr/call_firewall.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-# $Id: call_firewall.sh 9132 2010-06-04 20:17:43Z manuel $ $HeadURL: svn://svn.lab.vmops.com/repos/branches/2.0.0/java/scripts/vm/hypervisor/xenserver/patch/call_firewall.sh $
-# firewall.sh -- allow some ports / protocols to vm instances
-usage() {
- printf "Usage for Firewall rule : %s: <domR eth1 ip> -F " $(basename $0) >&2
- printf "Usage for other purposes : %s: <domR eth1 ip> (-A|-D) -i <domR eth1 ip> -r <target-instance-ip> -P protocol (-p port_range | -t icmp_type_code) -l <public ip address> -d <target port> [-f <firewall ip> -u <firewall user> -y <firewall password> -z <firewall enable password> ] \n" $(basename $0) >&2
-}
-
-#set -x
-
-check_gw() {
- ping -c 1 -n -q $1 > /dev/null
- if [ $? -gt 0 ]
- then
- sleep 1
- ping -c 1 -n -q $1 > /dev/null
- fi
- return $?;
-}
-
-cert="/root/.ssh/id_rsa.cloud"
-domRIp=$1
-shift
-
-check_gw "$domRIp"
-if [ $? -gt 0 ]
-then
- exit 1
-fi
-fflag=
-eflag=
-while getopts ':FE' OPTION
-do
- case $OPTION in
- F) fflag=1
- ;;
- E) eflag=1
- ;;
- \?) ;;
- esac
-done
-
-if [ -n "$eflag" ]
-then
- ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$domRIp "/root/firewallRule_egress.sh $*"
-elif [ -n "$fflag" ]
-then
- ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$domRIp "/root/firewall_rule.sh $*"
-else
- ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$domRIp "/root/firewall.sh $*"
-fi
-exit $?
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 53a0002..82d4a9f 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -222,23 +222,6 @@ def setLinkLocalIP(session, args):
txt = 'success'
return txt
-
-
-@echo
-def setFirewallRule(session, args):
- sargs = args['args']
- cmd = sargs.split(' ')
- cmd.insert(0, "/opt/cloud/bin/call_firewall.sh")
- cmd.insert(0, "/bin/bash")
- try:
- txt = util.pread2(cmd)
- txt = 'success'
- except:
- logging.debug(" set firewall rule failed " )
- txt = ''
-
- return txt
-
@echo
def routerProxy(session, args):
sargs = args['args']
@@ -1556,7 +1539,7 @@ if __name__ == "__main__":
"getgateway": getgateway, "preparemigration": preparemigration,
"setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver": pingxenserver,
"savePassword": savePassword,
- "setFirewallRule": setFirewallRule, "routerProxy": routerProxy,
+ "routerProxy": routerProxy,
"setLoadBalancerRule": setLoadBalancerRule, "createFile": createFile, "deleteFile": deleteFile,
"network_rules":network_rules,
"can_bridge_firewall":can_bridge_firewall, "default_network_rules":default_network_rules,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh b/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh
new file mode 100755
index 0000000..b1e7a40
--- /dev/null
+++ b/systemvm/patches/debian/config/opt/cloud/bin/firewall_egress.sh
@@ -0,0 +1,187 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# $Id: firewallRule_egress.sh 9947 2013-01-17 19:34:24Z manuel $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/patches/xenserver/root/firewallRule_egress.sh $
+# firewallRule_egress.sh -- allow some ports / protocols from vm instances
+# @VERSION@
+
+source /root/func.sh
+
+lock="biglock"
+locked=$(getLockFile $lock)
+if [ "$locked" != "1" ]
+then
+ exit 1
+fi
+#set -x
+usage() {
+ printf "Usage: %s: -a protocol:startport:endport:sourcecidrs> \n" $(basename $0) >&2
+ printf "sourcecidrs format: cidr1-cidr2-cidr3-...\n"
+}
+
+fw_egress_remove_backup() {
+ sudo iptables -D FW_OUTBOUND -j _FW_EGRESS_RULES
+ sudo iptables -F _FW_EGRESS_RULES
+ sudo iptables -X _FW_EGRESS_RULES
+}
+
+fw_egress_save() {
+ sudo iptables -E FW_EGRESS_RULES _FW_EGRESS_RULES
+}
+
+fw_egress_chain () {
+#supress errors 2>/dev/null
+ fw_egress_remove_backup
+ fw_egress_save
+ sudo iptables -N FW_EGRESS_RULES
+ sudo iptables -A FW_OUTBOUND -j FW_EGRESS_RULES
+}
+
+fw_egress_backup_restore() {
+ sudo iptables -A FW_OUTBOUND -j FW_EGRESS_RULES
+ sudo iptables -E _FW_EGRESS_RULES FW_EGRESS_RULES
+ fw_egress_remove_backup
+}
+
+
+fw_entry_for_egress() {
+ local rule=$1
+
+ local prot=$(echo $rule | cut -d: -f2)
+ local sport=$(echo $rule | cut -d: -f3)
+ local eport=$(echo $rule | cut -d: -f4)
+ local cidrs=$(echo $rule | cut -d: -f5 | sed 's/-/ /g')
+ if [ "$sport" == "0" -a "$eport" == "0" ]
+ then
+ DPORT=""
+ else
+ DPORT="--dport $sport:$eport"
+ fi
+ logger -t cloud "$(basename $0): enter apply fw egress rules for guest $prot:$sport:$eport:$cidrs"
+
+ for lcidr in $cidrs
+ do
+ [ "$prot" == "reverted" ] && continue;
+ if [ "$prot" == "icmp" ]
+ then
+ typecode="$sport/$eport"
+ [ "$eport" == "-1" ] && typecode="$sport"
+ [ "$sport" == "-1" ] && typecode="any"
+ sudo iptables -A FW_EGRESS_RULES -p $prot -s $lcidr --icmp-type $typecode \
+ -j $target
+ result=$?
+ elif [ "$prot" == "all" ]
+ then
+ sudo iptables -A FW_EGRESS_RULES -p $prot -s $lcidr -j $target
+ result=$?
+ else
+ sudo iptables -A FW_EGRESS_RULES -p $prot -s $lcidr $DPORT -j $target
+ result=$?
+ fi
+
+ [ $result -gt 0 ] &&
+ logger -t cloud "Error adding iptables entry for guest network $prot:$sport:$eport:$cidrs" &&
+ break
+ done
+
+ logger -t cloud "$(basename $0): exit apply egress firewall rules for guest network"
+ return $result
+}
+
+
+aflag=0
+rules=""
+rules_list=""
+ip=""
+dev=""
+pflag=0
+shift
+shift
+while getopts 'a:P:' OPTION
+do
+ case $OPTION in
+ a) aflag=1
+ rules="$OPTARG"
+ ;;
+ P) pflag=1
+ pvalue="$OPTARG"
+ ;;
+ ?) usage
+ unlock_exit 2 $lock $locked
+ ;;
+ esac
+done
+
+if [ "$aflag" != "1" ]
+then
+ usage
+ unlock_exit 2 $lock $locked
+fi
+
+if [ -n "$rules" ]
+then
+ rules_list=$(echo $rules | cut -d, -f1- --output-delimiter=" ")
+fi
+
+# rule format
+# protocal:sport:eport:cidr
+#-a tcp:80:80:0.0.0.0/0::tcp:220:220:0.0.0.0/0:,tcp:222:222:192.168.10.0/24-75.57.23.0/22-88.100.33.1/32
+# if any entry is reverted , entry will be in the format reverted:0:0:0
+# example : tcp:80:80:0.0.0.0/0:, tcp:220:220:0.0.0.0/0:,200.1.1.2:reverted:0:0:0
+
+success=0
+
+if [ "$pvalue" == "0" -o "$pvalue" == "2" ]
+ then
+ target="ACCEPT"
+ else
+ target="DROP"
+ fi
+
+fw_egress_chain
+for r in $rules_list
+do
+ fw_entry_for_egress $r
+ success=$?
+ if [ $success -gt 0 ]
+ then
+ logger -t cloud "failure to apply fw egress rules "
+ break
+ else
+ logger -t cloud "successful in applying fw egress rules"
+ fi
+done
+
+if [ $success -gt 0 ]
+then
+ logger -t cloud "restoring from backup for guest network"
+ fw_egress_backup_restore
+else
+ logger -t cloud "deleting backup for guest network"
+ if [ "$pvalue" == "1" -o "$pvalue" == "2" ]
+ then
+ #Adding default policy rule
+ sudo iptables -A FW_EGRESS_RULES -j ACCEPT
+ fi
+
+fi
+
+fw_egress_remove_backup
+
+unlock_exit $success $lock $locked
+
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/systemvm/patches/debian/config/opt/cloud/bin/firewall_ingress.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/firewall_ingress.sh b/systemvm/patches/debian/config/opt/cloud/bin/firewall_ingress.sh
new file mode 100755
index 0000000..9e459f0
--- /dev/null
+++ b/systemvm/patches/debian/config/opt/cloud/bin/firewall_ingress.sh
@@ -0,0 +1,202 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# firewall_rule.sh -- allow some ports / protocols to vm instances
+# @VERSION@
+
+source /root/func.sh
+
+lock="biglock"
+locked=$(getLockFile $lock)
+if [ "$locked" != "1" ]
+then
+ exit 1
+fi
+
+usage() {
+ printf "Usage: %s: -a <public ip address:protocol:startport:endport:sourcecidrs> \n" $(basename $0) >&2
+ printf "sourcecidrs format: cidr1-cidr2-cidr3-...\n"
+}
+#set -x
+#FIXME: eating up the error code during execution of iptables
+fw_remove_backup() {
+ local pubIp=$1
+ sudo iptables -t mangle -F _FIREWALL_$pubIp 2> /dev/null
+ sudo iptables -t mangle -D PREROUTING -d $pubIp -j _FIREWALL_$pubIp 2> /dev/null
+ sudo iptables -t mangle -X _FIREWALL_$pubIp 2> /dev/null
+}
+
+fw_restore() {
+ local pubIp=$1
+ sudo iptables -t mangle -F FIREWALL_$pubIp 2> /dev/null
+ sudo iptables -t mangle -D PREROUTING -d $pubIp -j FIREWALL_$pubIp 2> /dev/null
+ sudo iptables -t mangle -X FIREWALL_$pubIp 2> /dev/null
+ sudo iptables -t mangle -E _FIREWALL_$pubIp FIREWALL_$pubIp 2> /dev/null
+}
+
+fw_chain_for_ip () {
+ local pubIp=$1
+ fw_remove_backup $1
+ sudo iptables -t mangle -E FIREWALL_$pubIp _FIREWALL_$pubIp 2> /dev/null
+ sudo iptables -t mangle -N FIREWALL_$pubIp 2> /dev/null
+ # drop if no rules match (this will be the last rule in the chain)
+ sudo iptables -t mangle -A FIREWALL_$pubIp -j DROP> /dev/null
+ # ensure outgoing connections are maintained (first rule in chain)
+ sudo iptables -t mangle -I FIREWALL_$pubIp -m state --state RELATED,ESTABLISHED -j ACCEPT> /dev/null
+ #ensure that this table is after VPN chain
+ sudo iptables -t mangle -I PREROUTING 2 -d $pubIp -j FIREWALL_$pubIp
+ success=$?
+ if [ $success -gt 0 ]
+ then
+ # if VPN chain is not present for various reasons, try to add in to the first slot */
+ sudo iptables -t mangle -I PREROUTING -d $pubIp -j FIREWALL_$pubIp
+ fi
+}
+
+fw_entry_for_public_ip() {
+ local rules=$1
+
+ local pubIp=$(echo $rules | cut -d: -f1)
+ local prot=$(echo $rules | cut -d: -f2)
+ local sport=$(echo $rules | cut -d: -f3)
+ local eport=$(echo $rules | cut -d: -f4)
+ local scidrs=$(echo $rules | cut -d: -f5 | sed 's/-/ /g')
+
+ logger -t cloud "$(basename $0): enter apply firewall rules for public ip $pubIp:$prot:$sport:$eport:$scidrs"
+
+
+ # note that rules are inserted after the RELATED,ESTABLISHED rule
+ # but before the DROP rule
+ for src in $scidrs
+ do
+ [ "$prot" == "reverted" ] && continue;
+ if [ "$prot" == "icmp" ]
+ then
+ typecode="$sport/$eport"
+ [ "$eport" == "-1" ] && typecode="$sport"
+ [ "$sport" == "-1" ] && typecode="any"
+ sudo iptables -t mangle -I FIREWALL_$pubIp 2 -s $src -p $prot \
+ --icmp-type $typecode -j RETURN
+ else
+ sudo iptables -t mangle -I FIREWALL_$pubIp 2 -s $src -p $prot \
+ --dport $sport:$eport -j RETURN
+ fi
+ result=$?
+ [ $result -gt 0 ] &&
+ logger -t cloud "Error adding iptables entry for $pubIp:$prot:$sport:$eport:$src" &&
+ break
+ done
+
+ logger -t cloud "$(basename $0): exit apply firewall rules for public ip $pubIp"
+ return $result
+}
+
+get_vif_list() {
+ local vif_list=""
+ for i in /sys/class/net/eth*; do
+ vif=$(basename $i);
+ if [ "$vif" != "eth0" ] && [ "$vif" != "eth1" ]
+ then
+ vif_list="$vif_list $vif";
+ fi
+ done
+ if [ "$vif_list" == "" ]
+ then
+ vif_list="eth0"
+ fi
+
+ logger -t cloud "FirewallRule public interfaces = $vif_list"
+ echo $vif_list
+}
+
+shift
+rules=
+while getopts 'a:' OPTION
+do
+ case $OPTION in
+ a) aflag=1
+ rules="$OPTARG"
+ ;;
+ ?) usage
+ unlock_exit 2 $lock $locked
+ ;;
+ esac
+done
+
+VIF_LIST=$(get_vif_list)
+
+if [ "$rules" == "" ]
+then
+ rules="none"
+fi
+
+#-a 172.16.92.44:tcp:80:80:0.0.0.0/0:,172.16.92.44:tcp:220:220:0.0.0.0/0:,172.16.92.44:tcp:222:222:192.168.10.0/24-75.57.23.0/22-88.100.33.1/32
+# if any entry is reverted , entry will be in the format <ip>:reverted:0:0:0
+# example : 172.16.92.44:tcp:80:80:0.0.0.0/0:,172.16.92.44:tcp:220:220:0.0.0.0/0:,200.1.1.2:reverted:0:0:0
+# The reverted entries will fix the following partially
+#FIXME: rule leak: when there are multiple ip address, there will chance that entry will be left over if the ipadress does not appear in the current execution when compare to old one
+# example : In the below first transaction have 2 ip's whereas in second transaction it having one ip, so after the second trasaction 200.1.2.3 ip will have rules in mangle table.
+# 1) -a 172.16.92.44:tcp:80:80:0.0.0.0/0:,200.16.92.44:tcp:220:220:0.0.0.0/0:,
+# 2) -a 172.16.92.44:tcp:80:80:0.0.0.0/0:,172.16.92.44:tcp:220:220:0.0.0.0/0:,
+
+
+success=0
+publicIps=
+rules_list=$(echo $rules | cut -d, -f1- --output-delimiter=" ")
+for r in $rules_list
+do
+ pubIp=$(echo $r | cut -d: -f1)
+ publicIps="$pubIp $publicIps"
+done
+
+unique_ips=$(echo $publicIps| tr " " "\n" | sort | uniq | tr "\n" " ")
+
+for u in $unique_ips
+do
+ fw_chain_for_ip $u
+done
+
+for r in $rules_list
+do
+ pubIp=$(echo $r | cut -d: -f1)
+ fw_entry_for_public_ip $r
+ success=$?
+ if [ $success -gt 0 ]
+ then
+ logger -t cloud "$(basename $0): failure to apply fw rules for ip $pubIp"
+ break
+ else
+ logger -t cloud "$(basename $0): successful in applying fw rules for ip $pubIp"
+ fi
+done
+
+if [ $success -gt 0 ]
+then
+ for p in $unique_ips
+ do
+ logger -t cloud "$(basename $0): restoring from backup for ip: $p"
+ fw_restore $p
+ done
+fi
+for p in $unique_ips
+do
+ logger -t cloud "$(basename $0): deleting backup for ip: $p"
+ fw_remove_backup $p
+done
+
+unlock_exit $success $lock $locked
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/systemvm/patches/debian/config/opt/cloud/bin/firewall_nat.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/firewall_nat.sh b/systemvm/patches/debian/config/opt/cloud/bin/firewall_nat.sh
new file mode 100755
index 0000000..8c0e0fc
--- /dev/null
+++ b/systemvm/patches/debian/config/opt/cloud/bin/firewall_nat.sh
@@ -0,0 +1,358 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# $Id: firewall.sh 9947 2010-06-25 19:34:24Z manuel $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/patches/xenserver/root/firewall.sh $
+# firewall.sh -- allow some ports / protocols to vm instances
+# @VERSION@
+
+source /root/func.sh
+
+lock="biglock"
+locked=$(getLockFile $lock)
+if [ "$locked" != "1" ]
+then
+ exit 1
+fi
+
+vpnoutmark="0x525"
+
+usage() {
+ printf "Usage: %s: (-A|-D) -r <target-instance-ip> -P protocol (-p port_range | -t icmp_type_code) -l <public ip address> -d <target port> -s <source cidrs> [-G] \n" $(basename $0) >&2
+}
+
+#set -x
+
+get_dev_list() {
+ ip link show | grep -e eth[2-9] | awk -F ":" '{print $2}'
+ ip link show | grep -e eth1[0-9] | awk -F ":" '{print $2}'
+}
+
+ip_to_dev() {
+ local ip=$1
+
+ for dev in $DEV_LIST; do
+ ip addr show dev $dev | grep inet | grep $ip &>> /dev/null
+ [ $? -eq 0 ] && echo $dev && return 0
+ done
+ return 1
+}
+
+doHairpinNat () {
+ local vrGuestIPNetwork=$(sudo ip addr show dev eth0 | grep inet | grep eth0 | awk '{print $2}' | head -1)
+ local vrGuestIP=$(echo $vrGuestIPNetwork | awk -F'/' '{print $1}')
+
+ local publicIp=$1
+ local prot=$2
+ local port=$3
+ local guestVmIp=$4
+ local guestPort=$(echo $5 | sed 's/:/-/')
+ local op=$6
+ local destPort=$5
+ logger -t cloud "$(basename $0): create HairPin entry : public ip=$publicIp \
+ instance ip=$guestVmIp proto=$proto portRange=$guestPort op=$op"
+
+ if [ "$prot" == "all" ]
+ then
+ logger -t cloud "creating hairpin nat rules for static nat"
+ (sudo iptables -t nat $op PREROUTING -d $publicIp -i eth0 -j DNAT --to-destination $guestVmIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t nat $op POSTROUTING -s $vrGuestIPNetwork -d $guestVmIp -j SNAT -o eth0 --to-source $vrGuestIP &>> $OUTFILE || [ "$op" == "-D" ])
+ else
+ (sudo iptables -t nat $op PREROUTING -d $publicIp -i eth0 -p $prot --dport $port -j DNAT --to-destination $guestVmIp:$guestPort &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t nat $op POSTROUTING -s $vrGuestIPNetwork -p $prot --dport $destPort -d $guestVmIp -j SNAT -o eth0 --to-source $vrGuestIP &>> $OUTFILE || [ "$op" == "-D" ])
+ fi
+}
+
+#Port (address translation) forwarding for tcp or udp
+tcp_or_udp_entry() {
+ local instIp=$1
+ local dport0=$2
+ local dport=$(echo $2 | sed 's/:/-/')
+ local publicIp=$3
+ local port=$4
+ local op=$5
+ local proto=$6
+ local cidrs=$7
+
+ logger -t cloud "$(basename $0): creating port fwd entry for PAT: public ip=$publicIp \
+ instance ip=$instIp proto=$proto port=$port dport=$dport op=$op"
+
+ #if adding, this might be a duplicate, so delete the old one first
+ [ "$op" == "-A" ] && tcp_or_udp_entry $instIp $dport0 $publicIp $port "-D" $proto $cidrs
+ # the delete operation may have errored out but the only possible reason is
+ # that the rules didn't exist in the first place
+ local dev=$(ip_to_dev $publicIp)
+ local tableNo=$(echo $dev | awk -F'eth' '{print $2}')
+ # shortcircuit the process if error and it is an append operation
+ # continue if it is delete
+ (sudo iptables -t nat $op PREROUTING --proto $proto -i $dev -d $publicIp \
+ --destination-port $port -j DNAT \
+ --to-destination $instIp:$dport &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t mangle $op PREROUTING --proto $proto -i $dev -d $publicIp \
+ --destination-port $port -j MARK --set-mark $tableNo &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t mangle $op PREROUTING --proto $proto -i $dev -d $publicIp \
+ --destination-port $port -m state --state NEW -j CONNMARK --save-mark &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (doHairpinNat $publicIp $proto $port $instIp $dport0 $op) &&
+ (sudo iptables -t nat $op OUTPUT --proto $proto -d $publicIp \
+ --destination-port $port -j DNAT \
+ --to-destination $instIp:$dport &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables $op FORWARD -p $proto -s $cidrs -d $instIp -m state \
+ --state ESTABLISHED,RELATED -m comment --comment "$publicIp:$port" -j ACCEPT &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables $op FORWARD -p $proto -s $cidrs -d $instIp \
+ --destination-port $dport0 -m state --state NEW -m comment --comment "$publicIp:$port" -j ACCEPT &>> $OUTFILE)
+
+
+ local result=$?
+ logger -t cloud "$(basename $0): done port fwd entry for PAT: public ip=$publicIp op=$op result=$result"
+ return $result
+}
+
+
+#Forward icmp
+icmp_entry() {
+ local instIp=$1
+ local icmptype=$2
+ local publicIp=$3
+ local op=$4
+
+ logger -t cloud "$(basename $0): creating port fwd entry for PAT: public ip=$publicIp \
+ instance ip=$instIp proto=icmp port=$port dport=$dport op=$op"
+ #if adding, this might be a duplicate, so delete the old one first
+ [ "$op" == "-A" ] && icmp_entry $instIp $icmpType $publicIp "-D"
+ # the delete operation may have errored out but the only possible reason is
+ # that the rules didn't exist in the first place
+ local dev=$(ip_to_dev $publicIp)
+ sudo iptables -t nat $op PREROUTING --proto icmp -i $dev -d $publicIp --icmp-type $icmptype -j DNAT --to-destination $instIp &>> $OUTFILE
+
+ sudo iptables -t nat $op OUTPUT --proto icmp -d $publicIp --icmp-type $icmptype -j DNAT --to-destination $instIp &>> $OUTFILE
+ sudo iptables $op FORWARD -p icmp -s 0/0 -d $instIp --icmp-type $icmptype -j ACCEPT &>> $OUTFILE
+
+ result=$?
+ logger -t cloud "$(basename $0): done port fwd entry for PAT: public ip=$publicIp op=$op result=$result"
+ return $result
+}
+
+
+
+one_to_one_fw_entry() {
+ local publicIp=$1
+ local instIp=$2
+ local proto=$3
+ local portRange=$4
+ local op=$5
+ logger -t cloud "$(basename $0): create firewall entry for static nat: public ip=$publicIp \
+ instance ip=$instIp proto=$proto portRange=$portRange op=$op"
+
+ #if adding, this might be a duplicate, so delete the old one first
+ [ "$op" == "-A" ] && one_to_one_fw_entry $publicIp $instIp $proto $portRange "-D"
+ # the delete operation may have errored out but the only possible reason is
+ # that the rules didn't exist in the first place
+
+ local dev=$(ip_to_dev $publicIp)
+ [ $? -ne 0 ] && echo "Could not find device associated with $publicIp" && return 1
+
+ # shortcircuit the process if error and it is an append operation
+ # continue if it is delete
+ (sudo iptables -t nat $op PREROUTING -i $dev -d $publicIp --proto $proto \
+ --destination-port $portRange -j DNAT \
+ --to-destination $instIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (doHairpinNat $publicIp $proto $portRange $instIp $portRange $op) &&
+ (sudo iptables $op FORWARD -i $dev -o eth0 -d $instIp --proto $proto \
+ --destination-port $portRange -m state \
+ --state NEW -j ACCEPT &>> $OUTFILE )
+
+ result=$?
+ logger -t cloud "$(basename $0): done firewall entry public ip=$publicIp op=$op result=$result"
+ return $result
+}
+
+fw_chain_for_ip() {
+ local pubIp=$1
+ if iptables -t mangle -N FIREWALL_$pubIp &> /dev/null
+ then
+ logger -t cloud "$(basename $0): created a firewall chain for $pubIp"
+ (sudo iptables -t mangle -A FIREWALL_$pubIp -j DROP) &&
+ (sudo iptables -t mangle -I FIREWALL_$pubIp -m state --state RELATED,ESTABLISHED -j ACCEPT ) &&
+ (sudo iptables -t mangle -I PREROUTING 2 -d $pubIp -j FIREWALL_$pubIp)
+ return $?
+ fi
+ logger -t cloud "fw chain for $pubIp already exists"
+ return 0
+}
+
+static_nat() {
+ local publicIp=$1
+ local instIp=$2
+ local op=$3
+ local op2="-D"
+ local rulenum=
+ local proto="all"
+
+ logger -t cloud "$(basename $0): static nat: public ip=$publicIp \
+ instance ip=$instIp op=$op"
+
+ #TODO check error below
+ fw_chain_for_ip $publicIp
+
+ #if adding, this might be a duplicate, so delete the old one first
+ [ "$op" == "-A" ] && static_nat $publicIp $instIp "-D"
+ # the delete operation may have errored out but the only possible reason is
+ # that the rules didn't exist in the first place
+ [ "$op" == "-A" ] && op2="-I"
+ if [ "$op" == "-A" ]
+ then
+ # put static nat rule one rule after VPN no-NAT rule
+ # rule chain can be used to improve it later
+ iptables-save -t nat|grep "POSTROUTING" | grep $vpnoutmark > /dev/null
+ if [ $? -eq 0 ]
+ then
+ rulenum=2
+ else
+ rulenum=1
+ fi
+ fi
+
+ local dev=$(ip_to_dev $publicIp)
+ [ $? -ne 0 ] && echo "Could not find device associated with $publicIp" && return 1
+ local tableNo=$(echo $dev | awk -F'eth' '{print $2}')
+
+ # shortcircuit the process if error and it is an append operation
+ # continue if it is delete
+ (sudo iptables -t mangle $op PREROUTING -i $dev -d $publicIp \
+ -j MARK -m state --state NEW --set-mark $tableNo &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t mangle $op PREROUTING -i $dev -d $publicIp \
+ -m state --state NEW -j CONNMARK --save-mark &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t mangle $op PREROUTING -s $instIp -i eth0 \
+ -j MARK -m state --state NEW --set-mark $tableNo &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t mangle $op PREROUTING -s $instIp -i eth0 \
+ -m state --state NEW -j CONNMARK --save-mark &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t nat $op PREROUTING -i $dev -d $publicIp -j DNAT \
+ --to-destination $instIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables $op FORWARD -i $dev -o eth0 -d $instIp -m state \
+ --state NEW -j ACCEPT &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (sudo iptables -t nat $op2 POSTROUTING $rulenum -s $instIp -j SNAT \
+ -o $dev --to-source $publicIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
+ (doHairpinNat $publicIp $proto "all" $instIp "0:65535" $op)
+
+ result=$?
+ logger -t cloud "$(basename $0): done static nat entry public ip=$publicIp op=$op result=$result"
+ return $result
+}
+
+
+
+rflag=
+Pflag=
+pflag=
+tflag=
+lflag=
+dflag=
+sflag=
+Gflag=
+op=""
+
+while getopts 'ADr:P:p:t:l:d:s:G' OPTION
+do
+ case $OPTION in
+ A) op="-A"
+ ;;
+ D) op="-D"
+ ;;
+ r) rflag=1
+ instanceIp="$OPTARG"
+ ;;
+ P) Pflag=1
+ protocol="$OPTARG"
+ ;;
+ p) pflag=1
+ ports="$OPTARG"
+ ;;
+ t) tflag=1
+ icmptype="$OPTARG"
+ ;;
+ l) lflag=1
+ publicIp="$OPTARG"
+ ;;
+ s) sflag=1
+ cidrs="$OPTARG"
+ ;;
+ d) dflag=1
+ dport="$OPTARG"
+ ;;
+ G) Gflag=1
+ ;;
+ ?) usage
+ unlock_exit 2 $lock $locked
+ ;;
+ esac
+done
+
+DEV_LIST=$(get_dev_list)
+OUTFILE=$(mktemp)
+
+#Firewall ports for one-to-one/static NAT
+if [ "$Gflag" == "1" ]
+then
+ if [ "$protocol" == "" ]
+ then
+ static_nat $publicIp $instanceIp $op
+ else
+ one_to_one_fw_entry $publicIp $instanceIp $protocol $dport $op
+ fi
+ result=$?
+ if [ "$result" -ne 0 ] && [ "$op" != "-D" ]; then
+ cat $OUTFILE >&2
+ fi
+ rm -f $OUTFILE
+ if [ "$op" == "-D" ];then
+ result=0
+ fi
+ unlock_exit $result $lock $locked
+fi
+
+if [ "$sflag" != "1" ]
+then
+ cidrs="0/0"
+fi
+
+case $protocol in
+ tcp|udp)
+ tcp_or_udp_entry $instanceIp $dport $publicIp $ports $op $protocol $cidrs
+ result=$?
+ if [ "$result" -ne 0 ] && [ "$op" != "-D" ];then
+ cat $OUTFILE >&2
+ fi
+ rm -f $OUTFILE
+ if [ "$op" == "-D" ];then
+ result=0
+ fi
+ unlock_exit $result $lock $locked
+ ;;
+ "icmp")
+
+ icmp_entry $instanceIp $icmptype $publicIp $op
+ if [ "$op" == "-D" ];then
+ result=0
+ fi
+ unlock_exit $? $lock $locked
+ ;;
+ *)
+ printf "Invalid protocol-- must be tcp, udp or icmp\n" >&2
+ unlock_exit 5 $lock $locked
+ ;;
+esac
+
+unlock_exit 0 $lock $locked
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/systemvm/patches/debian/config/root/firewall.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/firewall.sh b/systemvm/patches/debian/config/root/firewall.sh
deleted file mode 100755
index 8c0e0fc..0000000
--- a/systemvm/patches/debian/config/root/firewall.sh
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# $Id: firewall.sh 9947 2010-06-25 19:34:24Z manuel $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/patches/xenserver/root/firewall.sh $
-# firewall.sh -- allow some ports / protocols to vm instances
-# @VERSION@
-
-source /root/func.sh
-
-lock="biglock"
-locked=$(getLockFile $lock)
-if [ "$locked" != "1" ]
-then
- exit 1
-fi
-
-vpnoutmark="0x525"
-
-usage() {
- printf "Usage: %s: (-A|-D) -r <target-instance-ip> -P protocol (-p port_range | -t icmp_type_code) -l <public ip address> -d <target port> -s <source cidrs> [-G] \n" $(basename $0) >&2
-}
-
-#set -x
-
-get_dev_list() {
- ip link show | grep -e eth[2-9] | awk -F ":" '{print $2}'
- ip link show | grep -e eth1[0-9] | awk -F ":" '{print $2}'
-}
-
-ip_to_dev() {
- local ip=$1
-
- for dev in $DEV_LIST; do
- ip addr show dev $dev | grep inet | grep $ip &>> /dev/null
- [ $? -eq 0 ] && echo $dev && return 0
- done
- return 1
-}
-
-doHairpinNat () {
- local vrGuestIPNetwork=$(sudo ip addr show dev eth0 | grep inet | grep eth0 | awk '{print $2}' | head -1)
- local vrGuestIP=$(echo $vrGuestIPNetwork | awk -F'/' '{print $1}')
-
- local publicIp=$1
- local prot=$2
- local port=$3
- local guestVmIp=$4
- local guestPort=$(echo $5 | sed 's/:/-/')
- local op=$6
- local destPort=$5
- logger -t cloud "$(basename $0): create HairPin entry : public ip=$publicIp \
- instance ip=$guestVmIp proto=$proto portRange=$guestPort op=$op"
-
- if [ "$prot" == "all" ]
- then
- logger -t cloud "creating hairpin nat rules for static nat"
- (sudo iptables -t nat $op PREROUTING -d $publicIp -i eth0 -j DNAT --to-destination $guestVmIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t nat $op POSTROUTING -s $vrGuestIPNetwork -d $guestVmIp -j SNAT -o eth0 --to-source $vrGuestIP &>> $OUTFILE || [ "$op" == "-D" ])
- else
- (sudo iptables -t nat $op PREROUTING -d $publicIp -i eth0 -p $prot --dport $port -j DNAT --to-destination $guestVmIp:$guestPort &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t nat $op POSTROUTING -s $vrGuestIPNetwork -p $prot --dport $destPort -d $guestVmIp -j SNAT -o eth0 --to-source $vrGuestIP &>> $OUTFILE || [ "$op" == "-D" ])
- fi
-}
-
-#Port (address translation) forwarding for tcp or udp
-tcp_or_udp_entry() {
- local instIp=$1
- local dport0=$2
- local dport=$(echo $2 | sed 's/:/-/')
- local publicIp=$3
- local port=$4
- local op=$5
- local proto=$6
- local cidrs=$7
-
- logger -t cloud "$(basename $0): creating port fwd entry for PAT: public ip=$publicIp \
- instance ip=$instIp proto=$proto port=$port dport=$dport op=$op"
-
- #if adding, this might be a duplicate, so delete the old one first
- [ "$op" == "-A" ] && tcp_or_udp_entry $instIp $dport0 $publicIp $port "-D" $proto $cidrs
- # the delete operation may have errored out but the only possible reason is
- # that the rules didn't exist in the first place
- local dev=$(ip_to_dev $publicIp)
- local tableNo=$(echo $dev | awk -F'eth' '{print $2}')
- # shortcircuit the process if error and it is an append operation
- # continue if it is delete
- (sudo iptables -t nat $op PREROUTING --proto $proto -i $dev -d $publicIp \
- --destination-port $port -j DNAT \
- --to-destination $instIp:$dport &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t mangle $op PREROUTING --proto $proto -i $dev -d $publicIp \
- --destination-port $port -j MARK --set-mark $tableNo &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t mangle $op PREROUTING --proto $proto -i $dev -d $publicIp \
- --destination-port $port -m state --state NEW -j CONNMARK --save-mark &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (doHairpinNat $publicIp $proto $port $instIp $dport0 $op) &&
- (sudo iptables -t nat $op OUTPUT --proto $proto -d $publicIp \
- --destination-port $port -j DNAT \
- --to-destination $instIp:$dport &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables $op FORWARD -p $proto -s $cidrs -d $instIp -m state \
- --state ESTABLISHED,RELATED -m comment --comment "$publicIp:$port" -j ACCEPT &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables $op FORWARD -p $proto -s $cidrs -d $instIp \
- --destination-port $dport0 -m state --state NEW -m comment --comment "$publicIp:$port" -j ACCEPT &>> $OUTFILE)
-
-
- local result=$?
- logger -t cloud "$(basename $0): done port fwd entry for PAT: public ip=$publicIp op=$op result=$result"
- return $result
-}
-
-
-#Forward icmp
-icmp_entry() {
- local instIp=$1
- local icmptype=$2
- local publicIp=$3
- local op=$4
-
- logger -t cloud "$(basename $0): creating port fwd entry for PAT: public ip=$publicIp \
- instance ip=$instIp proto=icmp port=$port dport=$dport op=$op"
- #if adding, this might be a duplicate, so delete the old one first
- [ "$op" == "-A" ] && icmp_entry $instIp $icmpType $publicIp "-D"
- # the delete operation may have errored out but the only possible reason is
- # that the rules didn't exist in the first place
- local dev=$(ip_to_dev $publicIp)
- sudo iptables -t nat $op PREROUTING --proto icmp -i $dev -d $publicIp --icmp-type $icmptype -j DNAT --to-destination $instIp &>> $OUTFILE
-
- sudo iptables -t nat $op OUTPUT --proto icmp -d $publicIp --icmp-type $icmptype -j DNAT --to-destination $instIp &>> $OUTFILE
- sudo iptables $op FORWARD -p icmp -s 0/0 -d $instIp --icmp-type $icmptype -j ACCEPT &>> $OUTFILE
-
- result=$?
- logger -t cloud "$(basename $0): done port fwd entry for PAT: public ip=$publicIp op=$op result=$result"
- return $result
-}
-
-
-
-one_to_one_fw_entry() {
- local publicIp=$1
- local instIp=$2
- local proto=$3
- local portRange=$4
- local op=$5
- logger -t cloud "$(basename $0): create firewall entry for static nat: public ip=$publicIp \
- instance ip=$instIp proto=$proto portRange=$portRange op=$op"
-
- #if adding, this might be a duplicate, so delete the old one first
- [ "$op" == "-A" ] && one_to_one_fw_entry $publicIp $instIp $proto $portRange "-D"
- # the delete operation may have errored out but the only possible reason is
- # that the rules didn't exist in the first place
-
- local dev=$(ip_to_dev $publicIp)
- [ $? -ne 0 ] && echo "Could not find device associated with $publicIp" && return 1
-
- # shortcircuit the process if error and it is an append operation
- # continue if it is delete
- (sudo iptables -t nat $op PREROUTING -i $dev -d $publicIp --proto $proto \
- --destination-port $portRange -j DNAT \
- --to-destination $instIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (doHairpinNat $publicIp $proto $portRange $instIp $portRange $op) &&
- (sudo iptables $op FORWARD -i $dev -o eth0 -d $instIp --proto $proto \
- --destination-port $portRange -m state \
- --state NEW -j ACCEPT &>> $OUTFILE )
-
- result=$?
- logger -t cloud "$(basename $0): done firewall entry public ip=$publicIp op=$op result=$result"
- return $result
-}
-
-fw_chain_for_ip() {
- local pubIp=$1
- if iptables -t mangle -N FIREWALL_$pubIp &> /dev/null
- then
- logger -t cloud "$(basename $0): created a firewall chain for $pubIp"
- (sudo iptables -t mangle -A FIREWALL_$pubIp -j DROP) &&
- (sudo iptables -t mangle -I FIREWALL_$pubIp -m state --state RELATED,ESTABLISHED -j ACCEPT ) &&
- (sudo iptables -t mangle -I PREROUTING 2 -d $pubIp -j FIREWALL_$pubIp)
- return $?
- fi
- logger -t cloud "fw chain for $pubIp already exists"
- return 0
-}
-
-static_nat() {
- local publicIp=$1
- local instIp=$2
- local op=$3
- local op2="-D"
- local rulenum=
- local proto="all"
-
- logger -t cloud "$(basename $0): static nat: public ip=$publicIp \
- instance ip=$instIp op=$op"
-
- #TODO check error below
- fw_chain_for_ip $publicIp
-
- #if adding, this might be a duplicate, so delete the old one first
- [ "$op" == "-A" ] && static_nat $publicIp $instIp "-D"
- # the delete operation may have errored out but the only possible reason is
- # that the rules didn't exist in the first place
- [ "$op" == "-A" ] && op2="-I"
- if [ "$op" == "-A" ]
- then
- # put static nat rule one rule after VPN no-NAT rule
- # rule chain can be used to improve it later
- iptables-save -t nat|grep "POSTROUTING" | grep $vpnoutmark > /dev/null
- if [ $? -eq 0 ]
- then
- rulenum=2
- else
- rulenum=1
- fi
- fi
-
- local dev=$(ip_to_dev $publicIp)
- [ $? -ne 0 ] && echo "Could not find device associated with $publicIp" && return 1
- local tableNo=$(echo $dev | awk -F'eth' '{print $2}')
-
- # shortcircuit the process if error and it is an append operation
- # continue if it is delete
- (sudo iptables -t mangle $op PREROUTING -i $dev -d $publicIp \
- -j MARK -m state --state NEW --set-mark $tableNo &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t mangle $op PREROUTING -i $dev -d $publicIp \
- -m state --state NEW -j CONNMARK --save-mark &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t mangle $op PREROUTING -s $instIp -i eth0 \
- -j MARK -m state --state NEW --set-mark $tableNo &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t mangle $op PREROUTING -s $instIp -i eth0 \
- -m state --state NEW -j CONNMARK --save-mark &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t nat $op PREROUTING -i $dev -d $publicIp -j DNAT \
- --to-destination $instIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables $op FORWARD -i $dev -o eth0 -d $instIp -m state \
- --state NEW -j ACCEPT &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (sudo iptables -t nat $op2 POSTROUTING $rulenum -s $instIp -j SNAT \
- -o $dev --to-source $publicIp &>> $OUTFILE || [ "$op" == "-D" ]) &&
- (doHairpinNat $publicIp $proto "all" $instIp "0:65535" $op)
-
- result=$?
- logger -t cloud "$(basename $0): done static nat entry public ip=$publicIp op=$op result=$result"
- return $result
-}
-
-
-
-rflag=
-Pflag=
-pflag=
-tflag=
-lflag=
-dflag=
-sflag=
-Gflag=
-op=""
-
-while getopts 'ADr:P:p:t:l:d:s:G' OPTION
-do
- case $OPTION in
- A) op="-A"
- ;;
- D) op="-D"
- ;;
- r) rflag=1
- instanceIp="$OPTARG"
- ;;
- P) Pflag=1
- protocol="$OPTARG"
- ;;
- p) pflag=1
- ports="$OPTARG"
- ;;
- t) tflag=1
- icmptype="$OPTARG"
- ;;
- l) lflag=1
- publicIp="$OPTARG"
- ;;
- s) sflag=1
- cidrs="$OPTARG"
- ;;
- d) dflag=1
- dport="$OPTARG"
- ;;
- G) Gflag=1
- ;;
- ?) usage
- unlock_exit 2 $lock $locked
- ;;
- esac
-done
-
-DEV_LIST=$(get_dev_list)
-OUTFILE=$(mktemp)
-
-#Firewall ports for one-to-one/static NAT
-if [ "$Gflag" == "1" ]
-then
- if [ "$protocol" == "" ]
- then
- static_nat $publicIp $instanceIp $op
- else
- one_to_one_fw_entry $publicIp $instanceIp $protocol $dport $op
- fi
- result=$?
- if [ "$result" -ne 0 ] && [ "$op" != "-D" ]; then
- cat $OUTFILE >&2
- fi
- rm -f $OUTFILE
- if [ "$op" == "-D" ];then
- result=0
- fi
- unlock_exit $result $lock $locked
-fi
-
-if [ "$sflag" != "1" ]
-then
- cidrs="0/0"
-fi
-
-case $protocol in
- tcp|udp)
- tcp_or_udp_entry $instanceIp $dport $publicIp $ports $op $protocol $cidrs
- result=$?
- if [ "$result" -ne 0 ] && [ "$op" != "-D" ];then
- cat $OUTFILE >&2
- fi
- rm -f $OUTFILE
- if [ "$op" == "-D" ];then
- result=0
- fi
- unlock_exit $result $lock $locked
- ;;
- "icmp")
-
- icmp_entry $instanceIp $icmptype $publicIp $op
- if [ "$op" == "-D" ];then
- result=0
- fi
- unlock_exit $? $lock $locked
- ;;
- *)
- printf "Invalid protocol-- must be tcp, udp or icmp\n" >&2
- unlock_exit 5 $lock $locked
- ;;
-esac
-
-unlock_exit 0 $lock $locked
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/systemvm/patches/debian/config/root/firewallRule_egress.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/firewallRule_egress.sh b/systemvm/patches/debian/config/root/firewallRule_egress.sh
deleted file mode 100755
index b1e7a40..0000000
--- a/systemvm/patches/debian/config/root/firewallRule_egress.sh
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# $Id: firewallRule_egress.sh 9947 2013-01-17 19:34:24Z manuel $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/patches/xenserver/root/firewallRule_egress.sh $
-# firewallRule_egress.sh -- allow some ports / protocols from vm instances
-# @VERSION@
-
-source /root/func.sh
-
-lock="biglock"
-locked=$(getLockFile $lock)
-if [ "$locked" != "1" ]
-then
- exit 1
-fi
-#set -x
-usage() {
- printf "Usage: %s: -a protocol:startport:endport:sourcecidrs> \n" $(basename $0) >&2
- printf "sourcecidrs format: cidr1-cidr2-cidr3-...\n"
-}
-
-fw_egress_remove_backup() {
- sudo iptables -D FW_OUTBOUND -j _FW_EGRESS_RULES
- sudo iptables -F _FW_EGRESS_RULES
- sudo iptables -X _FW_EGRESS_RULES
-}
-
-fw_egress_save() {
- sudo iptables -E FW_EGRESS_RULES _FW_EGRESS_RULES
-}
-
-fw_egress_chain () {
-#supress errors 2>/dev/null
- fw_egress_remove_backup
- fw_egress_save
- sudo iptables -N FW_EGRESS_RULES
- sudo iptables -A FW_OUTBOUND -j FW_EGRESS_RULES
-}
-
-fw_egress_backup_restore() {
- sudo iptables -A FW_OUTBOUND -j FW_EGRESS_RULES
- sudo iptables -E _FW_EGRESS_RULES FW_EGRESS_RULES
- fw_egress_remove_backup
-}
-
-
-fw_entry_for_egress() {
- local rule=$1
-
- local prot=$(echo $rule | cut -d: -f2)
- local sport=$(echo $rule | cut -d: -f3)
- local eport=$(echo $rule | cut -d: -f4)
- local cidrs=$(echo $rule | cut -d: -f5 | sed 's/-/ /g')
- if [ "$sport" == "0" -a "$eport" == "0" ]
- then
- DPORT=""
- else
- DPORT="--dport $sport:$eport"
- fi
- logger -t cloud "$(basename $0): enter apply fw egress rules for guest $prot:$sport:$eport:$cidrs"
-
- for lcidr in $cidrs
- do
- [ "$prot" == "reverted" ] && continue;
- if [ "$prot" == "icmp" ]
- then
- typecode="$sport/$eport"
- [ "$eport" == "-1" ] && typecode="$sport"
- [ "$sport" == "-1" ] && typecode="any"
- sudo iptables -A FW_EGRESS_RULES -p $prot -s $lcidr --icmp-type $typecode \
- -j $target
- result=$?
- elif [ "$prot" == "all" ]
- then
- sudo iptables -A FW_EGRESS_RULES -p $prot -s $lcidr -j $target
- result=$?
- else
- sudo iptables -A FW_EGRESS_RULES -p $prot -s $lcidr $DPORT -j $target
- result=$?
- fi
-
- [ $result -gt 0 ] &&
- logger -t cloud "Error adding iptables entry for guest network $prot:$sport:$eport:$cidrs" &&
- break
- done
-
- logger -t cloud "$(basename $0): exit apply egress firewall rules for guest network"
- return $result
-}
-
-
-aflag=0
-rules=""
-rules_list=""
-ip=""
-dev=""
-pflag=0
-shift
-shift
-while getopts 'a:P:' OPTION
-do
- case $OPTION in
- a) aflag=1
- rules="$OPTARG"
- ;;
- P) pflag=1
- pvalue="$OPTARG"
- ;;
- ?) usage
- unlock_exit 2 $lock $locked
- ;;
- esac
-done
-
-if [ "$aflag" != "1" ]
-then
- usage
- unlock_exit 2 $lock $locked
-fi
-
-if [ -n "$rules" ]
-then
- rules_list=$(echo $rules | cut -d, -f1- --output-delimiter=" ")
-fi
-
-# rule format
-# protocal:sport:eport:cidr
-#-a tcp:80:80:0.0.0.0/0::tcp:220:220:0.0.0.0/0:,tcp:222:222:192.168.10.0/24-75.57.23.0/22-88.100.33.1/32
-# if any entry is reverted , entry will be in the format reverted:0:0:0
-# example : tcp:80:80:0.0.0.0/0:, tcp:220:220:0.0.0.0/0:,200.1.1.2:reverted:0:0:0
-
-success=0
-
-if [ "$pvalue" == "0" -o "$pvalue" == "2" ]
- then
- target="ACCEPT"
- else
- target="DROP"
- fi
-
-fw_egress_chain
-for r in $rules_list
-do
- fw_entry_for_egress $r
- success=$?
- if [ $success -gt 0 ]
- then
- logger -t cloud "failure to apply fw egress rules "
- break
- else
- logger -t cloud "successful in applying fw egress rules"
- fi
-done
-
-if [ $success -gt 0 ]
-then
- logger -t cloud "restoring from backup for guest network"
- fw_egress_backup_restore
-else
- logger -t cloud "deleting backup for guest network"
- if [ "$pvalue" == "1" -o "$pvalue" == "2" ]
- then
- #Adding default policy rule
- sudo iptables -A FW_EGRESS_RULES -j ACCEPT
- fi
-
-fi
-
-fw_egress_remove_backup
-
-unlock_exit $success $lock $locked
-
-
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ea1c7df/systemvm/patches/debian/config/root/firewall_rule.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/firewall_rule.sh b/systemvm/patches/debian/config/root/firewall_rule.sh
deleted file mode 100755
index 9e459f0..0000000
--- a/systemvm/patches/debian/config/root/firewall_rule.sh
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# firewall_rule.sh -- allow some ports / protocols to vm instances
-# @VERSION@
-
-source /root/func.sh
-
-lock="biglock"
-locked=$(getLockFile $lock)
-if [ "$locked" != "1" ]
-then
- exit 1
-fi
-
-usage() {
- printf "Usage: %s: -a <public ip address:protocol:startport:endport:sourcecidrs> \n" $(basename $0) >&2
- printf "sourcecidrs format: cidr1-cidr2-cidr3-...\n"
-}
-#set -x
-#FIXME: eating up the error code during execution of iptables
-fw_remove_backup() {
- local pubIp=$1
- sudo iptables -t mangle -F _FIREWALL_$pubIp 2> /dev/null
- sudo iptables -t mangle -D PREROUTING -d $pubIp -j _FIREWALL_$pubIp 2> /dev/null
- sudo iptables -t mangle -X _FIREWALL_$pubIp 2> /dev/null
-}
-
-fw_restore() {
- local pubIp=$1
- sudo iptables -t mangle -F FIREWALL_$pubIp 2> /dev/null
- sudo iptables -t mangle -D PREROUTING -d $pubIp -j FIREWALL_$pubIp 2> /dev/null
- sudo iptables -t mangle -X FIREWALL_$pubIp 2> /dev/null
- sudo iptables -t mangle -E _FIREWALL_$pubIp FIREWALL_$pubIp 2> /dev/null
-}
-
-fw_chain_for_ip () {
- local pubIp=$1
- fw_remove_backup $1
- sudo iptables -t mangle -E FIREWALL_$pubIp _FIREWALL_$pubIp 2> /dev/null
- sudo iptables -t mangle -N FIREWALL_$pubIp 2> /dev/null
- # drop if no rules match (this will be the last rule in the chain)
- sudo iptables -t mangle -A FIREWALL_$pubIp -j DROP> /dev/null
- # ensure outgoing connections are maintained (first rule in chain)
- sudo iptables -t mangle -I FIREWALL_$pubIp -m state --state RELATED,ESTABLISHED -j ACCEPT> /dev/null
- #ensure that this table is after VPN chain
- sudo iptables -t mangle -I PREROUTING 2 -d $pubIp -j FIREWALL_$pubIp
- success=$?
- if [ $success -gt 0 ]
- then
- # if VPN chain is not present for various reasons, try to add in to the first slot */
- sudo iptables -t mangle -I PREROUTING -d $pubIp -j FIREWALL_$pubIp
- fi
-}
-
-fw_entry_for_public_ip() {
- local rules=$1
-
- local pubIp=$(echo $rules | cut -d: -f1)
- local prot=$(echo $rules | cut -d: -f2)
- local sport=$(echo $rules | cut -d: -f3)
- local eport=$(echo $rules | cut -d: -f4)
- local scidrs=$(echo $rules | cut -d: -f5 | sed 's/-/ /g')
-
- logger -t cloud "$(basename $0): enter apply firewall rules for public ip $pubIp:$prot:$sport:$eport:$scidrs"
-
-
- # note that rules are inserted after the RELATED,ESTABLISHED rule
- # but before the DROP rule
- for src in $scidrs
- do
- [ "$prot" == "reverted" ] && continue;
- if [ "$prot" == "icmp" ]
- then
- typecode="$sport/$eport"
- [ "$eport" == "-1" ] && typecode="$sport"
- [ "$sport" == "-1" ] && typecode="any"
- sudo iptables -t mangle -I FIREWALL_$pubIp 2 -s $src -p $prot \
- --icmp-type $typecode -j RETURN
- else
- sudo iptables -t mangle -I FIREWALL_$pubIp 2 -s $src -p $prot \
- --dport $sport:$eport -j RETURN
- fi
- result=$?
- [ $result -gt 0 ] &&
- logger -t cloud "Error adding iptables entry for $pubIp:$prot:$sport:$eport:$src" &&
- break
- done
-
- logger -t cloud "$(basename $0): exit apply firewall rules for public ip $pubIp"
- return $result
-}
-
-get_vif_list() {
- local vif_list=""
- for i in /sys/class/net/eth*; do
- vif=$(basename $i);
- if [ "$vif" != "eth0" ] && [ "$vif" != "eth1" ]
- then
- vif_list="$vif_list $vif";
- fi
- done
- if [ "$vif_list" == "" ]
- then
- vif_list="eth0"
- fi
-
- logger -t cloud "FirewallRule public interfaces = $vif_list"
- echo $vif_list
-}
-
-shift
-rules=
-while getopts 'a:' OPTION
-do
- case $OPTION in
- a) aflag=1
- rules="$OPTARG"
- ;;
- ?) usage
- unlock_exit 2 $lock $locked
- ;;
- esac
-done
-
-VIF_LIST=$(get_vif_list)
-
-if [ "$rules" == "" ]
-then
- rules="none"
-fi
-
-#-a 172.16.92.44:tcp:80:80:0.0.0.0/0:,172.16.92.44:tcp:220:220:0.0.0.0/0:,172.16.92.44:tcp:222:222:192.168.10.0/24-75.57.23.0/22-88.100.33.1/32
-# if any entry is reverted , entry will be in the format <ip>:reverted:0:0:0
-# example : 172.16.92.44:tcp:80:80:0.0.0.0/0:,172.16.92.44:tcp:220:220:0.0.0.0/0:,200.1.1.2:reverted:0:0:0
-# The reverted entries will fix the following partially
-#FIXME: rule leak: when there are multiple ip address, there will chance that entry will be left over if the ipadress does not appear in the current execution when compare to old one
-# example : In the below first transaction have 2 ip's whereas in second transaction it having one ip, so after the second trasaction 200.1.2.3 ip will have rules in mangle table.
-# 1) -a 172.16.92.44:tcp:80:80:0.0.0.0/0:,200.16.92.44:tcp:220:220:0.0.0.0/0:,
-# 2) -a 172.16.92.44:tcp:80:80:0.0.0.0/0:,172.16.92.44:tcp:220:220:0.0.0.0/0:,
-
-
-success=0
-publicIps=
-rules_list=$(echo $rules | cut -d, -f1- --output-delimiter=" ")
-for r in $rules_list
-do
- pubIp=$(echo $r | cut -d: -f1)
- publicIps="$pubIp $publicIps"
-done
-
-unique_ips=$(echo $publicIps| tr " " "\n" | sort | uniq | tr "\n" " ")
-
-for u in $unique_ips
-do
- fw_chain_for_ip $u
-done
-
-for r in $rules_list
-do
- pubIp=$(echo $r | cut -d: -f1)
- fw_entry_for_public_ip $r
- success=$?
- if [ $success -gt 0 ]
- then
- logger -t cloud "$(basename $0): failure to apply fw rules for ip $pubIp"
- break
- else
- logger -t cloud "$(basename $0): successful in applying fw rules for ip $pubIp"
- fi
-done
-
-if [ $success -gt 0 ]
-then
- for p in $unique_ips
- do
- logger -t cloud "$(basename $0): restoring from backup for ip: $p"
- fw_restore $p
- done
-fi
-for p in $unique_ips
-do
- logger -t cloud "$(basename $0): deleting backup for ip: $p"
- fw_remove_backup $p
-done
-
-unlock_exit $success $lock $locked
-
[3/3] git commit: updated refs/heads/master to ca81e7b
Posted by ya...@apache.org.
CLOUDSTACK-5779: Move ipAlias to use routerProxy
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce67e24d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce67e24d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce67e24d
Branch: refs/heads/master
Commit: ce67e24d0aeada261aa6b44b2c37abfc6f0973af
Parents: 36920a3
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Jan 17 11:51:41 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Jan 17 12:36:42 2014 -0800
----------------------------------------------------------------------
.../virtualnetwork/VirtualRoutingResource.java | 27 +----
.../vmware/resource/VmwareResource.java | 8 +-
.../xen/resource/CitrixResourceBase.java | 10 +-
scripts/network/domr/createipAlias.sh | 26 -----
scripts/network/domr/deleteipAlias.sh | 25 -----
scripts/network/domr/s2s_vpn.sh | 29 ------
scripts/vm/hypervisor/xenserver/vmops | 32 ------
.../config/opt/cloud/bin/createIpAlias.sh | 100 +++++++++++++++++++
.../config/opt/cloud/bin/deleteIpAlias.sh | 60 +++++++++++
.../patches/debian/config/root/createIpAlias.sh | 100 -------------------
.../patches/debian/config/root/deleteIpAlias.sh | 60 -----------
11 files changed, 170 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index f469d8a..20cc0cc 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -106,10 +106,7 @@ public class VirtualRoutingResource implements Manager {
private String _loadbPath;
private String _publicEthIf;
private String _privateEthIf;
- private String _bumpUpPriorityPath;
private String _routerProxyPath;
- private String _createIpAliasPath;
- private String _deleteIpAliasPath;
private int _timeout;
private int _startTimeout;
@@ -587,23 +584,18 @@ public class VirtualRoutingResource implements Manager {
protected Answer execute(final CreateIpAliasCommand cmd) {
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
- final Script command = new Script(_createIpAliasPath, _timeout, s_logger);
List<IpAliasTO> ipAliasTOs = cmd.getIpAliasList();
String args = "";
- command.add(routerIp);
for (IpAliasTO ipaliasto : ipAliasTOs) {
args = args + ipaliasto.getAlias_count() + ":" + ipaliasto.getRouterip() + ":" + ipaliasto.getNetmask() + "-";
}
- command.add(args);
- final String result = command.execute();
+ final String result = routerProxy("createipAlias.sh", routerIp, args);
return new Answer(cmd, result == null, result);
}
protected Answer execute(final DeleteIpAliasCommand cmd) {
- final Script command = new Script(_deleteIpAliasPath, _timeout, s_logger);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
String args = "";
- command.add(routerIp);
List<IpAliasTO> revokedIpAliasTOs = cmd.getDeleteIpAliasTos();
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args + ipAliasTO.getAlias_count() + ":" + ipAliasTO.getRouterip() + ":" + ipAliasTO.getNetmask() + "-";
@@ -613,8 +605,7 @@ public class VirtualRoutingResource implements Manager {
for (IpAliasTO ipAliasTO : activeIpAliasTOs) {
args = args + ipAliasTO.getAlias_count() + ":" + ipAliasTO.getRouterip() + ":" + ipAliasTO.getNetmask() + "-";
}
- command.add(args);
- final String result = command.execute();
+ final String result = routerProxy("deleteipAlias.sh", routerIp, args);
return new Answer(cmd, result == null, result);
}
@@ -1136,24 +1127,10 @@ public class VirtualRoutingResource implements Manager {
}
_privateEthIf = _privateEthIf.toLowerCase();
- _bumpUpPriorityPath = findScript("bumpUpPriority.sh");
- if (_bumpUpPriorityPath == null) {
- throw new ConfigurationException("Unable to find bumpUpPriority.sh");
- }
-
_routerProxyPath = findScript("router_proxy.sh");
if (_routerProxyPath == null) {
throw new ConfigurationException("Unable to find router_proxy.sh");
}
- _createIpAliasPath = findScript("createipAlias.sh");
- if (_createIpAliasPath == null) {
- throw new ConfigurationException("unable to find createipAlias.sh");
- }
- _deleteIpAliasPath = findScript("deleteipAlias.sh");
- if (_deleteIpAliasPath == null) {
- throw new ConfigurationException("unable to find deleteipAlias.sh");
- }
-
return true;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 5d7cf17..817fdec 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2181,14 +2181,14 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
args = args + ipaliasto.getAlias_count() + ":" + ipaliasto.getRouterip() + ":" + ipaliasto.getNetmask() + "-";
}
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/createIpAlias " + args);
+ s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /opt/cloud/bin/createIpAlias " + args);
}
try {
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
String controlIp = getRouterSshControlIp(cmd);
Pair<Boolean, String> result =
- SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/root/createIpAlias.sh " + args);
+ SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/createIpAlias.sh " + args);
if (!result.first()) {
s_logger.error("CreateIpAlias command on domr " + controlIp + " failed, message: " + result.second());
@@ -2225,14 +2225,14 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
args = args + ipAliasTO.getAlias_count() + ":" + ipAliasTO.getRouterip() + ":" + ipAliasTO.getNetmask() + "-";
}
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/deleteIpAlias " + args);
+ s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /opt/cloud/bin/deleteIpAlias " + args);
}
try {
VmwareManager mgr = getServiceContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
String controlIp = getRouterSshControlIp(cmd);
Pair<Boolean, String> result =
- SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/root/deleteIpAlias.sh " + args);
+ SshHelper.sshExecute(controlIp, DefaultDomRSshPort, "root", mgr.getSystemVMKeyFile(), null, "/opt/cloud/bin/deleteIpAlias.sh " + args);
if (!result.first()) {
s_logger.error("deleteIpAlias command on domr " + controlIp + " failed, message: " + result.second());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index ea812e3..ddb7912 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -2194,14 +2194,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
protected Answer execute(final CreateIpAliasCommand cmd) {
- Connection conn = getConnection();
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
List<IpAliasTO> ipAliasTOs = cmd.getIpAliasList();
- String args = routerIp + " ";
+ String args = "";
for (IpAliasTO ipaliasto : ipAliasTOs) {
args = args + ipaliasto.getAlias_count() + ":" + ipaliasto.getRouterip() + ":" + ipaliasto.getNetmask() + "-";
}
- String result = callHostPlugin(conn, "vmops", "createipAlias", "args", args);
+ String result = routerProxy("createipAlias.sh", routerIp, args);
if (result == null || result.isEmpty()) {
return new Answer(cmd, false, "CreateIPAliasCommand failed\n");
}
@@ -2210,10 +2209,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
protected Answer execute(final DeleteIpAliasCommand cmd) {
- Connection conn = getConnection();
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
List<IpAliasTO> revokedIpAliasTOs = cmd.getDeleteIpAliasTos();
- String args = routerIp + " ";
+ String args = "";
for (IpAliasTO ipAliasTO : revokedIpAliasTOs) {
args = args + ipAliasTO.getAlias_count() + ":" + ipAliasTO.getRouterip() + ":" + ipAliasTO.getNetmask() + "-";
}
@@ -2223,7 +2221,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
for (IpAliasTO ipAliasTO : activeIpAliasTOs) {
args = args + ipAliasTO.getAlias_count() + ":" + ipAliasTO.getRouterip() + ":" + ipAliasTO.getNetmask() + "-";
}
- String result = callHostPlugin(conn, "vmops", "deleteipAlias", "args", args);
+ String result = routerProxy("deleteipAlias", routerIp, args);
if (result == null || result.isEmpty()) {
return new Answer(cmd, false, "DeleteipAliasCommand failed\n");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/scripts/network/domr/createipAlias.sh
----------------------------------------------------------------------
diff --git a/scripts/network/domr/createipAlias.sh b/scripts/network/domr/createipAlias.sh
deleted file mode 100755
index c35658e..0000000
--- a/scripts/network/domr/createipAlias.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-usage() {
- printf " %s routerip <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2
-}
-
-set -x
-cert="/root/.ssh/id_rsa.cloud"
-ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$1 "/root/createIpAlias.sh $2"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/scripts/network/domr/deleteipAlias.sh
----------------------------------------------------------------------
diff --git a/scripts/network/domr/deleteipAlias.sh b/scripts/network/domr/deleteipAlias.sh
deleted file mode 100755
index 6816edd..0000000
--- a/scripts/network/domr/deleteipAlias.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-usage() {
- printf " %s routerip <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2
-}
-
-set -x
-cert="/root/.ssh/id_rsa.cloud"
-ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$1 "/root/deleteIpAlias.sh $2 $3"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/scripts/network/domr/s2s_vpn.sh
----------------------------------------------------------------------
diff --git a/scripts/network/domr/s2s_vpn.sh b/scripts/network/domr/s2s_vpn.sh
deleted file mode 100755
index 3ec3e26..0000000
--- a/scripts/network/domr/s2s_vpn.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-
-
-# @VERSION@
-
-cert="/root/.ssh/id_rsa.cloud"
-domr=$1
-shift
-ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$domr "/opt/cloud/bin/ipsectunnel.sh $*" >/dev/null
-
-exit $?
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 1b04533..53a0002 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -255,8 +255,6 @@ def routerProxy(session, args):
return txt
-
-
@echo
def setLoadBalancerRule(session, args):
sargs = args['args']
@@ -273,34 +271,6 @@ def setLoadBalancerRule(session, args):
return txt
@echo
-def createipAlias(session, args):
- args = args['args']
- cmd = args.split(' ')
- cmd.insert(0, "/opt/cloud/bin/createipAlias.sh")
- cmd.insert(0, "bin/bash")
- try:
- txt=util.pread2(cmd)
- txt='success'
- except:
- logging.debug("failed to create ip alias on router vm")
- txt=''
- return txt
-
-@echo
-def deleteipAlias(session, args):
- args = args['args']
- cmd = args.split(' ')
- cmd.insert(0, "/opt/cloud/bin/deleteipAlias.sh")
- cmd.insert(0, "bin/bash")
- try:
- txt=util.pread2(cmd)
- txt='success'
- except:
- logging.debug("failed to create ip alias on router vm")
- txt=''
- return txt
-
-@echo
def createFile(session, args):
file_path = args['filepath']
file_contents = args['filecontents']
@@ -1593,8 +1563,6 @@ if __name__ == "__main__":
"destroy_network_rules_for_vm":destroy_network_rules_for_vm,
"default_network_rules_systemvm":default_network_rules_systemvm,
"network_rules_vmSecondaryIp":network_rules_vmSecondaryIp,
- "createipAlias":createipAlias,
- "deleteipAlias":deleteipAlias,
"get_rule_logs_for_vms":get_rule_logs_for_vms,
"add_to_VCPUs_params_live":add_to_VCPUs_params_live,
"setLinkLocalIP":setLinkLocalIP,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/systemvm/patches/debian/config/opt/cloud/bin/createIpAlias.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/createIpAlias.sh b/systemvm/patches/debian/config/opt/cloud/bin/createIpAlias.sh
new file mode 100755
index 0000000..cd273f6
--- /dev/null
+++ b/systemvm/patches/debian/config/opt/cloud/bin/createIpAlias.sh
@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+usage() {
+ printf " %s <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2
+}
+source /root/func.sh
+
+lock="biglock"
+locked=$(getLockFile $lock)
+if [ "$locked" != "1" ]
+then
+ exit 1
+fi
+
+PORTS_CONF=/etc/apache2/ports.conf
+PORTS_CONF_BAK=/etc/ports.conf.bak
+FAIL_DIR=/etc/failure_config
+CMDLINE=$(cat /var/cache/cloud/cmdline | tr '\n' ' ')
+
+if [ ! -d "$FAIL_DIR" ]
+ then
+ mkdir "$FAIL_DIR"
+fi
+#bakup ports.conf
+cp "$PORTS_CONF" "$PORTS_CONF_BAK"
+
+domain=$(echo "$CMDLINE" | grep -o " domain=.* " | sed -e 's/domain=//' | awk '{print $1}')
+
+setup_apache2() {
+ local ip=$1
+ logger -t cloud "Setting up apache web server for $ip"
+ cp /etc/apache2/sites-available/default /etc/apache2/sites-available/ipAlias.${ip}.meta-data
+ cp /etc/apache2/sites-available/default-ssl /etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data
+ cp /etc/apache2/ports.conf /etc/apache2/conf.d/ports.${ip}.meta-data.conf
+ sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:80>\nServerName $domain/" /etc/apache2/sites-available/ipAlias.${ip}.meta-data
+ sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:443>\nServerName $domain/" /etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data
+ sed -i -e "/NameVirtualHost .*:80/d" /etc/apache2/conf.d/ports.${ip}.meta-data.conf
+ sed -i -e "s/Listen .*:80/Listen $ip:80/g" /etc/apache2/conf.d/ports.${ip}.meta-data.conf
+ sed -i -e "s/Listen .*:443/Listen $ip:443/g" /etc/apache2/conf.d/ports.${ip}.meta-data.conf
+ ln -s /etc/apache2/sites-available/ipAlias.${ip}.meta-data /etc/apache2/sites-enabled/ipAlias.${ip}.meta-data
+ ln -s /etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data /etc/apache2/sites-enabled/ipAlias.${ip}-ssl.meta-data
+}
+
+var="$1"
+cert="/root/.ssh/id_rsa.cloud"
+config_ips=""
+
+while [ -n "$var" ]
+do
+ var1=$(echo $var | cut -f1 -d "-")
+ alias_count=$( echo $var1 | cut -f1 -d ":" )
+ routerip=$(echo $var1 | cut -f2 -d ":")
+ netmask=$(echo $var1 | cut -f3 -d ":")
+ ifconfig eth0:$alias_count $routerip netmask $netmask up
+ setup_apache2 "$routerip"
+ config_ips="${config_ips}"$routerip":"
+ var=$( echo $var | sed "s/${var1}-//" )
+done
+
+#restarting the apache server for the config to take effect.
+service apache2 restart
+result=$?
+if [ "$result" -ne "0" ]
+then
+ logger -t cloud "createIpAlias.sh: could not configure apache2 server"
+ logger -t cloud "createIpAlias.sh: reverting to the old config"
+ logger -t cloud "createIpAlias.sh: moving out the failure config to $FAIL_DIR"
+ while [ -n "$config_ips" ]
+ do
+ ip=$( echo $config_ips | cut -f1 -d ":" )
+ mv "/etc/apache2/sites-available/ipAlias.${ip}.meta-data" "$FAIL_DIR/ipAlias.${ip}.meta-data"
+ mv "/etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data" "$FAIL_DIR/ipAlias.${ip}-ssl.meta-data"
+ mv "/etc/apache2/conf.d/ports.${ip}.meta-data.conf" "$FAIL_DIR/ports.${ip}.meta-data.conf"
+ rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}.meta-data"
+ rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}-ssl.meta-data"
+ config_ips=$( echo $config_ips | sed "s/${ip}://" )
+ done
+ service apache2 restart
+ unlock_exit $result $lock $locked
+fi
+
+#restaring the password service to enable it on the ip aliases
+/etc/init.d/cloud-passwd-srvr restart
+unlock_exit $? $lock $locked
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh b/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
new file mode 100755
index 0000000..47edb92
--- /dev/null
+++ b/systemvm/patches/debian/config/opt/cloud/bin/deleteIpAlias.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+usage() {
+ printf " %s <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2
+}
+
+source /root/func.sh
+lock="biglock"
+locked=$(getLockFile $lock)
+if [ "$locked" != "1" ]
+then
+ exit 1
+fi
+
+remove_apache_config() {
+local ip=$1
+ logger -t cloud "removing apache web server config for $ip"
+ rm -f "/etc/apache2/sites-available/ipAlias.${ip}.meta-data"
+ rm -f "/etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data"
+ rm -f "/etc/apache2/conf.d/ports.${ip}.meta-data.conf"
+ rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}-ssl.meta-data"
+ rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}.meta-data"
+}
+
+var="$1"
+cert="/root/.ssh/id_rsa.cloud"
+
+while [[ !( "$var" == "-" ) ]]
+do
+ var1=$(echo $var | cut -f1 -d "-")
+ alias_count=$( echo $var1 | cut -f1 -d ":" )
+ routerip=$( echo $var1 | cut -f2 -d ":" )
+ ifconfig eth0:$alias_count down
+ remove_apache_config "$routerip"
+ var=$( echo $var | sed "s/${var1}-//" )
+done
+#restarting the apache server for the config to take effect.
+service apache2 restart
+
+releaseLockFile $lock $locked
+
+#recreating the active ip aliases
+/root/createIpAlias.sh $2
+unlock_exit $? $lock $locked
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/systemvm/patches/debian/config/root/createIpAlias.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/createIpAlias.sh b/systemvm/patches/debian/config/root/createIpAlias.sh
deleted file mode 100755
index cd273f6..0000000
--- a/systemvm/patches/debian/config/root/createIpAlias.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-usage() {
- printf " %s <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2
-}
-source /root/func.sh
-
-lock="biglock"
-locked=$(getLockFile $lock)
-if [ "$locked" != "1" ]
-then
- exit 1
-fi
-
-PORTS_CONF=/etc/apache2/ports.conf
-PORTS_CONF_BAK=/etc/ports.conf.bak
-FAIL_DIR=/etc/failure_config
-CMDLINE=$(cat /var/cache/cloud/cmdline | tr '\n' ' ')
-
-if [ ! -d "$FAIL_DIR" ]
- then
- mkdir "$FAIL_DIR"
-fi
-#bakup ports.conf
-cp "$PORTS_CONF" "$PORTS_CONF_BAK"
-
-domain=$(echo "$CMDLINE" | grep -o " domain=.* " | sed -e 's/domain=//' | awk '{print $1}')
-
-setup_apache2() {
- local ip=$1
- logger -t cloud "Setting up apache web server for $ip"
- cp /etc/apache2/sites-available/default /etc/apache2/sites-available/ipAlias.${ip}.meta-data
- cp /etc/apache2/sites-available/default-ssl /etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data
- cp /etc/apache2/ports.conf /etc/apache2/conf.d/ports.${ip}.meta-data.conf
- sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:80>\nServerName $domain/" /etc/apache2/sites-available/ipAlias.${ip}.meta-data
- sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:443>\nServerName $domain/" /etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data
- sed -i -e "/NameVirtualHost .*:80/d" /etc/apache2/conf.d/ports.${ip}.meta-data.conf
- sed -i -e "s/Listen .*:80/Listen $ip:80/g" /etc/apache2/conf.d/ports.${ip}.meta-data.conf
- sed -i -e "s/Listen .*:443/Listen $ip:443/g" /etc/apache2/conf.d/ports.${ip}.meta-data.conf
- ln -s /etc/apache2/sites-available/ipAlias.${ip}.meta-data /etc/apache2/sites-enabled/ipAlias.${ip}.meta-data
- ln -s /etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data /etc/apache2/sites-enabled/ipAlias.${ip}-ssl.meta-data
-}
-
-var="$1"
-cert="/root/.ssh/id_rsa.cloud"
-config_ips=""
-
-while [ -n "$var" ]
-do
- var1=$(echo $var | cut -f1 -d "-")
- alias_count=$( echo $var1 | cut -f1 -d ":" )
- routerip=$(echo $var1 | cut -f2 -d ":")
- netmask=$(echo $var1 | cut -f3 -d ":")
- ifconfig eth0:$alias_count $routerip netmask $netmask up
- setup_apache2 "$routerip"
- config_ips="${config_ips}"$routerip":"
- var=$( echo $var | sed "s/${var1}-//" )
-done
-
-#restarting the apache server for the config to take effect.
-service apache2 restart
-result=$?
-if [ "$result" -ne "0" ]
-then
- logger -t cloud "createIpAlias.sh: could not configure apache2 server"
- logger -t cloud "createIpAlias.sh: reverting to the old config"
- logger -t cloud "createIpAlias.sh: moving out the failure config to $FAIL_DIR"
- while [ -n "$config_ips" ]
- do
- ip=$( echo $config_ips | cut -f1 -d ":" )
- mv "/etc/apache2/sites-available/ipAlias.${ip}.meta-data" "$FAIL_DIR/ipAlias.${ip}.meta-data"
- mv "/etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data" "$FAIL_DIR/ipAlias.${ip}-ssl.meta-data"
- mv "/etc/apache2/conf.d/ports.${ip}.meta-data.conf" "$FAIL_DIR/ports.${ip}.meta-data.conf"
- rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}.meta-data"
- rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}-ssl.meta-data"
- config_ips=$( echo $config_ips | sed "s/${ip}://" )
- done
- service apache2 restart
- unlock_exit $result $lock $locked
-fi
-
-#restaring the password service to enable it on the ip aliases
-/etc/init.d/cloud-passwd-srvr restart
-unlock_exit $? $lock $locked
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce67e24d/systemvm/patches/debian/config/root/deleteIpAlias.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/deleteIpAlias.sh b/systemvm/patches/debian/config/root/deleteIpAlias.sh
deleted file mode 100755
index 47edb92..0000000
--- a/systemvm/patches/debian/config/root/deleteIpAlias.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-usage() {
- printf " %s <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2
-}
-
-source /root/func.sh
-lock="biglock"
-locked=$(getLockFile $lock)
-if [ "$locked" != "1" ]
-then
- exit 1
-fi
-
-remove_apache_config() {
-local ip=$1
- logger -t cloud "removing apache web server config for $ip"
- rm -f "/etc/apache2/sites-available/ipAlias.${ip}.meta-data"
- rm -f "/etc/apache2/sites-available/ipAlias.${ip}-ssl.meta-data"
- rm -f "/etc/apache2/conf.d/ports.${ip}.meta-data.conf"
- rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}-ssl.meta-data"
- rm -f "/etc/apache2/sites-enabled/ipAlias.${ip}.meta-data"
-}
-
-var="$1"
-cert="/root/.ssh/id_rsa.cloud"
-
-while [[ !( "$var" == "-" ) ]]
-do
- var1=$(echo $var | cut -f1 -d "-")
- alias_count=$( echo $var1 | cut -f1 -d ":" )
- routerip=$( echo $var1 | cut -f2 -d ":" )
- ifconfig eth0:$alias_count down
- remove_apache_config "$routerip"
- var=$( echo $var | sed "s/${var1}-//" )
-done
-#restarting the apache server for the config to take effect.
-service apache2 restart
-
-releaseLockFile $lock $locked
-
-#recreating the active ip aliases
-/root/createIpAlias.sh $2
-unlock_exit $? $lock $locked
\ No newline at end of file