Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8576F10E33 for ; Fri, 5 Jul 2013 11:05:17 +0000 (UTC) Received: (qmail 87130 invoked by uid 500); 5 Jul 2013 11:05:17 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 87100 invoked by uid 500); 5 Jul 2013 11:05:17 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 87089 invoked by uid 99); 5 Jul 2013 11:05:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jul 2013 11:05:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7092C82C378; Fri, 5 Jul 2013 11:05:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: likithas@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master-6-17-stable to 739d0b1 Date: Fri, 5 Jul 2013 11:05:16 +0000 (UTC) Updated Branches: refs/heads/master-6-17-stable 27c59d057 -> 739d0b18c CLOUDSTACK-3361. [Projects] Allow a normal user to edit public templates created by him. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/739d0b18 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/739d0b18 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/739d0b18 Branch: refs/heads/master-6-17-stable Commit: 739d0b18c166a27b80040e117668cc4614c7f166 Parents: 27c59d0 Author: Likitha Shetty Authored: Fri Jul 5 16:15:29 2013 +0530 Committer: Likitha Shetty Committed: Fri Jul 5 16:31:34 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/acl/DomainChecker.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/739d0b18/server/src/com/cloud/acl/DomainChecker.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/acl/DomainChecker.java b/server/src/com/cloud/acl/DomainChecker.java index 8b20f3d..94cdfd1 100755 --- a/server/src/com/cloud/acl/DomainChecker.java +++ b/server/src/com/cloud/acl/DomainChecker.java @@ -110,7 +110,10 @@ public class DomainChecker extends AdapterBase implements SecurityChecker { // Domain admin and regular user can delete/modify only templates created by them if (accessType != null && accessType == AccessType.ModifyEntry) { if (!BaseCmd.isRootAdmin(caller.getType()) && owner.getId() != caller.getId()) { - throw new PermissionDeniedException("Domain Admin and regular users can modify only their own Public templates"); + // For projects check if the caller account can access the project account + if (owner.getType() != Account.ACCOUNT_TYPE_PROJECT || !(_projectMgr.canAccessProjectAccount(caller, owner.getId()))) { + throw new PermissionDeniedException("Domain Admin and regular users can modify only their own Public templates"); + } } } }