From f4f238e18e944370b63d0a3a068ce304727ca6f2 Mon Sep 17 00:00:00 2001 From: Rakesh Date: Thu, 11 Jun 2020 13:52:23 +0200 Subject: [PATCH] server: Disable searching by instance name for customers (#4077) Only admins should be able to search VM by instance name Customers should not see or serach VM's using the instance name (i-) Co-authored-by: Rakesh Venkatesh --- .../src/main/java/com/cloud/api/query/QueryManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index e2190881074..420e67cba25 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -993,7 +993,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q SearchCriteria ssc = _userVmJoinDao.createSearchCriteria(); ssc.addOr("displayName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); - ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + if (isRootAdmin) { + ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%"); + } ssc.addOr("state", SearchCriteria.Op.EQ, keyword); sc.addAnd("displayName", SearchCriteria.Op.SC, ssc); }