gianm commented on code in PR #17774: URL: https://github.com/apache/druid/pull/17774#discussion_r2023813000
########## processing/src/main/java/org/apache/druid/query/policy/PolicyEnforcer.java: ########## @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.query.policy; + +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.apache.druid.guice.annotations.UnstableApi; +import org.apache.druid.query.DataSource; + +/** + * A mechanism for enforcing policies on data sources in Druid queries. Review Comment: One more comment: there should be something here that notes that the `PolicyEnforcer` is really meant as a sanity checker, and not a primary authorization mechanism. It should not be used to implement security rules, only verify that they have been implemented correctly as a last line of defense against incorrect policy usage. ########## server/src/main/java/org/apache/druid/client/CachingClusteredClient.java: ########## @@ -199,6 +205,11 @@ private <T> Sequence<T> run( final boolean specificSegments ) { + Query<T> query = queryPlus.getQuery(); + if (!(query instanceof SegmentMetadataQuery) && !policyEnforcer.validate(query.getDataSource())) { + throw new ISE("Failed security validation with dataSource [%s]", query.getDataSource()); Review Comment: Let's make this a `DruidException` with category `FORBIDDEN` and persona `OPERATOR`. ########## server/src/main/java/org/apache/druid/server/coordination/ServerManager.java: ########## @@ -190,6 +195,10 @@ public <T> QueryRunner<T> getQueryRunnerForSegments(Query<T> theQuery, Iterable< throw new ISE("Cannot handle subquery: %s", dataSourceFromQuery); } + if (!(theQuery instanceof SegmentMetadataQuery) && !policyEnforcer.validate(dataSourceFromQuery)) { + throw new ISE("Failed security validation with dataSource [%s]", dataSourceFromQuery); Review Comment: Let's make this a `DruidException` with category `FORBIDDEN` and persona `OPERATOR`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
