Repository: cloudstack Updated Branches: refs/heads/master 351cc829e -> e6ead3176
CLOUDSTACK-7175:Domain Id is exposed in error message when cross domain access is attempted when listing Vms. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6ead317 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6ead317 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6ead317 Branch: refs/heads/master Commit: e6ead3176c2132d38283dc404ae601506e278a34 Parents: 351cc82 Author: Min Chen <[email protected]> Authored: Wed Jul 23 17:36:15 2014 -0700 Committer: Min Chen <[email protected]> Committed: Wed Jul 23 17:36:15 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/acl/DomainChecker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6ead317/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 729a0d1..a6bdce4 100755 --- a/server/src/com/cloud/acl/DomainChecker.java +++ b/server/src/com/cloud/acl/DomainChecker.java @@ -80,10 +80,10 @@ public class DomainChecker extends AdapterBase implements SecurityChecker { if (_accountService.isNormalUser(caller.getId())) { if (caller.getDomainId() != domainId) { - throw new PermissionDeniedException(caller + " does not have permission to operate within domain id=" + domain.getId()); + throw new PermissionDeniedException(caller + " does not have permission to operate within domain id=" + domain.getUuid()); } } else if (!_domainDao.isChildDomain(caller.getDomainId(), domainId)) { - throw new PermissionDeniedException(caller + " does not have permission to operate within domain id=" + domain.getId()); + throw new PermissionDeniedException(caller + " does not have permission to operate within domain id=" + domain.getUuid()); } return true;
