Skip to content

fix disabled datasource not showing up in ui #3047

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

Closed
pjain1 wants to merge 1 commit into from
Closed

fix disabled datasource not showing up in ui #3047

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
123 changes: 60 additions & 63 deletions server/src/main/java/io/druid/server/http/MetadataResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
package io.druid.server.http;

import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Iterables;
Expand Down Expand Up @@ -89,74 +91,69 @@ public Response getDatabaseDataSources(
{
Response.ResponseBuilder builder = Response.status(Response.Status.OK);

final Collection<DruidDataSource> druidDataSources;
if (authConfig.isEnabled()) {
// This is an experimental feature, see - https://github.com/druid-io/druid/pull/2424
final Map<Pair<Resource, Action>, Access> resourceAccessMap = new HashMap<>();
final AuthorizationInfo authorizationInfo = (AuthorizationInfo) req.getAttribute(AuthConfig.DRUID_AUTH_TOKEN);
if (includeDisabled != null) {
return builder.entity(
Collections2.filter(
metadataSegmentManager.getAllDatasourceNames(),
new Predicate<String>()
{
@Override
public boolean apply(String input)
{
Resource resource = new Resource(input, ResourceType.DATASOURCE);
Action action = Action.READ;
Pair<Resource, Action> key = new Pair<>(resource, action);
if (resourceAccessMap.containsKey(key)) {
return resourceAccessMap.get(key).isAllowed();
} else {
Access access = authorizationInfo.isAuthorized(key.lhs, key.rhs);
resourceAccessMap.put(key, access);
return access.isAllowed();
}
}
}
)).build();
} else {
druidDataSources =
Collections2.filter(
metadataSegmentManager.getInventory(),
new Predicate<DruidDataSource>()
{
@Override
public boolean apply(DruidDataSource input)
{
Resource resource = new Resource(input.getName(), ResourceType.DATASOURCE);
Action action = Action.READ;
Pair<Resource, Action> key = new Pair<>(resource, action);
if (resourceAccessMap.containsKey(key)) {
return resourceAccessMap.get(key).isAllowed();
} else {
Access access = authorizationInfo.isAuthorized(key.lhs, key.rhs);
resourceAccessMap.put(key, access);
return access.isAllowed();
}
}
}
);
}
} else {
druidDataSources = metadataSegmentManager.getInventory();
}
// This is an experimental feature, see - https://github.com/druid-io/druid/pull/2424
final Optional<AuthorizationInfo> authorizationInfoOptional =
authConfig.isEnabled() ? Optional.of(
Preconditions.checkNotNull(
(AuthorizationInfo) req.getAttribute(AuthConfig.DRUID_AUTH_TOKEN),
"Security is enabled but no authorization info found in the request"
)) :
Optional.<AuthorizationInfo>absent();

if (includeDisabled != null) {
return builder.entity(
Collections2.transform(
druidDataSources,
new Function<DruidDataSource, String>()
final Collection<String> allDatasourceNames;
if (authorizationInfoOptional.isPresent()) {
final Map<Pair<Resource, Action>, Access> resourceAccessMap = new HashMap<>();
allDatasourceNames = Collections2.filter(
metadataSegmentManager.getAllDatasourceNames(),
new Predicate<String>()
{
@Override
public boolean apply(String input)
{
@Override
public String apply(DruidDataSource input)
{
return input.getName();
Resource resource = new Resource(input, ResourceType.DATASOURCE);
Action action = Action.READ;
Pair<Resource, Action> key = new Pair<>(resource, action);
if (resourceAccessMap.containsKey(key)) {
return resourceAccessMap.get(key).isAllowed();
} else {
Access access = authorizationInfoOptional.get().isAuthorized(key.lhs, key.rhs);
resourceAccessMap.put(key, access);
return access.isAllowed();
}
}
)
).build();
}
);
} else {
allDatasourceNames = metadataSegmentManager.getAllDatasourceNames();
}
return builder.entity(allDatasourceNames).build();
}
final Collection<DruidDataSource> druidDataSources;
if (authorizationInfoOptional.isPresent()) {
final Map<Pair<Resource, Action>, Access> resourceAccessMap = new HashMap<>();
druidDataSources = Collections2.filter(
metadataSegmentManager.getInventory(),
new Predicate<DruidDataSource>()
{
@Override
public boolean apply(DruidDataSource input)
{
Resource resource = new Resource(input.getName(), ResourceType.DATASOURCE);
Action action = Action.READ;
Pair<Resource, Action> key = new Pair<>(resource, action);
if (resourceAccessMap.containsKey(key)) {
return resourceAccessMap.get(key).isAllowed();
} else {
Access access = authorizationInfoOptional.get().isAuthorized(key.lhs, key.rhs);
resourceAccessMap.put(key, access);
return access.isAllowed();
}
}
}
);
} else {
druidDataSources = metadataSegmentManager.getInventory();
}
if (full != null) {
return builder.entity(druidDataSources).build();
Expand Down