Bug fix for : Admin Users must be able to access all monitors opensea…

…rch-project#139 (opensearch-project#280) Signed-off-by: Sriram <59816283+skkosuri-amzn@users.noreply.github.com>
lezzago · Mar 9, 2022 · fd6c8f3 · fd6c8f3
1 parent cccbe4d
commit fd6c8f3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/SecureTransportAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/SecureTransportAction.kt
@@ -86,6 +86,8 @@ interface SecureTransportAction {
                     )
                 )
                 return false
+            } else if (isAdmin(user)) {
+                return true
             } else if (user.backendRoles.isNullOrEmpty()) {
                 actionListener.onFailure(
                     AlertingException.wrap(
@@ -112,7 +114,7 @@ interface SecureTransportAction {
         resourceId: String
     ): Boolean {
 
-        if (!filterByEnabled) return true
+        if (!doFilterForUser(requesterUser)) return true
 
         val resourceBackendRoles = resourceUser?.backendRoles
         val requesterBackendRoles = requesterUser?.backendRoles