From acd9f4887f7235b2df958a594462b4104c48b2b0 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 7 Aug 2012 11:40:48 -0700
Subject: [PATCH] S2S VPN: CS-15882: Only allow VPN connection between same
 account's gateways

---
 server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 003d948a654..f912cb193cb 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -228,6 +228,10 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnManager, Manager {
             throw new InvalidParameterValueException("Unable to find specified Site to Site VPN gateway by id", null);
         }
         _accountMgr.checkAccess(caller, null, false, vpnGateway);
+        
+        if (customerGateway.getAccountId() != vpnGateway.getAccountId() || customerGateway.getDomainId() != vpnGateway.getAccountId()) {
+            throw new InvalidParameterValueException("VPN connection can only be esitablished between same account's VPN gateway and customer gateway!", null);
+        }
 
         if (_vpnConnectionDao.findByVpnGatewayIdAndCustomerGatewayId(vpnGatewayId, customerGatewayId) != null) {
             List<IdentityProxy> idList = new ArrayList<IdentityProxy>();