diff --git a/conf/openmetadata.yaml b/conf/openmetadata.yaml index 8aac6aff3ee..39645768205 100644 --- a/conf/openmetadata.yaml +++ b/conf/openmetadata.yaml @@ -137,7 +137,6 @@ authorizerConfiguration: containerRequestFilter: ${AUTHORIZER_REQUEST_FILTER:-org.openmetadata.service.security.JwtFilter} adminPrincipals: ${AUTHORIZER_ADMIN_PRINCIPALS:-[admin]} allowedEmailRegistrationDomains: ${AUTHORIZER_ALLOWED_REGISTRATION_DOMAIN:-["all"]} - botPrincipals: ${AUTHORIZER_INGESTION_PRINCIPALS:-[ingestion-bot]} principalDomain: ${AUTHORIZER_PRINCIPAL_DOMAIN:-"openmetadata.org"} enforcePrincipalDomain: ${AUTHORIZER_ENFORCE_PRINCIPAL_DOMAIN:-false} enableSecureSocketConnection : ${AUTHORIZER_ENABLE_SECURE_SOCKET:-false} diff --git a/openmetadata-docs/content/deployment/kubernetes/values.md b/openmetadata-docs/content/deployment/kubernetes/values.md index fdb134aac7e..be866aac57a 100644 --- a/openmetadata-docs/content/deployment/kubernetes/values.md +++ b/openmetadata-docs/content/deployment/kubernetes/values.md @@ -27,7 +27,6 @@ This page list all the supported helm values for OpenMetadata Helm Charts. | global.authorizer.enforcePrincipalDomain | bool | `false` | | global.authorizer.enableSecureSocketConnection | bool | `false` | | global.authorizer.initialAdmins | list | `[admin]` | -| global.authorizer.botPrincipals | list | `[ingestion-bot]` | | global.authorizer.principalDomain | string | `open-metadata.org` | | global.airflow.auth.password.secretRef | string | `airflow-secrets` | | global.airflow.auth.password.secretKey | string | `openmetadata-airflow-password` | diff --git a/openmetadata-docs/content/deployment/security/amazon-cognito-sso/bare-metal.md b/openmetadata-docs/content/deployment/security/amazon-cognito-sso/bare-metal.md index 8006a845dd0..f66f06b9001 100644 --- a/openmetadata-docs/content/deployment/security/amazon-cognito-sso/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/amazon-cognito-sso/bare-metal.md @@ -33,8 +33,6 @@ authorizerConfiguration: adminPrincipals: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/amazon-cognito-sso/kubernetes.md b/openmetadata-docs/content/deployment/security/amazon-cognito-sso/kubernetes.md index 39a573b25ee..c91276e23a6 100644 --- a/openmetadata-docs/content/deployment/security/amazon-cognito-sso/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/amazon-cognito-sso/kubernetes.md @@ -18,8 +18,6 @@ global: initialAdmins: - "user1" - "user2" - botPrincipals: - - "" principalDomain: "open-metadata.org" authentication: provider: "google" diff --git a/openmetadata-docs/content/deployment/security/auth0/bare-metal.md b/openmetadata-docs/content/deployment/security/auth0/bare-metal.md index 57af75a7a69..eff7de653c1 100644 --- a/openmetadata-docs/content/deployment/security/auth0/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/auth0/bare-metal.md @@ -31,8 +31,6 @@ authorizerConfiguration: adminPrincipals: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/auth0/kubernetes.md b/openmetadata-docs/content/deployment/security/auth0/kubernetes.md index 805135d4f8e..515b85cad24 100644 --- a/openmetadata-docs/content/deployment/security/auth0/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/auth0/kubernetes.md @@ -19,8 +19,6 @@ global: containerRequestFilter: "org.openmetadata.service.security.JwtFilter" initialAdmins: - "suresh" - botPrincipals: - - "" principalDomain: "open-metadata.org" authentication: provider: "auth0" diff --git a/openmetadata-docs/content/deployment/security/azure/bare-metal.md b/openmetadata-docs/content/deployment/security/azure/bare-metal.md index 595dbc40f59..d33f431236a 100644 --- a/openmetadata-docs/content/deployment/security/azure/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/azure/bare-metal.md @@ -33,8 +33,6 @@ authorizerConfiguration: adminPrincipals: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/azure/kubernetes.md b/openmetadata-docs/content/deployment/security/azure/kubernetes.md index 4379cbbdccd..0a9e8e48aab 100644 --- a/openmetadata-docs/content/deployment/security/azure/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/azure/kubernetes.md @@ -30,8 +30,6 @@ global: initialAdmins: - "user1" - "user2" - botPrincipals: - - "" principalDomain: "open-metadata.org" authentication: provider: "azure" @@ -62,8 +60,6 @@ global: initialAdmins: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" authentication: provider: "azure" diff --git a/openmetadata-docs/content/deployment/security/custom-oidc/bare-metal.md b/openmetadata-docs/content/deployment/security/custom-oidc/bare-metal.md index 3c82a6cc36e..82b07e727ea 100644 --- a/openmetadata-docs/content/deployment/security/custom-oidc/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/custom-oidc/bare-metal.md @@ -36,8 +36,6 @@ authorizerConfiguration: adminPrincipals: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/custom-oidc/kubernetes.md b/openmetadata-docs/content/deployment/security/custom-oidc/kubernetes.md index 7b94054bbe1..12d59a977ca 100644 --- a/openmetadata-docs/content/deployment/security/custom-oidc/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/custom-oidc/kubernetes.md @@ -20,8 +20,6 @@ global: initialAdmins: - "user1" - "user2" - botPrincipals: - - "" principalDomain: "open-metadata.org" authentication: provider: "custom-oidc" @@ -50,8 +48,6 @@ global: initialAdmins: - "user1" - "user2" - botPrincipals: - - "" principalDomain: "open-metadata.org" authentication: provider: "custom-oidc" diff --git a/openmetadata-docs/content/deployment/security/google/bare-metal.md b/openmetadata-docs/content/deployment/security/google/bare-metal.md index 108e217bc9d..85f9c3fa9ae 100644 --- a/openmetadata-docs/content/deployment/security/google/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/google/bare-metal.md @@ -31,8 +31,6 @@ authorizerConfiguration: adminPrincipals: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/google/kubernetes.md b/openmetadata-docs/content/deployment/security/google/kubernetes.md index 9a9c130ca5b..4af0aae3dc4 100644 --- a/openmetadata-docs/content/deployment/security/google/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/google/kubernetes.md @@ -20,8 +20,6 @@ global: initialAdmins: - "user1" - "user2" - botPrincipals: - - "" principalDomain: "open-metadata.org" authentication: provider: "google" diff --git a/openmetadata-docs/content/deployment/security/keycloak/bare-metal.md b/openmetadata-docs/content/deployment/security/keycloak/bare-metal.md index 5ff4d587b82..d63876ef729 100644 --- a/openmetadata-docs/content/deployment/security/keycloak/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/keycloak/bare-metal.md @@ -36,9 +36,6 @@ authorizerConfiguration: containerRequestFilter: "org.openmetadata.service.security.JwtFilter" adminPrincipals: - "admin-user" - botPrincipals: - - "ingestion-bot" - - "service-account-open-metadata" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/keycloak/kubernetes.md b/openmetadata-docs/content/deployment/security/keycloak/kubernetes.md index 03daa6bb9ad..09ab6623f7f 100644 --- a/openmetadata-docs/content/deployment/security/keycloak/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/keycloak/kubernetes.md @@ -26,9 +26,6 @@ global: containerRequestFilter: "org.openmetadata.service.security.JwtFilter" initialAdmins: - "admin-user" - botPrincipals: - - "ingestion-bot" - - "service-account-open-metadata" principalDomain: "open-metadata.org" authentication: provider: "custom-oidc" @@ -57,9 +54,6 @@ global: containerRequestFilter: "org.openmetadata.service.security.JwtFilter" initialAdmins: - "admin-user" - botPrincipals: - - "ingestion-bot" - - "service-account-open-metadata" principalDomain: "open-metadata.org" authentication: provider: "custom-oidc" diff --git a/openmetadata-docs/content/deployment/security/okta/bare-metal.md b/openmetadata-docs/content/deployment/security/okta/bare-metal.md index 0b9ff96e926..a9792051a43 100644 --- a/openmetadata-docs/content/deployment/security/okta/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/okta/bare-metal.md @@ -22,7 +22,6 @@ authenticationConfiguration: Then, - Update `authorizerConfiguration` to add login names of the admin users in `adminPrincipals` section as shown below. - Update the `principalDomain` to your company domain name. -- update the `botPrincipals`, add the Ingestion Client ID for the Service application. This can be found in Okta -> Applications -> Applications, Refer to Step 3 for `Creating Service Application`. ```yaml authorizerConfiguration: @@ -32,9 +31,6 @@ authorizerConfiguration: adminPrincipals: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" - - "" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/okta/kubernetes.md b/openmetadata-docs/content/deployment/security/okta/kubernetes.md index 137cf9d225a..a32e5d3c7e5 100644 --- a/openmetadata-docs/content/deployment/security/okta/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/okta/kubernetes.md @@ -10,7 +10,6 @@ Check the Helm information [here](https://artifacthub.io/packages/search?repo=op Once the `Client Id` and `Client Secret` are generated, see the snippet below for an example of where to place the client id value and update the authorizer configurations in the `values.yaml`. -Note: Make sure to add the Ingestion Client ID for the Service application in `botPrincipals`. This can be found in Okta -> Applications -> Applications, Refer to Step 3 for `Creating Service Application`. ### Before 0.12.1 @@ -23,9 +22,6 @@ global: initialAdmins: - "user1" - "user2" - botPrincipals: - - ingestion-bot - - "" principalDomain: "open-metadata.org" authentication: provider: "okta" diff --git a/openmetadata-docs/content/deployment/security/one-login/bare-metal.md b/openmetadata-docs/content/deployment/security/one-login/bare-metal.md index c01e08eb09a..7f0e7de29ee 100644 --- a/openmetadata-docs/content/deployment/security/one-login/bare-metal.md +++ b/openmetadata-docs/content/deployment/security/one-login/bare-metal.md @@ -36,8 +36,6 @@ authorizerConfiguration: adminPrincipals: - "user1" - "user2" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" ``` diff --git a/openmetadata-docs/content/deployment/security/one-login/kubernetes.md b/openmetadata-docs/content/deployment/security/one-login/kubernetes.md index 7a25d689aef..8c346dd60dd 100644 --- a/openmetadata-docs/content/deployment/security/one-login/kubernetes.md +++ b/openmetadata-docs/content/deployment/security/one-login/kubernetes.md @@ -20,8 +20,6 @@ global: containerRequestFilter: "org.openmetadata.service.security.JwtFilter" initialAdmins: - "suresh" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" authentication: provider: "custom-oidc" @@ -50,8 +48,6 @@ global: containerRequestFilter: "org.openmetadata.service.security.JwtFilter" initialAdmins: - "suresh" - botPrincipals: - - "ingestion-bot" principalDomain: "open-metadata.org" authentication: provider: "custom-oidc" diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java index 308bc86887d..6e6bce74061 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/OpenMetadataApplication.java @@ -40,6 +40,7 @@ import java.lang.reflect.InvocationTargetException; import java.time.temporal.ChronoUnit; import java.util.EnumSet; import java.util.Optional; +import javax.naming.ConfigurationException; import javax.servlet.DispatcherType; import javax.servlet.FilterRegistration; import javax.servlet.ServletException; @@ -94,7 +95,9 @@ public class OpenMetadataApplication extends Application