From 140a8ced1396a05ce9d78e0eaf66ab6d68bcd139 Mon Sep 17 00:00:00 2001 From: Kevin Rathbun Date: Mon, 21 Apr 2025 10:41:46 -0400 Subject: [PATCH 1/2] prevent deleteRows of system tables --- .../java/org/apache/accumulo/manager/FateServiceHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java index db35b825584..4fc60a59c3a 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java @@ -505,7 +505,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, TFat TableOperation tableOp = TableOperation.DELETE_RANGE; validateArgumentCount(arguments, tableOp, 3); String tableName = - validateName(arguments.get(0), tableOp, EXISTING_TABLE_NAME.and(NOT_METADATA_TABLE)); + validateName(arguments.get(0), tableOp, EXISTING_TABLE_NAME.and(NOT_BUILTIN_TABLE)); Text startRow = ByteBufferUtil.toText(arguments.get(1)); Text endRow = ByteBufferUtil.toText(arguments.get(2)); From 48d318f929605534f1070828867a2b29201e92d6 Mon Sep 17 00:00:00 2001 From: Kevin Rathbun Date: Wed, 23 Apr 2025 09:55:50 -0400 Subject: [PATCH 2/2] reveresed checks --- .../java/org/apache/accumulo/manager/FateServiceHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java index 4fc60a59c3a..dd9788e85b6 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java @@ -505,7 +505,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, TFat TableOperation tableOp = TableOperation.DELETE_RANGE; validateArgumentCount(arguments, tableOp, 3); String tableName = - validateName(arguments.get(0), tableOp, EXISTING_TABLE_NAME.and(NOT_BUILTIN_TABLE)); + validateName(arguments.get(0), tableOp, NOT_BUILTIN_TABLE.and(EXISTING_TABLE_NAME)); Text startRow = ByteBufferUtil.toText(arguments.get(1)); Text endRow = ByteBufferUtil.toText(arguments.get(2));