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

Merged
aho135 merged 3 commits into from
Apr 21, 2026
+28 −5
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53900fc
Change auth from WRITE to READ for specGetAll
aho135 Apr 7, 2026
e83c944
Add authorizationFn parameter to filterAuthorizedSupervisorIds
aho135 Apr 21, 2026
60df07d
Fix indentation
aho135 Apr 21, 2026
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
14 changes: 9 additions & 5 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 @@ -204,7 +204,8 @@ public Response specGetAll(
Set<String> authorizedSupervisorIds = filterAuthorizedSupervisorIds(
req,
manager,
manager.getSupervisorIds()
manager.getSupervisorIds(),
AuthorizationUtils.DATASOURCE_READ_RA_GENERATOR
);
final boolean includeFull = full != null;
final boolean includeState = state != null && state;
Expand Down Expand Up @@ -499,7 +500,8 @@ public Response terminateAll(@Context final HttpServletRequest req)
Set<String> authorizedSupervisorIds = filterAuthorizedSupervisorIds(
req,
manager,
manager.getSupervisorIds()
manager.getSupervisorIds(),
AuthorizationUtils.DATASOURCE_WRITE_RA_GENERATOR
);

for (final String supervisorId : authorizedSupervisorIds) {
Expand Down Expand Up @@ -642,15 +644,16 @@ private Response asLeaderWithSupervisorManager(Function<SupervisorManager, Respo
private Set<String> filterAuthorizedSupervisorIds(
final HttpServletRequest req,
SupervisorManager manager,
Collection<String> supervisorIds
Collection<String> supervisorIds,
Function<String, ResourceAction> authorizationFn
)
{
Function<String, Iterable<ResourceAction>> raGenerator = supervisorId -> {
Optional<SupervisorSpec> supervisorSpecOptional = manager.getSupervisorSpec(supervisorId);
if (supervisorSpecOptional.isPresent()) {
return Iterables.transform(
supervisorSpecOptional.get().getDataSources(),
AuthorizationUtils.DATASOURCE_WRITE_RA_GENERATOR
authorizationFn
);
} else {
return null;
Expand Down Expand Up @@ -700,7 +703,8 @@ private Response suspendOrResumeAll(final HttpServletRequest req, final boolean
Set<String> authorizedSupervisorIds = filterAuthorizedSupervisorIds(
req,
manager,
manager.getSupervisorIds()
manager.getSupervisorIds(),
AuthorizationUtils.DATASOURCE_WRITE_RA_GENERATOR
);

for (final String supervisorId : authorizedSupervisorIds) {
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