This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 55258437c6d HBASE-30264 Validate bulkToken path in cleanupBulkLoad
(#8433)
55258437c6d is described below
commit 55258437c6d1bdec590b17f1816a691fda698754
Author: Nick Dimiduk <[email protected]>
AuthorDate: Mon Jun 29 14:47:01 2026 +0200
HBASE-30264 Validate bulkToken path in cleanupBulkLoad (#8433)
The cleanupBulkLoad RPC accepts a user-supplied bulkToken that is passed
directly to fs.delete() without verifying that the path is within the
expected staging directory. A misbehaving client or stale token could
cause the RegionServer to delete paths outside the staging area.
Add path validation to ensure the bulkToken resolves to a direct child
of baseStagingDir before performing the delete.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
Signed-off-by: Peter Somogyi <[email protected]>
---
.../hbase/regionserver/SecureBulkLoadManager.java | 14 ++++
.../TestSecureBulkLoadManagerPathValidation.java | 86 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java
index 2223202cd1d..0aca3c3b991 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java
@@ -151,6 +151,7 @@ public class SecureBulkLoadManager {
region.getCoprocessorHost().preCleanupBulkLoad(getActiveUser());
Path path = new Path(request.getBulkToken());
+ validateStagingPath(path);
if (!fs.delete(path, true)) {
if (fs.exists(path)) {
throw new IOException("Failed to clean up " + path);
@@ -159,6 +160,19 @@ public class SecureBulkLoadManager {
LOG.trace("Cleaned up {} successfully.", path);
}
+ /**
+ * Verify that the given path is a direct child of the staging directory.
Rejects path traversal
+ * attempts and paths outside the expected staging area.
+ */
+ void validateStagingPath(Path path) throws IOException {
+ Path qualified = path.makeQualified(fs.getUri(), fs.getWorkingDirectory());
+ Path qualifiedBase = baseStagingDir.makeQualified(fs.getUri(),
fs.getWorkingDirectory());
+ if (qualified.getParent() == null ||
!qualified.getParent().equals(qualifiedBase)) {
+ throw new DoNotRetryIOException(
+ "Bulk load token path must be a direct child of the staging directory:
" + baseStagingDir);
+ }
+ }
+
private Consumer<HRegion> fsCreatedListener;
void setFsCreatedListener(Consumer<HRegion> fsCreatedListener) {
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManagerPathValidation.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManagerPathValidation.java
new file mode 100644
index 00000000000..87a950a3835
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSecureBulkLoadManagerPathValidation.java
@@ -0,0 +1,86 @@
+/*
+ * 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.hadoop.hbase.regionserver;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.DoNotRetryIOException;
+import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.testclassification.RegionServerTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Verify that {@link SecureBulkLoadManager#validateStagingPath} rejects paths
outside the staging
+ * directory.
+ */
+@Tag(RegionServerTests.TAG)
+@Tag(SmallTests.TAG)
+public class TestSecureBulkLoadManagerPathValidation {
+
+ private SecureBulkLoadManager manager;
+
+ @BeforeEach
+ public void setUp() throws Exception {
+ Configuration conf = HBaseConfiguration.create();
+ conf.set("hbase.rootdir", "file:///tmp/hbase-test");
+ manager = new SecureBulkLoadManager(conf, null);
+ manager.start();
+ }
+
+ @Test
+ public void itAcceptsDirectChildOfStagingDir() {
+ Path valid = new
Path("file:///tmp/hbase-test/staging/user__table__randomtoken");
+ assertDoesNotThrow(() -> manager.validateStagingPath(valid));
+ }
+
+ @Test
+ public void itRejectsPathTraversal() {
+ Path traversal = new
Path("file:///tmp/hbase-test/staging/../data/default/important_table");
+ assertThrows(DoNotRetryIOException.class, () ->
manager.validateStagingPath(traversal));
+ }
+
+ @Test
+ public void itRejectsAbsolutePathOutsideStaging() {
+ Path outside = new Path("file:///etc/passwd");
+ assertThrows(DoNotRetryIOException.class, () ->
manager.validateStagingPath(outside));
+ }
+
+ @Test
+ public void itRejectsNestedChildOfStagingDir() {
+ Path nested = new Path("file:///tmp/hbase-test/staging/token/deeper");
+ assertThrows(DoNotRetryIOException.class, () ->
manager.validateStagingPath(nested));
+ }
+
+ @Test
+ public void itRejectsRelativePathTraversal() {
+ Path relative = new Path("../../../etc");
+ assertThrows(DoNotRetryIOException.class, () ->
manager.validateStagingPath(relative));
+ }
+
+ @Test
+ public void itRejectsStagingDirItself() {
+ Path stagingDir = new Path("file:///tmp/hbase-test/staging");
+ assertThrows(DoNotRetryIOException.class, () ->
manager.validateStagingPath(stagingDir));
+ }
+}
