etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 9819: fixed listTemplates by id to do permission check for private templates

This commit is contained in:
alena 2011-05-10 11:40:35 -07:00
parent 6c309fbad0
commit 5396cb7e2c
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -4186,6 +4186,16 @@ public class ManagementServerImpl implements ManagementServer {
@Override
public List<VMTemplateVO> listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Long accountId, Integer pageSize, Long startIndex, Long zoneId) throws InvalidParameterValueException {
Account account = null;
DomainVO domain = null;
if (accountId != null) {
account = _accountDao.findById(accountId);
domain = _domainDao.findById(account.getDomainId());
} else {
domain = _domainDao.findById(DomainVO.ROOT_DOMAIN);
}
VMTemplateVO template = null;
if (templateId != null) {
template = _templateDao.findById(templateId);
@ -4193,16 +4203,12 @@ public class ManagementServerImpl implements ManagementServer {
throw new InvalidParameterValueException("Please specify a valid template ID.");
}
//Check permissions here
}
Account account = null;
DomainVO domain = null;
if (accountId != null) {
account = _accountDao.findById(accountId);
domain = _domainDao.findById(account.getDomainId());
} else {
domain = _domainDao.findById(DomainVO.ROOT_DOMAIN);
if (!template.isPublicTemplate()) {
Account templateOwner = getAccount(template.getAccountId());
if (!isChildDomain(domain.getId(), templateOwner.getDomainId())) {
throw new InvalidParameterValueException("User is not authorized to see template id=" + template.getId());
}
}
}
List<VMTemplateVO> templates = new ArrayList<VMTemplateVO>();