This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 63e91ef95f Support table suffix in ZkBasicAuthAccessControlFactory
(#12310)
63e91ef95f is described below
commit 63e91ef95fe6caea35ef9ebc7a03c7f4fa4841b5
Author: Xiang Fu <[email protected]>
AuthorDate: Tue Jan 23 15:42:17 2024 -0800
Support table suffix in ZkBasicAuthAccessControlFactory (#12310)
---
.../apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java | 3 ++-
.../pinot/controller/api/access/ZkBasicAuthAccessControlFactory.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java
index c4acf639bd..557484cc65 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/ZkBasicAuthAccessControlFactory.java
@@ -39,6 +39,7 @@ import org.apache.pinot.core.auth.BasicAuthPrincipal;
import org.apache.pinot.core.auth.BasicAuthUtils;
import org.apache.pinot.core.auth.ZkBasicAuthPrincipal;
import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
/**
@@ -108,7 +109,7 @@ public class ZkBasicAuthAccessControlFactory extends
AccessControlFactory {
ZkBasicAuthPrincipal principal = principalOpt.get();
for (String table : tables) {
- if (!principal.hasTable(table)) {
+ if (!principal.hasTable(TableNameBuilder.extractRawTableName(table))) {
return false;
}
}
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/ZkBasicAuthAccessControlFactory.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/ZkBasicAuthAccessControlFactory.java
index 99f106e3ad..6553ff931d 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/ZkBasicAuthAccessControlFactory.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/access/ZkBasicAuthAccessControlFactory.java
@@ -32,6 +32,7 @@ import
org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
import org.apache.pinot.core.auth.BasicAuthUtils;
import org.apache.pinot.core.auth.ZkBasicAuthPrincipal;
import org.apache.pinot.spi.env.PinotConfiguration;
+import org.apache.pinot.spi.utils.builder.TableNameBuilder;
/**
@@ -85,7 +86,8 @@ public class ZkBasicAuthAccessControlFactory implements
AccessControlFactory {
@Override
public boolean hasAccess(String tableName, AccessType accessType,
HttpHeaders httpHeaders, String endpointUrl) {
return getPrincipal(httpHeaders).filter(
- p -> p.hasTable(tableName) &&
p.hasPermission(Objects.toString(accessType))).isPresent();
+ p -> p.hasTable(TableNameBuilder.extractRawTableName(tableName))
+ && p.hasPermission(Objects.toString(accessType))).isPresent();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
