Fix the 404 issue

Author: jerryshao

server/src/main/java/org/apache/gravitino/server/web/filter/GravitinoInterceptionService.java

@@ -37,14 +37,11 @@
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.gravitino.Entity;
-import org.apache.gravitino.GravitinoEnv;
 import org.apache.gravitino.MetadataObject;
 import org.apache.gravitino.NameIdentifier;
 import org.apache.gravitino.authorization.AuthorizationUtils;
 import org.apache.gravitino.exceptions.ForbiddenException;
-import org.apache.gravitino.exceptions.MetalakeNotInUseException;
 import org.apache.gravitino.exceptions.NoSuchMetalakeException;
-import org.apache.gravitino.metalake.MetalakeManager;
 import org.apache.gravitino.server.authorization.annotations.AuthorizationExpression;
 import org.apache.gravitino.server.authorization.annotations.AuthorizationRequest;
 import org.apache.gravitino.server.authorization.expression.AuthorizationExpressionEvaluator;
@@ -150,17 +147,13 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
           // Check metalake and user existence before authorization
           NameIdentifier metalakeIdent = metadataContext.get(Entity.EntityType.METALAKE);
           if (metalakeIdent != null) {
-            try {
-              MetalakeManager.checkMetalake(
-                  metalakeIdent, GravitinoEnv.getInstance().entityStore());
-            } catch (NoSuchMetalakeException | MetalakeNotInUseException ex) {
-              // If metalake doesn't exist or is not in use, return no auth response
-              return buildNoAuthResponse(expressionAnnotation, metadataContext, method, expression);
-            }
-
             String currentUser = PrincipalUtils.getCurrentUserName();
             try {
               AuthorizationUtils.checkCurrentUser(metalakeIdent.name(), currentUser);
+            } catch (NoSuchMetalakeException e) {
+              LOG.warn(
+                  "Metalake {} does not exist when validating user {}", metalakeIdent, currentUser);
+              return buildNoAuthResponse(expressionAnnotation, metadataContext, method, expression);
             } catch (ForbiddenException ex) {
               LOG.warn(
                   "User validation failed - User: {}, Metalake: {}, Reason: {}",

server/src/test/java/org/apache/gravitino/server/web/filter/TestGravitinoInterceptionService.java

@@ -36,6 +36,7 @@
 import org.apache.gravitino.NameIdentifier;
 import org.apache.gravitino.UserPrincipal;
 import org.apache.gravitino.authorization.AuthorizationRequestContext;
+import org.apache.gravitino.authorization.AuthorizationUtils;
 import org.apache.gravitino.authorization.GravitinoAuthorizer;
 import org.apache.gravitino.authorization.Privilege;
 import org.apache.gravitino.dto.responses.ErrorResponse;
@@ -147,14 +148,12 @@ public void testSystemInternalErrorHandling() throws Throwable {
   }
 
   @Test
-  public void testMetalakeNotExistOrNotInUse() throws Throwable {
+  public void testMetalakeNotExist() throws Throwable {
     try (MockedStatic<PrincipalUtils> principalUtilsMocked = mockStatic(PrincipalUtils.class);
         MockedStatic<GravitinoAuthorizerProvider> authorizerMocked =
             mockStatic(GravitinoAuthorizerProvider.class);
-        MockedStatic<org.apache.gravitino.GravitinoEnv> envMocked =
-            mockStatic(org.apache.gravitino.GravitinoEnv.class);
-        MockedStatic<org.apache.gravitino.metalake.MetalakeManager> metalakeManagerMocked =
-            mockStatic(org.apache.gravitino.metalake.MetalakeManager.class)) {
+        MockedStatic<AuthorizationUtils> authorizationUtilsMocked =
+            mockStatic(AuthorizationUtils.class)) {
 
       principalUtilsMocked
           .when(PrincipalUtils::getCurrentPrincipal)
@@ -166,14 +165,12 @@ public void testMetalakeNotExistOrNotInUse() throws Throwable {
       authorizerMocked.when(GravitinoAuthorizerProvider::getInstance).thenReturn(mockedProvider);
       when(mockedProvider.getGravitinoAuthorizer()).thenReturn(new MockGravitinoAuthorizer());
 
-      GravitinoEnv mockEnv = mock(GravitinoEnv.class);
-      EntityStore mockStore = mock(EntityStore.class);
-      envMocked.when(GravitinoEnv::getInstance).thenReturn(mockEnv);
-      when(mockEnv.entityStore()).thenReturn(mockStore);
-
-      // Mock MetalakeManager.checkMetalake to throw NoSuchMetalakeException
-      metalakeManagerMocked
-          .when(() -> MetalakeManager.checkMetalake(ArgumentMatchers.any(), ArgumentMatchers.any()))
+      // Mock AuthorizationUtils.checkCurrentUser to throw NoSuchMetalakeException
+      authorizationUtilsMocked
+          .when(
+              () ->
+                  AuthorizationUtils.checkCurrentUser(
+                      ArgumentMatchers.any(), ArgumentMatchers.any()))
           .thenThrow(new NoSuchMetalakeException("Metalake nonExistentMetalake does not exist"));
 
       GravitinoInterceptionService gravitinoInterceptionService =