You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/04/17 19:29:19 UTC
[1/2] git commit: updated refs/heads/4.1 to 9b15a47
Updated Branches:
refs/heads/4.1 2c501d196 -> 9b15a4719
Fix CLOUDSTACK-1894 User is not able to deploy VMs in a project[permission denied to access the guest network)
Signed-off-by: Mice Xia <mi...@tcloudcomputing.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abbe8ce7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abbe8ce7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abbe8ce7
Branch: refs/heads/4.1
Commit: abbe8ce71fdd96220bc0c7abfb08f7ea00fcb1d0
Parents: 2c501d1
Author: Mice Xia <mi...@tcloudcomputing.com>
Authored: Tue Apr 16 09:39:22 2013 +0800
Committer: Chip Childers <ch...@gmail.com>
Committed: Wed Apr 17 18:22:27 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 20 ++++++++++++---
1 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/abbe8ce7/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
old mode 100644
new mode 100755
index d39214a..018f1dc
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -88,7 +88,9 @@ import com.cloud.offerings.NetworkOfferingServiceMapVO;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import com.cloud.projects.dao.ProjectAccountDao;
import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
import com.cloud.user.DomainManager;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.component.AdapterBase;
@@ -177,7 +179,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
PrivateIpDao _privateIpDao;
@Inject
UserIpv6AddressDao _ipv6Dao;
-
+ @Inject
+ private ProjectAccountDao _projectAccountDao;
private final HashMap<String, NetworkOfferingVO> _systemNetworks = new HashMap<String, NetworkOfferingVO>(5);
static Long _privateOfferingId = null;
@@ -1461,9 +1464,18 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
public void checkNetworkPermissions(Account owner, Network network) {
// Perform account permission check
if (network.getGuestType() != Network.GuestType.Shared) {
- List<NetworkVO> networkMap = _networksDao.listBy(owner.getId(), network.getId());
- if (networkMap == null || networkMap.isEmpty()) {
- throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", permission denied");
+ AccountVO networkOwner = _accountDao.findById(network.getAccountId());
+ if(networkOwner == null)
+ throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", network does not have an owner");
+ if(owner.getType() != Account.ACCOUNT_TYPE_PROJECT && networkOwner.getType() == Account.ACCOUNT_TYPE_PROJECT){
+ if(!_projectAccountDao.canAccessProjectAccount(owner.getAccountId(), network.getAccountId())){
+ throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", permission denied");
+ }
+ }else{
+ List<NetworkVO> networkMap = _networksDao.listBy(owner.getId(), network.getId());
+ if (networkMap == null || networkMap.isEmpty()) {
+ throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", permission denied");
+ }
}
} else {
if (!isNetworkAvailableInDomain(network.getId(), owner.getDomainId())) {
[2/2] git commit: updated refs/heads/4.1 to 9b15a47
Posted by ch...@apache.org.
CLOUDSTACK-2051 - The previous patch ensures that holes in deleting storage
pools the proper way won't cause problems for KVM HA Monitor, this patch closes
holes. Call the KVMStoragePool deleteStoragePool that properly removes it from
the KVMHA hashmap, instead of the pools direct delete() call.
Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1366172318 -0600
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b15a471
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b15a471
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b15a471
Branch: refs/heads/4.1
Commit: 9b15a471951baebdd7bb5b71943df88661193915
Parents: abbe8ce
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Apr 16 22:18:38 2013 -0600
Committer: Chip Childers <ch...@gmail.com>
Committed: Wed Apr 17 18:25:43 2013 +0100
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 22 +++++++-------
1 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b15a471/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 3fee208..373445e 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1198,7 +1198,7 @@ ServerResource {
secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI(
secondaryStorageUrl);
secondaryStoragePool.createFolder(volumeDestPath);
- secondaryStoragePool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI(
secondaryStorageUrl
+ volumeDestPath);
@@ -1220,7 +1220,7 @@ ServerResource {
return new CopyVolumeAnswer(cmd, false, e.toString(), null, null);
} finally {
if (secondaryStoragePool != null) {
- secondaryStoragePool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
}
}
}
@@ -1343,7 +1343,7 @@ ServerResource {
return null;
} finally {
if (secondaryPool != null) {
- secondaryPool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid());
}
}
}
@@ -1948,7 +1948,7 @@ ServerResource {
true);
} finally {
if (secondaryStoragePool != null) {
- secondaryStoragePool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
}
}
return new BackupSnapshotAnswer(cmd, true, null, snapshotRelPath
@@ -1980,7 +1980,7 @@ ServerResource {
return new DeleteSnapshotBackupAnswer(cmd, false, e.toString());
} finally {
if (secondaryStoragePool != null) {
- secondaryStoragePool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
}
}
return new DeleteSnapshotBackupAnswer(cmd, true, null);
@@ -2009,7 +2009,7 @@ ServerResource {
return new Answer(cmd, false, e.toString());
} finally {
if (secondaryStoragePool != null) {
- secondaryStoragePool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
}
}
@@ -2107,10 +2107,10 @@ ServerResource {
return new CreatePrivateTemplateAnswer(cmd, false, e.getMessage());
} finally {
if (secondaryPool != null) {
- secondaryPool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryPool.getType(), secondaryPool.getUuid());
}
if (snapshotPool != null) {
- snapshotPool.delete();
+ _storagePoolMgr.deleteStoragePool(snapshotPool.getType(), snapshotPool.getUuid());
}
}
}
@@ -2233,7 +2233,7 @@ ServerResource {
return new CreatePrivateTemplateAnswer(cmd, false, e.toString());
} finally {
if (secondaryStorage != null) {
- secondaryStorage.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryStorage.getType(), secondaryStorage.getUuid());
}
}
}
@@ -2291,7 +2291,7 @@ ServerResource {
return new PrimaryStorageDownloadAnswer(e.toString());
} finally {
if (secondaryPool != null) {
- secondaryPool.delete();
+ _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid());
}
}
}
@@ -3364,7 +3364,7 @@ ServerResource {
KVMStoragePool pool = _storagePoolMgr.getStoragePool(
StoragePoolType.Filesystem, poolUuid);
if (pool != null) {
- pool.delete();
+ _storagePoolMgr.deleteStoragePool(pool.getType(),pool.getUuid());
}
return true;
} catch (CloudRuntimeException e) {