Fix #2807: Merge openmetadata.yaml and openmetadata-server.yaml

open-metadata · Feb 16, 2022 · 5c910a3 · 5c910a3
1 parent b0335ef
commit 5c910a3
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogApplication.java
@@ -62,7 +62,6 @@
 import org.openmetadata.catalog.security.AuthorizerConfiguration;
 import org.openmetadata.catalog.security.NoopAuthorizer;
 import org.openmetadata.catalog.security.NoopFilter;
-import org.openmetadata.catalog.security.auth.CatalogSecurityContextRequestFilter;
 import org.openmetadata.catalog.slack.SlackPublisherConfiguration;
 import org.openmetadata.catalog.slack.SlackWebhookEventPublisher;
 
@@ -185,16 +184,14 @@ private void registerAuthorizer(CatalogApplicationConfig catalogConfig, Environm
       authorizer.init(authorizerConf, jdbi);
       String filterClazzName = authorizerConf.getContainerRequestFilter();
       ContainerRequestFilter filter;
-      if (StringUtils.isEmpty(filterClazzName)) {
-        filter = new CatalogSecurityContextRequestFilter(); // default
-      } else {
+      if (!StringUtils.isEmpty(filterClazzName)) {
         filter =
             ((Class<ContainerRequestFilter>) Class.forName(filterClazzName))
                 .getConstructor(AuthenticationConfiguration.class)
                 .newInstance(authenticationConfiguration);
+        LOG.info("Registering ContainerRequestFilter: {}", filter.getClass().getCanonicalName());
+        environment.jersey().register(filter);
       }
-      LOG.info("Registering ContainerRequestFilter: {}", filter.getClass().getCanonicalName());
-      environment.jersey().register(filter);
     } else {
       LOG.info("Authorizer config not set, setting noop authorizer");
       authorizer = NoopAuthorizer.class.getConstructor().newInstance();