-
Notifications
You must be signed in to change notification settings - Fork 3.8k
[fix](auth) Fix CTE privilege bypass due to shared privChecked flag on StatementContext #62339
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.
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
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e9888f0
[fix](auth) Fix CTE privilege bypass due to shared privChecked flag o…
seawinde 4efdbf9
[fix](auth) Fix test failures in CTE privilege check tests
seawinde fae0768
[fix](fe) Convert testCtePrivilegeCheck from JMockit to Mockito
seawinde e4facdf
[fix](fe) Skip auth for DeleteFromUsingCommand fallback in DeleteFrom…
seawinde File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...e-core/src/test/java/org/apache/doris/nereids/privileges/TestCtePrivCheckGranularity.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // 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.doris.nereids.privileges; | ||
|
|
||
| import org.apache.doris.nereids.CascadesContext; | ||
| import org.apache.doris.nereids.properties.PhysicalProperties; | ||
|
|
||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| /** | ||
| * Tests that privChecked flag is per-CascadesContext, not per-StatementContext. | ||
| * This ensures CTE producer and consumer subtrees check privileges independently. | ||
| */ | ||
| public class TestCtePrivCheckGranularity { | ||
|
|
||
| @Test | ||
| public void testPrivCheckedDefaultFalse() { | ||
| CascadesContext ctx = CascadesContext.initTempContext(); | ||
| Assertions.assertFalse(ctx.isPrivChecked(), "privChecked should default to false"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPrivCheckedSetAndGet() { | ||
| CascadesContext ctx = CascadesContext.initTempContext(); | ||
|
|
||
| ctx.setPrivChecked(true); | ||
| Assertions.assertTrue(ctx.isPrivChecked()); | ||
|
|
||
| ctx.setPrivChecked(false); | ||
| Assertions.assertFalse(ctx.isPrivChecked()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSubtreeContextHasIndependentPrivChecked() { | ||
| CascadesContext parentCtx = CascadesContext.initTempContext(); | ||
|
|
||
| // Simulate CTE: create subtree context (shares StatementContext but different CascadesContext) | ||
| CascadesContext subtreeCtx = CascadesContext.newSubtreeContext( | ||
| Optional.empty(), parentCtx, parentCtx.getRewritePlan(), PhysicalProperties.ANY); | ||
|
|
||
| // Both should share the same StatementContext | ||
| Assertions.assertSame(parentCtx.getStatementContext(), subtreeCtx.getStatementContext(), | ||
| "Parent and subtree should share the same StatementContext"); | ||
|
|
||
| // Both should start with privChecked = false | ||
| Assertions.assertFalse(parentCtx.isPrivChecked()); | ||
| Assertions.assertFalse(subtreeCtx.isPrivChecked()); | ||
|
|
||
| // Setting privChecked on subtree should NOT affect parent | ||
| subtreeCtx.setPrivChecked(true); | ||
| Assertions.assertTrue(subtreeCtx.isPrivChecked(), "subtree privChecked should be true"); | ||
| Assertions.assertFalse(parentCtx.isPrivChecked(), "parent privChecked should still be false"); | ||
|
|
||
| // Setting privChecked on parent should NOT affect subtree | ||
| parentCtx.setPrivChecked(true); | ||
| Assertions.assertTrue(parentCtx.isPrivChecked()); | ||
| Assertions.assertTrue(subtreeCtx.isPrivChecked()); // still true from before | ||
| } | ||
|
|
||
| @Test | ||
| public void testTwoSubtreeContextsAreIndependent() { | ||
| CascadesContext parentCtx = CascadesContext.initTempContext(); | ||
|
|
||
| // Simulate CTE consumer and producer: two subtree contexts from same parent | ||
| CascadesContext consumerCtx = CascadesContext.newSubtreeContext( | ||
| Optional.empty(), parentCtx, parentCtx.getRewritePlan(), PhysicalProperties.ANY); | ||
| CascadesContext producerCtx = CascadesContext.newSubtreeContext( | ||
| Optional.empty(), parentCtx, parentCtx.getRewritePlan(), PhysicalProperties.ANY); | ||
|
|
||
| // Consumer runs CheckPrivileges first, sets its flag | ||
| consumerCtx.setPrivChecked(true); | ||
|
|
||
| // Producer should NOT see consumer's flag — this is the bug fix | ||
| Assertions.assertFalse(producerCtx.isPrivChecked(), | ||
| "Producer CascadesContext should have independent privChecked from consumer"); | ||
| Assertions.assertFalse(parentCtx.isPrivChecked(), | ||
| "Parent CascadesContext should not be affected by consumer's privChecked"); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Env.getCurrentEnv().accessManageris process-global shared FE state, but this test never restores the original instance after swapping in the spy.TestWithFeServicekeeps one FE env across test methods, so any later test in this class or another class can now observe the mocked controller and become order-dependent.testPrivilegesAndPolicies()already showed this class of leak withuseUser(...); this is the same problem at global-auth scope. Please snapshot the originalAccessControllerManagerbefore replacing it and restore it infinallyafter the assertions complete.