yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-07 00:28:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force register TeamRepository in Authorizer init (#3177)

Browse Source
This commit is contained in:
Matt 2022-03-05 12:23:29 -08:00 committed by GitHub
parent f78a1447fa
commit 38e03f79c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultAuthorizer.java
View File

@ -32,6 +32,7 @@ import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.EntityNotFoundException; import org.openmetadata.catalog.exception.EntityNotFoundException;
import org.openmetadata.catalog.jdbi3.CollectionDAO; import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.RoleRepository; import org.openmetadata.catalog.jdbi3.RoleRepository;
import org.openmetadata.catalog.jdbi3.TeamRepository;
import org.openmetadata.catalog.jdbi3.UserRepository; import org.openmetadata.catalog.jdbi3.UserRepository;
import org.openmetadata.catalog.resources.teams.UserResource; import org.openmetadata.catalog.resources.teams.UserResource;
import org.openmetadata.catalog.security.policyevaluator.PolicyEvaluator; import org.openmetadata.catalog.security.policyevaluator.PolicyEvaluator;
@ -61,10 +62,11 @@ public class DefaultAuthorizer implements Authorizer {
LOG.debug("Admin users: {}", adminUsers); LOG.debug("Admin users: {}", adminUsers);
CollectionDAO collectionDAO = dbi.onDemand(CollectionDAO.class); CollectionDAO collectionDAO = dbi.onDemand(CollectionDAO.class);
this.userRepository = new UserRepository(collectionDAO); this.userRepository = new UserRepository(collectionDAO);
// RoleRepository needs to be instantiated for Entity.DAO_MAP to populated. // RoleRepository and TeamRepository needs to be instantiated for Entity.DAO_MAP to populated.
// As we create default admin/bots we need to have RoleRepository available in DAO_MAP. // As we create default admin/bots we need to have RoleRepository and TeamRepository available in DAO_MAP.
// This needs to be handled better in future releases. // This needs to be handled better in future releases.
RoleRepository roleRepository = new RoleRepository(collectionDAO); RoleRepository roleRepository = new RoleRepository(collectionDAO);
TeamRepository teamRepository = new TeamRepository(collectionDAO);
mayBeAddAdminUsers(); mayBeAddAdminUsers();
mayBeAddBotUsers(); mayBeAddBotUsers();
this.policyEvaluator = PolicyEvaluator.getInstance(); this.policyEvaluator = PolicyEvaluator.getInstance();

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/security/NoopAuthorizer.java
View File

@ -26,6 +26,7 @@ import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.EntityNotFoundException; import org.openmetadata.catalog.exception.EntityNotFoundException;
import org.openmetadata.catalog.jdbi3.CollectionDAO; import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.RoleRepository; import org.openmetadata.catalog.jdbi3.RoleRepository;
import org.openmetadata.catalog.jdbi3.TeamRepository;
import org.openmetadata.catalog.jdbi3.UserRepository; import org.openmetadata.catalog.jdbi3.UserRepository;
import org.openmetadata.catalog.resources.teams.UserResource; import org.openmetadata.catalog.resources.teams.UserResource;
import org.openmetadata.catalog.type.EntityReference; import org.openmetadata.catalog.type.EntityReference;
@ -42,10 +43,11 @@ public class NoopAuthorizer implements Authorizer {
public void init(AuthorizerConfiguration config, Jdbi jdbi) { public void init(AuthorizerConfiguration config, Jdbi jdbi) {
CollectionDAO collectionDAO = jdbi.onDemand(CollectionDAO.class); CollectionDAO collectionDAO = jdbi.onDemand(CollectionDAO.class);
this.userRepository = new UserRepository(collectionDAO); this.userRepository = new UserRepository(collectionDAO);
// RoleRepository needs to be instantiated for Entity.DAO_MAP to populated. // RoleRepository and TeamRepository needs to be instantiated for Entity.DAO_MAP to populated.
// As we create default admin/bots we need to have RoleRepository available in DAO_MAP. // As we create default admin/bots we need to have RoleRepository and TeamRepository available in DAO_MAP.
// This needs to be handled better in future releases. // This needs to be handled better in future releases.
RoleRepository roleRepository = new RoleRepository(collectionDAO); RoleRepository roleRepository = new RoleRepository(collectionDAO);
TeamRepository teamRepository = new TeamRepository(collectionDAO);
addAnonymousUser(); addAnonymousUser();
} }