Updates exception types in client and root project

Signed-off-by: Darshit Chanpura <[email protected]>

Author: DarshitChanpura

client/README.md

@@ -49,7 +49,7 @@ protected void doExecute(Task task, DeleteResourceRequest request, ActionListene
         SampleResourceScope.PUBLIC.value(),
         ActionListener.wrap(isAuthorized -> {
             if (!isAuthorized) {
-                listener.onFailure(new ResourceSharingException("Current user is not authorized to delete resource: " + resourceId));
+                listener.onFailure(new UnauthorizedResourceAccessException("Current user is not authorized to delete resource: " + resourceId));
                 return;
             }
 

client/src/main/java/org/opensearch/security/client/resources/ResourceSharingNodeClient.java

@@ -21,7 +21,7 @@
 import org.opensearch.security.resources.rest.ResourceAccessRequest;
 import org.opensearch.security.resources.rest.ResourceAccessResponse;
 import org.opensearch.security.spi.resources.ShareableResource;
-import org.opensearch.security.spi.resources.exceptions.ResourceSharingException;
+import org.opensearch.security.spi.resources.exceptions.ResourceSharingFeatureDisabledException;
 import org.opensearch.security.spi.resources.sharing.ResourceSharing;
 import org.opensearch.security.support.ConfigConstants;
 import org.opensearch.transport.client.Client;
@@ -159,7 +159,7 @@ private boolean isResourceAccessControlOrSecurityPluginDisabled(String disabledM
             String message = (isSecurityDisabled ? "Security Plugin" : "Resource Access Control feature") + " is disabled.";
 
             log.warn("{} {}", message, disabledMessage);
-            listener.onFailure(new ResourceSharingException(message + " " + disabledMessage, RestStatus.NOT_IMPLEMENTED));
+            listener.onFailure(new ResourceSharingFeatureDisabledException(message + " " + disabledMessage, RestStatus.NOT_IMPLEMENTED));
             return true;
         }
         return false;

src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java

@@ -26,7 +26,10 @@
 import org.opensearch.security.configuration.AdminDNs;
 import org.opensearch.security.spi.resources.ShareableResource;
 import org.opensearch.security.spi.resources.ShareableResourceParser;
+import org.opensearch.security.spi.resources.exceptions.ResourceNotFoundException;
 import org.opensearch.security.spi.resources.exceptions.ResourceSharingException;
+import org.opensearch.security.spi.resources.exceptions.UnauthenticatedResourceAccessException;
+import org.opensearch.security.spi.resources.exceptions.UnauthorizedResourceAccessException;
 import org.opensearch.security.spi.resources.sharing.Recipient;
 import org.opensearch.security.spi.resources.sharing.RecipientType;
 import org.opensearch.security.spi.resources.sharing.RecipientTypeRegistry;
@@ -250,7 +253,7 @@ public void hasPermission(String resourceId, String resourceIndex, Set<String> s
             if (document == null) {
                 LOGGER.warn("ShareableResource '{}' not found in index '{}'", resourceId, resourceIndex);
                 listener.onFailure(
-                    new ResourceSharingException("ShareableResource " + resourceId + " not found in index " + resourceIndex)
+                    new ResourceNotFoundException("ShareableResource " + resourceId + " not found in index " + resourceIndex)
                 );
                 return;
             }
@@ -299,7 +302,9 @@ public void shareWith(String resourceId, String resourceIndex, ShareWith shareWi
 
         if (user == null) {
             LOGGER.warn("No authenticated user found. Failed to share resource {}", resourceId);
-            listener.onFailure(new ResourceSharingException("No authenticated user found. Failed to share resource " + resourceId));
+            listener.onFailure(
+                new UnauthenticatedResourceAccessException("No authenticated user found. Failed to share resource " + resourceId)
+            );
             return;
         }
 
@@ -349,7 +354,7 @@ public void revokeAccess(
         if (user == null) {
             LOGGER.warn("No authenticated user found. Failed to revoker access to resource {}", resourceId);
             listener.onFailure(
-                new ResourceSharingException("No authenticated user found. Failed to revoke access to resource {}" + resourceId)
+                new UnauthorizedResourceAccessException("No authenticated user found. Failed to revoke access to resource {}" + resourceId)
             );
             return;
         }
@@ -407,7 +412,7 @@ public void deleteAllResourceSharingRecordsForCurrentUser(ActionListener<Boolean
         final User user = (userSubject == null) ? null : userSubject.getUser();
 
         if (user == null) {
-            listener.onFailure(new ResourceSharingException("No authenticated user available."));
+            listener.onFailure(new UnauthenticatedResourceAccessException("No authenticated user available."));
             return;
         }
 

src/main/java/org/opensearch/security/resources/ResourceSharingIndexHandler.java

@@ -67,6 +67,7 @@
 import org.opensearch.security.spi.resources.ShareableResource;
 import org.opensearch.security.spi.resources.ShareableResourceParser;
 import org.opensearch.security.spi.resources.exceptions.ResourceSharingException;
+import org.opensearch.security.spi.resources.exceptions.UnauthorizedResourceAccessException;
 import org.opensearch.security.spi.resources.sharing.CreatedBy;
 import org.opensearch.security.spi.resources.sharing.RecipientType;
 import org.opensearch.security.spi.resources.sharing.ResourceSharing;
@@ -763,7 +764,9 @@ public void updateResourceSharingInfo(
 
                 LOGGER.error("User {} is not authorized to share resource {}", requestUserName, resourceId);
                 listener.onFailure(
-                    new ResourceSharingException("User " + requestUserName + " is not authorized to share resource " + resourceId)
+                    new UnauthorizedResourceAccessException(
+                        "User " + requestUserName + " is not authorized to share resource " + resourceId
+                    )
                 );
             }
 
@@ -912,7 +915,7 @@ public void revokeAccess(
                 // Only admin or the creator of the resource is currently allowed to revoke access
                 if (!isAdmin && currentSharingInfo != null && !currentSharingInfo.getCreatedBy().getCreator().equals(requestUserName)) {
                     listener.onFailure(
-                        new ResourceSharingException(
+                        new UnauthorizedResourceAccessException(
                             "User " + requestUserName + " is not authorized to revoke access to resource " + resourceId
                         )
                     );

src/main/java/org/opensearch/security/resources/rest/ResourceAccessTransportAction.java

@@ -18,7 +18,7 @@
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.indices.SystemIndices;
 import org.opensearch.security.resources.ResourceAccessHandler;
-import org.opensearch.security.spi.resources.exceptions.ResourceSharingException;
+import org.opensearch.security.spi.resources.exceptions.ResourceNonSystemIndexException;
 import org.opensearch.security.spi.resources.sharing.RecipientType;
 import org.opensearch.security.spi.resources.sharing.RecipientTypeRegistry;
 import org.opensearch.tasks.Task;
@@ -51,7 +51,7 @@ protected void doExecute(Task task, ResourceAccessRequest request, ActionListene
         // verify that the request if for a system index
         if (!this.systemIndices.isSystemIndex(request.getResourceIndex())) {
             actionListener.onFailure(
-                new ResourceSharingException("Resource index '" + request.getResourceIndex() + "' is not a system index.")
+                new ResourceNonSystemIndexException("Resource index '" + request.getResourceIndex() + "' is not a system index.")
             );
             return;
         }