Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 66065E06B for ; Thu, 14 Mar 2013 19:41:45 +0000 (UTC) Received: (qmail 86140 invoked by uid 500); 14 Mar 2013 19:41:43 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 86115 invoked by uid 500); 14 Mar 2013 19:41:43 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 86042 invoked by uid 99); 14 Mar 2013 19:41:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Mar 2013 19:41:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 01FBB16E69; Thu, 14 Mar 2013 19:41:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chipchilders@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: refs/heads/4.1 - Summary: Prevent deletion of wrong iptables rules Message-Id: <20130314194143.01FBB16E69@tyr.zones.apache.org> Date: Thu, 14 Mar 2013 19:41:42 +0000 (UTC) Summary: Prevent deletion of wrong iptables rules Detail: A grep in security_group.py wasn't defined well enough, could potentially delete rules for VMs other than intended BUG-ID: CLOUDSTACK-309 Bugfix-for: master Reviewed-by: Reported-by: Francois Scala Signed-off-by: John Kinsella 1363222521 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4a556d12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4a556d12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4a556d12 Branch: refs/heads/4.1 Commit: 4a556d1280a558c8234c40ce6511794b0ad4081c Parents: beb6170 Author: John Kinsella Authored: Wed Mar 13 17:54:50 2013 -0700 Committer: Chip Childers Committed: Thu Mar 14 15:40:35 2013 -0400 ---------------------------------------------------------------------- scripts/vm/network/security_group.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4a556d12/scripts/vm/network/security_group.py ---------------------------------------------------------------------- diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index 50a1641..1bcbc3e 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -344,7 +344,7 @@ def post_default_network_rules(vm_name, vm_id, vm_ip, vm_mac, vif, brname, dhcpS def delete_rules_for_vm_in_bridge_firewall_chain(vmName): vm_name = vmName if vm_name.startswith('i-') or vm_name.startswith('r-'): - vm_name = '-'.join(vm_name.split('-')[:-1]) + vm_name = '-'.join(vm_name.split('-')[:-1]) + "-def" vmchain = vm_name