Skip to content

fix: Change auth from WRITE to READ for specGetAll #19272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aho135 wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −4
Open

fix: Change auth from WRITE to READ for specGetAll #19272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions ...rvice/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,20 @@ public Response specGetAll(
{
return asLeaderWithSupervisorManager(
manager -> {
Set<String> authorizedSupervisorIds = filterAuthorizedSupervisorIds(
req,
manager,
manager.getSupervisorIds()
Function<String, Iterable<ResourceAction>> readRaGenerator = supervisorId -> {
Optional<SupervisorSpec> supervisorSpecOptional = manager.getSupervisorSpec(supervisorId);
return supervisorSpecOptional
.transform(spec -> SPEC_DATASOURCE_READ_RA_GENERATOR.apply(new VersionedSupervisorSpec(spec, null)))
.orNull();
};

Set<String> authorizedSupervisorIds = Sets.newHashSet(
AuthorizationUtils.filterAuthorizedResources(
req,
manager.getSupervisorIds(),
readRaGenerator,
authorizerMapper
)
);
final boolean includeFull = full != null;
final boolean includeState = state != null && state;
Expand Down
19 changes: 19 additions & 0 deletions ...e/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,25 @@ public void testSpecGetAll()
Assert.assertEquals(503, response.getStatus());
}

@Test
public void testSpecGetAllWithPartialAuthorizationForReadAccess()
{
EasyMock.expect(taskMaster.getSupervisorManager()).andReturn(Optional.of(supervisorManager));
EasyMock.expect(supervisorManager.getSupervisorIds()).andReturn(SUPERVISOR_IDS).atLeastOnce();
EasyMock.expect(supervisorManager.getSupervisorSpec(SPEC1.getId())).andReturn(Optional.of(SPEC1));
EasyMock.expect(supervisorManager.getSupervisorSpec(SPEC2.getId())).andReturn(Optional.of(SPEC2));
setupMockRequestForUser("notDruid");
replayAll();

Response response = supervisorResource.specGetAll(null, null, null, request);
verifyAll();

Assert.assertEquals(200, response.getStatus());
// Only id1 (datasource1) should be returned since user lacks READ access to datasource2
Set<String> returnedIds = (Set<String>) response.getEntity();
Assert.assertEquals(ImmutableSet.of("id1"), returnedIds);
}

@Test
public void testSpecGetAllFull()
{
Expand Down
Loading